MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-22 06:41:06 +02:00
Code Releases Wiki Activity

[PineTime/InfiniTime] #2783 fixes for steps count sync:

Browse Source 
try to deal with possible outstanding steps count synced on the first sync of the day (those may spoil the whole day activity);
take into account timezone diffs between local time and UTC for check steps of a day;
add some extra logging to help investigate possible issues reported by users
inform GB about new activity samples immediately after the sync (solves "lazy" refresh of the device card)
This commit is contained in:
ITCactus 2022-08-08 17:34:35 +02:00 committed by Gitea
parent ad38a32cc8
commit 9764ce03b2
1 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
View File

@ -33,6 +33,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.UUID;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -97,6 +98,9 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
private int firmwareVersionMinor = 0;
private int firmwareVersionPatch = 0;
private final int DAY_SECONDS = (24 * 60 * 60);
private int quarantinedSteps = 0;
/**
* These are used to keep track when long strings haven't changed,
* thus avoiding unnecessary transfers that are (potentially) very slow.
@ -717,10 +721,26 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
PineTimeActivitySample sample = new PineTimeActivitySample();
int dayStepCount = this.getStepsOnDay(timeStamp);
int prevoiusDayStepCount = this.getStepsOnDay(timeStamp - DAY_SECONDS);
int diff = steps - dayStepCount;
logDebug(String.format("onReceiveStepsSample: \ndayStepCount=%d, \nsteps=%d, \ndiff=%d, \nprevoiusDayStepCount=%d, ", dayStepCount, steps, diff, prevoiusDayStepCount));
if (dayStepCount == 0) {
if (quarantinedSteps == 0 && steps > 0) {
logDebug("ignoring " + diff + " steps: ignore the first sync of the day as it could be outstanding values from the previous day");
quarantinedSteps = steps;
return;
} else if (quarantinedSteps > 0 && steps == 0) {
logDebug("dropp " + quarantinedSteps + " outstanding steps: those looks like outstanding values from the previous day");
quarantinedSteps = 0;
} else {
logDebug("reset " + quarantinedSteps + " quarantined steps...");
quarantinedSteps = 0;
}
}
if (diff > 0) {
LOG.debug("adding " + diff + " steps");
logDebug("adding " + diff + " steps");
sample.setSteps(diff);
sample.setTimestamp(timeStamp);
@ -734,8 +754,9 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
.putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample)
.putExtra(DeviceService.EXTRA_TIMESTAMP, sample.getTimestamp());
LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
} else {
logDebug("ignoring " + diff + " steps");
}
}
/**
@ -744,8 +765,8 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
private int getStepsOnDay(int timeStamp) {
try (DBHandler dbHandler = GBApplication.acquireDB()) {
Calendar dayStart = new GregorianCalendar();
Calendar dayEnd = new GregorianCalendar();
Calendar dayStart = Calendar.getInstance();
Calendar dayEnd = Calendar.getInstance();
this.getDayStartEnd(timeStamp, dayStart, dayEnd);
@ -771,16 +792,21 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
}
/**
* @param timeStamp in seconds
* @param timeStampUtc in seconds
*/
private void getDayStartEnd(int timeStamp, Calendar start, Calendar end) {
final int DAY = (24 * 60 * 60);
private void getDayStartEnd(int timeStampUtc, Calendar start, Calendar end) {
int timeOffsetToUtc = Calendar.getInstance().getTimeZone().getOffset(Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis()) / 1000;
int timeStampLocal = timeStampUtc + timeOffsetToUtc;
int timeStampStartUtc = ((timeStampLocal / DAY_SECONDS) * DAY_SECONDS);
int timeStampEndUtc = (timeStampStartUtc + DAY_SECONDS - 1);
int timeStampStart = ((timeStamp / DAY) * DAY);
int timeStampEnd = (timeStampStart + DAY);
start.setTimeInMillis((timeStampStartUtc - timeOffsetToUtc) * 1000L);
end.setTimeInMillis((timeStampEndUtc - timeOffsetToUtc) * 1000L);
start.setTimeInMillis(timeStampStart * 1000L);
end.setTimeInMillis(timeStampEnd * 1000L);
Calendar calTimeStamp = new GregorianCalendar();
calTimeStamp.setTimeInMillis(timeStampUtc * 1000L);
logDebug(String.format("getDayStartEnd: \ntimeStamp=%d (%s), \ntimeStampStartUtc=%d (-offset=%s), \ntimeStampEndUtc=%d (-offset=%s)", timeStampUtc, calTimeStamp.getTime(), timeStampStartUtc, start.getTime(), timeStampEndUtc, end.getTime()));
}
@ -802,6 +828,8 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
provider.addGBActivitySample(sample);
}
GB.signalActivityDataFinish();
} catch (Exception ex) {
GB.toast(getContext(), "Error saving samples: " + ex.getLocalizedMessage(), Toast.LENGTH_LONG, GB.ERROR);
GB.updateTransferNotification(null, "Data transfer failed", false, 0, getContext());
@ -814,4 +842,12 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
this.addGBActivitySamples(new PineTimeActivitySample[]{sample});
}
private void logDebug(String logMessage) {
logDebug(logMessage, logMessage);
}
private void logDebug(String logMessage, String toastMessage) {
LOG.debug(logMessage);
//GB.toast(getContext(), toastMessage, Toast.LENGTH_LONG, GB.WARN);
}
}