chteufleur
/
MyTrackingDog
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Make placeholder info visible when import GPX file.

This commit is contained in:
chteufleur 2018-09-26 16:29:50 +02:00
parent 4ec09c61d3
commit 542d07ec56
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
View File

@ -401,6 +401,11 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
} }
addMarker(new GeoPoint(loc.getLatitude(), loc.getLongitude(), loc.getAltitude()), isFound); addMarker(new GeoPoint(loc.getLatitude(), loc.getLongitude(), loc.getAltitude()), isFound);
} }
if (!serviceGps.getListGeoPointTraceur().isEmpty()) {
updateDistance(getTextTraceur());
} else if (!serviceGps.getListGeoPointDog().isEmpty()) {
updateDistance(getTextDog());
}
} }
break; break;
} }
@ -567,30 +572,43 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
private void updateDistance() { private void updateDistance() {
String text = null; String text = null;
if (serviceGps.isTraceurActivated()) { if (serviceGps.isTraceurActivated()) {
text = String.format("Distance: %,dm\t\t\t\t\t\t\t\tObjets: %d", ((int) distance), serviceGps.getListGeoPointObjects().size()); text = getTextTraceur();
} else if (serviceGps.isDogActivated()) { } else if (serviceGps.isDogActivated()) {
MyLocation firstLoc = serviceGps.getListGeoPointDog().getFirstLocation(); text = getTextDog();
MyLocation lastLoc = serviceGps.getListGeoPointDog().getLastLocation();
if (firstLoc != null) {
long time = lastLoc.getTime() - firstLoc.getTime();
time /= 1_000;
long s = (time % 60);
time /= 60;
long m = (time % 60);
time /= 60;
long h = (time % 60);
text = String.format("Time: %02d:%02d:%02d", h, m, s);
int nbFoundObject = 0;
for (MyLocation loc: serviceGps.getListGeoPointObjects()) {
if (loc instanceof WayPointLocation && ((WayPointLocation) loc).isFound()) {
nbFoundObject++;
}
}
text += "\t\t\t\t\t\t\t\tObjets: "+nbFoundObject+"/"+serviceGps.getListGeoPointObjects().size();
}
} }
updateDistance(text);
}
private String getTextTraceur() {
return String.format("Distance: %,dm\t\t\t\t\t\t\t\tObjets: %d", ((int) distance), serviceGps.getListGeoPointObjects().size());
}
private String getTextDog() {
String text = "";
MyLocation firstLoc = serviceGps.getListGeoPointDog().getFirstLocation();
MyLocation lastLoc = serviceGps.getListGeoPointDog().getLastLocation();
if (firstLoc != null) {
long time = lastLoc.getTime() - firstLoc.getTime();
time /= 1_000;
long s = (time % 60);
time /= 60;
long m = (time % 60);
time /= 60;
long h = (time % 60);
text = String.format("Time: %02d:%02d:%02d", h, m, s);
int nbFoundObject = 0;
for (MyLocation loc: serviceGps.getListGeoPointObjects()) {
if (loc instanceof WayPointLocation && ((WayPointLocation) loc).isFound()) {
nbFoundObject++;
}
}
text += "\t\t\t\t\t\t\t\tObjets: "+nbFoundObject+"/"+serviceGps.getListGeoPointObjects().size();
}
return text;
}
private void updateDistance(String text) {
if (text != null) { if (text != null) {
this.textViewCurrentLocation.setText(text); this.textViewCurrentLocation.setText(text);
this.textViewCurrentLocation.setVisibility(View.VISIBLE); this.textViewCurrentLocation.setVisibility(View.VISIBLE);