mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2026-07-31 07:44:24 +02:00
Xiaomi-protobuf: Fix calories unit
This commit is contained in:
+14
-10
@@ -93,25 +93,29 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
|
|||||||
protected List<XiaomiActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to) {
|
protected List<XiaomiActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to) {
|
||||||
final List<XiaomiActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to);
|
final List<XiaomiActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to);
|
||||||
|
|
||||||
|
convertCalories(samples);
|
||||||
overlaySleep(samples, timestamp_from, timestamp_to);
|
overlaySleep(samples, timestamp_from, timestamp_to);
|
||||||
|
|
||||||
return samples;
|
return samples;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void convertCalories(final List<XiaomiActivitySample> samples) {
|
||||||
|
for (XiaomiActivitySample sample : samples) {
|
||||||
|
sample.setActiveCalories(sample.getActiveCalories() * 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* See {@link nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser}
|
* See {@link nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser}
|
||||||
*/
|
*/
|
||||||
private static ActivityKind getActivityKindForSample(final XiaomiSleepStageSample sample) {
|
private static ActivityKind getActivityKindForSample(final XiaomiSleepStageSample sample) {
|
||||||
switch (sample.getStage()) {
|
return switch (sample.getStage()) {
|
||||||
case 2:
|
case 2 -> ActivityKind.DEEP_SLEEP;
|
||||||
return ActivityKind.DEEP_SLEEP;
|
case 3 -> ActivityKind.LIGHT_SLEEP;
|
||||||
case 3:
|
case 4 -> ActivityKind.REM_SLEEP;
|
||||||
return ActivityKind.LIGHT_SLEEP;
|
default -> // default to awake
|
||||||
case 4:
|
ActivityKind.UNKNOWN;
|
||||||
return ActivityKind.REM_SLEEP;
|
};
|
||||||
default: // default to awake
|
|
||||||
return ActivityKind.UNKNOWN;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user