demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Moyoung: Actually fix sleep duplication/missing

Browse Source
This commit is contained in:
Arjan Schrijver
2025-06-11 20:58:00 +02:00
parent bfeb2b5aa0
commit 990c778772
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/FetchDataOperation.java
+5 -8
View File
@@ -133,15 +133,12 @@ public class FetchDataOperation extends AbstractBTLEOperation<MoyoungDeviceSuppo
byte[] data = new byte[payload.length - 1];
System.arraycopy(payload, 1, data, 0, data.length);
// The watch uses the GMT+8 timezone internally. The sleep identifiers below are based
// on that timezone. That means the watch thinks "yesterday" starts at a different
// moment than in our current locale.
long currentTime = System.currentTimeMillis();
final TimeZone localTZ = Calendar.getInstance().getTimeZone();
int hourDifference = (MoyoungConstants.WATCH_INTERNAL_TIME_ZONE.getOffset(currentTime) - localTZ.getOffset(currentTime)) / (1000 * 60 * 60);
int currentHour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
// For sleep, the watch considers 20h/8pm and later to be "yesterday".
// So we introduce daysAgoOffset to account for that.
final int sleepOffsetHours = 4;
final int currentHour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
int daysAgoOffset = 0;
if (currentHour + hourDifference >= 24) daysAgoOffset = 1;
if (currentHour + sleepOffsetHours >= 24) daysAgoOffset = 1;
if (dataType == MoyoungConstants.ARG_SYNC_DAY_BEFORE_YESTERDAY_STEPS) {
LOG.info("2 DAYS AGO STEPS data: " + Logging.formatBytes(data));