MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-29 10:03:46 +02:00
Code Releases Wiki Activity

Small fixes to activity point timestamp fixup

Browse Source
This commit is contained in:
cpfeiffer 2018-08-01 00:38:45 +02:00
parent 14a086c1f3
commit 7f1c0521ea
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java
View File

@ -47,7 +47,7 @@ public class ActivityDetailsParser {
public static final BigDecimal HUAMI_TO_DECIMAL_DEGREES_DIVISOR = new BigDecimal(3000000.0); public static final BigDecimal HUAMI_TO_DECIMAL_DEGREES_DIVISOR = new BigDecimal(3000000.0);
private final BaseActivitySummary summary; private final BaseActivitySummary summary;
private final ActivityTrack activityTrack; private final ActivityTrack activityTrack;
// private final int version; // private final int version;
private final Date baseDate; private final Date baseDate;
private long baseLongitude; private long baseLongitude;
private long baseLatitude; private long baseLatitude;
@ -129,38 +129,47 @@ public class ActivityDetailsParser {
throw new GBException("Error parsing activity details: " + ex.getMessage(), ex); throw new GBException("Error parsing activity details: " + ex.getMessage(), ex);
} }
try{ fixupMissingTimestamps(activityTrack);
return activityTrack;
}
private void fixupMissingTimestamps(ActivityTrack activityTrack) throws GBException {
try {
int pointer = 0; int pointer = 0;
List<ActivityPoint> activityPointList = activityTrack.getTrackPoints(); List<ActivityPoint> activityPointList = activityTrack.getTrackPoints();
Date gpsStartTime = null; Date gpsStartTime = null;
List<Integer> gpsEntryIndexes = new ArrayList<>(); List<ActivityPoint> entriesToFixUp = new ArrayList<>();
while (pointer < activityPointList.size()){ while (pointer < activityPointList.size() + 1) {
if (activityPointList.get(pointer).getLocation() == null){ ActivityPoint activityPoint = activityPointList.get(pointer);
if (activityPoint.getLocation() == null) {
pointer++; pointer++;
continue; continue;
} }
gpsEntryIndexes.add(pointer); if (activityPoint.getTime().equals(activityPointList.get(pointer + 1).getTime())) {
if (!(activityPointList.get(pointer).getTime().equals(activityPointList.get(pointer+1).getTime()))){ entriesToFixUp.add(activityPoint);
gpsStartTime = activityPointList.get(pointer).getTime(); } else {
// found the first activity point with a proper timestamp
entriesToFixUp.add(activityPoint);
gpsStartTime = activityPointList.get(pointer + 1).getTime();
break; break;
} }
pointer++; pointer++;
} }
long differenceInSec = TimeUnit.SECONDS.convert(Math.abs(gpsStartTime.getTime() - baseDate.getTime()), TimeUnit.MILLISECONDS); if (gpsStartTime != null) {
// now adjust those entries without a timestamp
long differenceInSec = TimeUnit.SECONDS.convert(Math.abs(gpsStartTime.getTime() - baseDate.getTime()), TimeUnit.MILLISECONDS);
double multiplier = (double) differenceInSec / (double) (gpsEntryIndexes.size()); double multiplier = (double) differenceInSec / (double) (entriesToFixUp.size());
for (int j = 0; j < gpsEntryIndexes.size(); j++){ for (int j = 0; j < entriesToFixUp.size(); j++) {
long timeOffsetSeconds = Math.round(j * multiplier); long timeOffsetSeconds = Math.round(j * multiplier);
activityPointList.get(gpsEntryIndexes.get(j)).setTime(makeAbsolute(timeOffsetSeconds)); entriesToFixUp.get(j).setTime(makeAbsolute(timeOffsetSeconds));
}
} }
} catch (Exception ex) {
}
catch (Exception ex){
throw new GBException("Error cleaning activity details: " + ex.getMessage(), ex); throw new GBException("Error cleaning activity details: " + ex.getMessage(), ex);
} }
return activityTrack;
} }
private int consumeGPSAndUpdateBaseLocation(byte[] bytes, int offset, long timeOffset) { private int consumeGPSAndUpdateBaseLocation(byte[] bytes, int offset, long timeOffset) {
@ -235,7 +244,7 @@ public class ActivityDetailsParser {
Date time = makeAbsolute(timeOffsetSeconds); Date time = makeAbsolute(timeOffsetSeconds);
if (lastActivityPoint != null) { if (lastActivityPoint != null) {
if (lastActivityPoint.getTime().equals(time)) { if (lastActivityPoint.getTime().equals(time)) {
if (lastActivityPoint.getLocation() != null && !lastActivityPoint.getLocation().equals(gpsCoordinate)) { if (lastActivityPoint.getLocation() != null && !lastActivityPoint.getLocation().equals(gpsCoordinate)) {
return new ActivityPoint(time); return new ActivityPoint(time);
} }
return lastActivityPoint; return lastActivityPoint;