mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Split hour samples into minutes.

master
protomors 2017-09-03 22:29:57 +03:00 committed by Carsten Pfeiffer
parent ecd9964c5b
commit b7c1c28e76
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java
View File

@ -3,6 +3,9 @@ package nodomain.freeyourgadget.gadgetbridge.devices.no1f1;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import de.greenrobot.dao.AbstractDao;
import de.greenrobot.dao.Property;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
@ -10,6 +13,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
import nodomain.freeyourgadget.gadgetbridge.entities.No1F1ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.entities.No1F1ActivitySampleDao;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
public class No1F1SampleProvider extends AbstractSampleProvider<No1F1ActivitySample> {
@ -35,7 +39,7 @@ public class No1F1SampleProvider extends AbstractSampleProvider<No1F1ActivitySam
@Override
public float normalizeIntensity(int rawIntensity) {
return rawIntensity;
return rawIntensity / (float) 100.0;
}
@Override
@ -65,4 +69,35 @@ public class No1F1SampleProvider extends AbstractSampleProvider<No1F1ActivitySam
protected Property getDeviceIdentifierSampleProperty() {
return No1F1ActivitySampleDao.Properties.DeviceId;
}
@Override
public List<No1F1ActivitySample> getAllActivitySamples(int timestamp_from, int timestamp_to) {
List<No1F1ActivitySample> samples = super.getGBActivitySamples(timestamp_from - 3599, timestamp_to, ActivityKind.TYPE_ALL);
List<No1F1ActivitySample> outSamples = new ArrayList<>();
for (No1F1ActivitySample sample : samples) {
int timestamp = sample.getTimestamp();
int steps = sample.getSteps() / 60;
int leftover_steps = sample.getSteps() % 60;
for (int i = 0; i < 60; i++) {
if (i == 59)
steps = steps + leftover_steps; // simplest way to not lose steps from rounding error
if (timestamp >= timestamp_from && timestamp <= timestamp_to) {
No1F1ActivitySample newSample = new No1F1ActivitySample(
timestamp,
sample.getDeviceId(),
sample.getUserId(),
steps,
sample.getRawKind()
);
newSample.setProvider(this);
outSamples.add(newSample);
}
timestamp += 60;
}
}
detachFromSession();
return outSamples;
}
}