caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

add boluses to wear payload

Browse source
This commit is contained in:
AdrianLxM 2018-02-20 12:27:47 +01:00
parent 59744fbd1d
commit 88ea215f66
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
View file

@ -19,11 +19,15 @@ import com.google.android.gms.wearable.PutDataRequest;
import com.google.android.gms.wearable.Wearable; import com.google.android.gms.wearable.Wearable;
import com.google.android.gms.wearable.WearableListenerService; import com.google.android.gms.wearable.WearableListenerService;
import org.mozilla.javascript.tools.jsc.Main;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import info.nightscout.androidaps.Config; import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.Constants;
@ -35,6 +39,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.db.BgReading; import info.nightscout.androidaps.db.BgReading;
import info.nightscout.androidaps.db.DatabaseHelper; import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.TemporaryBasal; import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.db.Treatment;
import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.TreatmentsInterface; import info.nightscout.androidaps.interfaces.TreatmentsInterface;
import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData; import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
@ -345,11 +350,13 @@ public class WatchUpdaterService extends WearableListenerService implements
} }
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long startTimeWindow = now - (long) (60000 * 60 * 5.5); final long startTimeWindow = now - (long) (60000 * 60 * 5.5);
ArrayList<DataMap> basals = new ArrayList<>(); ArrayList<DataMap> basals = new ArrayList<>();
ArrayList<DataMap> temps = new ArrayList<>(); ArrayList<DataMap> temps = new ArrayList<>();
ArrayList<DataMap> boluses = new ArrayList<>();
Profile profile = MainApp.getConfigBuilder().getProfile(); Profile profile = MainApp.getConfigBuilder().getProfile();
@ -447,9 +454,17 @@ public class WatchUpdaterService extends WearableListenerService implements
} }
} }
List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();
for (Treatment treatment:treatments) {
if(treatment.date > startTimeWindow){
boluses.add(treatmentMap(treatment.date, treatment.insulin, treatment.carbs, treatment.isSMB));
}
}
DataMap dm = new DataMap(); DataMap dm = new DataMap();
dm.putDataMapArrayList("basals", basals); dm.putDataMapArrayList("basals", basals);
dm.putDataMapArrayList("temps", temps); dm.putDataMapArrayList("temps", temps);
dm.putDataMapArrayList("boluses", boluses);
new SendToDataLayerThread(BASAL_DATA_PATH, googleApiClient).execute(dm); new SendToDataLayerThread(BASAL_DATA_PATH, googleApiClient).execute(dm);
} }
@ -472,6 +487,15 @@ public class WatchUpdaterService extends WearableListenerService implements
return dm; return dm;
} }
private DataMap treatmentMap(long date, double bolus, double carbs, boolean isSMB) {
DataMap dm = new DataMap();
dm.putLong("date", date);
dm.putDouble("bolus", bolus);
dm.putDouble("carbs", carbs);
dm.putBoolean("isSMB", isSMB);
return dm;
}
private void sendNotification() { private void sendNotification() {
if (googleApiClient.isConnected()) { if (googleApiClient.isConnected()) {