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

Huawei: always fetch both sleep state and data files

Browse Source
This commit is contained in:
Me7c7
2025-07-28 09:57:16 +02:00
committed by José Rebelo
parent 8905fb9eb3
commit 00e6e43344
2 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTruSleepParser.java
+2 -1
View File
@@ -394,7 +394,7 @@ public class HuaweiTruSleepParser {
LOG.debug("TruSleepDataAcc {} : {}", startTime, String.format("%04x", i.flags));
}
for (HuaweiTruSleepParser.TruSleepDataPpg i : ppg) {
java.util.Date startTime = new java.util.Date((long) i.startTime);
java.util.Date startTime = new java.util.Date(i.startTime);
LOG.debug("TruSleepDataPpg {} : {}", startTime, String.format("%04x", i.flags));
}
}
@@ -440,6 +440,7 @@ public class HuaweiTruSleepParser {
public void syncComplete(byte[] statusData, byte[] sleepData) { }
@Override
public void downloadException(HuaweiFileDownloadManager.HuaweiFileDownloadException e) {
super.downloadException(e);
if (e.fileRequest == null) {
LOG.error("Failed to download TruSleep file: {}", e.toString());
syncComplete(statusData, sleepData);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+32 -52
View File
@@ -2790,29 +2790,42 @@ public class HuaweiSupportProvider {
if (!getHuaweiCoordinator().supportsTruSleep())
return false;
HuaweiTruSleepParser.SleepFileDownloadCallback callback = new HuaweiTruSleepParser.SleepFileDownloadCallback(this) {
@Override
public void syncComplete(byte[] statusData, byte[] sleepData) {
LOG.debug("Sync of TruSleep status and data finished");
if (statusData == null || statusData.length == 0) {
LOG.debug("Sleep state file empty");
syncState.setActivitySync(false);
return;
}
HuaweiTruSleepParser.TruSleepStatus[] results = HuaweiTruSleepParser.parseState(statusData);
if (results.length == 0) {
LOG.debug("No sleep results");
syncState.setActivitySync(false);
return;
}
for (HuaweiTruSleepParser.TruSleepStatus status : results)
addSleepActivity(status.startTime, status.endTime, (byte) 0x06, (byte) 0x0a);
// HuaweiTruSleepParser.TruSleepData data = HuaweiTruSleepParser.parseData(sleepData);
// HuaweiTruSleepParser.analyze(this.provider, results, data);
}
};
huaweiFileDownloadManager.addToQueue(HuaweiFileDownloadManager.FileRequest.sleepStateFileRequest(
getHuaweiCoordinator().getSupportsTruSleepNewSync(),
start,
end,
new HuaweiFileDownloadManager.FileDownloadCallback() {
@Override
public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
if (fileRequest.getData().length != 0) {
LOG.debug("Parsing sleep state file");
HuaweiTruSleepParser.TruSleepStatus[] results = HuaweiTruSleepParser.parseState(fileRequest.getData());
for (HuaweiTruSleepParser.TruSleepStatus status : results)
addSleepActivity(status.startTime, status.endTime, (byte) 0x06, (byte) 0x0a);
} else
LOG.debug("Sleep state file empty");
syncState.setActivitySync(false);
}
@Override
public void downloadException(HuaweiFileDownloadManager.HuaweiFileDownloadException e) {
super.downloadException(e);
syncState.setActivitySync(false);
}
}
callback
), true);
huaweiFileDownloadManager.addToQueue(HuaweiFileDownloadManager.FileRequest.sleepDataFileRequest(
getHuaweiCoordinator().getSupportsTruSleepNewSync(),
start,
end,
callback
), true);
return true;
}
@@ -3011,39 +3024,6 @@ public class HuaweiSupportProvider {
public void onTestNewFunction() {
// Show to user
gbDevice.setBusyTask(R.string.busy_task_downloading, getContext());
gbDevice.sendDeviceUpdateIntent(getContext());
HuaweiTruSleepParser.SleepFileDownloadCallback callback = new HuaweiTruSleepParser.SleepFileDownloadCallback(this) {
@Override
public void syncComplete(byte[] statusData, byte[] sleepData) {
LOG.debug("Sync of TruSleep status and data finished");
if (statusData == null || statusData.length == 0)
return;
HuaweiTruSleepParser.TruSleepStatus[] results = HuaweiTruSleepParser.parseState(statusData);
if (results.length == 0)
return;
HuaweiTruSleepParser.TruSleepData data = HuaweiTruSleepParser.parseData(sleepData);
HuaweiTruSleepParser.analyze(this.provider, results, data);
}
};
huaweiFileDownloadManager.addToQueue(HuaweiFileDownloadManager.FileRequest.sleepStateFileRequest(
getHuaweiCoordinator().getSupportsTruSleepNewSync(),
0,
(int) (System.currentTimeMillis() / 1000),
callback
), true);
huaweiFileDownloadManager.addToQueue(HuaweiFileDownloadManager.FileRequest.sleepDataFileRequest(
getHuaweiCoordinator().getSupportsTruSleepNewSync(),
0,
(int) (System.currentTimeMillis() / 1000),
callback
), true);
}
public void onMusicListReq() {