Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Steps

Browse Source
This commit is contained in:
Giacomo Bertolazzi
2018-08-22 19:23:10 +02:00
parent 18a54e2888
commit 8647649a6d
5 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/manage/FITBITData/FitBit.java
View File

@@ -1,12 +1,12 @@
package manage.FITBITData;
import manage.AuthFITBIT;
import java.io.IOException;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import manage.AuthFITBIT;
public class FitBit {
public static final String BASIC_URL = "https://api.fitbit.com/";
@@ -14,7 +14,7 @@ public class FitBit {
private static final long MINUTE = 60000; /* 5 minutes in millisec */
private final AuthFITBIT auth;
private final Map<Class, Long> latestRequest = new HashMap<>();
private final Map<Class<?>, Long> latestRequest = new HashMap<>();
private final Calendar calendar = Calendar.getInstance();
private HeartRate heart = null;
@@ -32,15 +32,14 @@ public class FitBit {
}
/* passi */
//https://api.fitbit.com/1/user/-/activities/steps/date/today.json
public int getSteps() throws IOException {
if(shouldUpdateFor(Steps.class)) {
long currentMillisec = System.currentTimeMillis();
steps = auth.run(BASIC_URL + "1" + USER + "activities/steps/date/today.json", Steps.class);
latestRequest.put(steps.getClass(), currentMillisec);
steps = auth.run(BASIC_URL + "1" + USER + "activities/steps/date/today/1w.json", Steps.class);
latestRequest.put(steps.getClass(), currentMillisec);
}
return 0;
return steps.getSteps();
}
/* battito */
@@ -71,7 +70,7 @@ public class FitBit {
return sleep.getMinutesAsleep();
}
private boolean shouldUpdateFor(Class type) {
private boolean shouldUpdateFor(Class<?> type) {
try {
long current = System.currentTimeMillis();
long latest = latestRequest.get(type);