caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Automatic careportal events

Browse source
This commit is contained in:
TebbeUbben 2018-04-08 14:31:24 +02:00
parent 2fee7f3186
commit 5022a77711
2 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/history/HistoryIntentAdapter.java
View file

@ -1,22 +1,24 @@
package info.nightscout.androidaps.plugins.PumpInsight.history; package info.nightscout.androidaps.plugins.PumpInsight.history;
import android.content.Intent; import android.content.Intent;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.db.CareportalEvent;
import info.nightscout.androidaps.db.TDD;
import info.nightscout.utils.DateUtil;
import info.nightscout.utils.NSUpload;
import info.nightscout.utils.SP;
import org.json.JSONException;
import org.json.JSONObject;
import sugar.free.sightparser.handling.HistoryBroadcast;
import java.util.Date; import java.util.Date;
import android.database.DatabaseUtils;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.TDD;
import sugar.free.sightparser.handling.HistoryBroadcast;
import static info.nightscout.androidaps.plugins.PumpInsight.history.PumpIdCache.updatePumpSerialNumber; import static info.nightscout.androidaps.plugins.PumpInsight.history.PumpIdCache.updatePumpSerialNumber;
/** /**
* Created by jamorham on 27/01/2018. * Created by jamorham on 27/01/2018.
* * <p>
* Parse inbound logbook intents * Parse inbound logbook intents
*
*/ */
class HistoryIntentAdapter { class HistoryIntentAdapter {
@ -121,4 +123,36 @@ class HistoryIntentAdapter {
TDD tdd = new TDD(date.getTime(), bolus, basal, bolus + basal); TDD tdd = new TDD(date.getTime(), bolus, basal, bolus + basal);
MainApp.getDbHelper().createOrUpdateTDD(tdd); MainApp.getDbHelper().createOrUpdateTDD(tdd);
} }
void processCannulaFilledIntent(Intent intent) {
Date date = getDateExtra(intent, HistoryBroadcast.EXTRA_EVENT_TIME);
uploadCareportalEvent(date, CareportalEvent.SITECHANGE);
}
void processCartridgeInsertedIntent(Intent intent) {
Date date = getDateExtra(intent, HistoryBroadcast.EXTRA_EVENT_TIME);
uploadCareportalEvent(date, CareportalEvent.INSULINCHANGE);
}
void processBatteryInsertedIntent(Intent intent) {
Date date = getDateExtra(intent, HistoryBroadcast.EXTRA_EVENT_TIME);
uploadCareportalEvent(date, CareportalEvent.PUMPBATTERYCHANGE);
}
private void uploadCareportalEvent(Date date, String event) {
if (SP.getBoolean("insight_automatic_careportal_events", false)) {
CareportalEvent careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(event);
if (careportalEvent == null || careportalEvent.date == date.getTime()) return;
try {
JSONObject data = new JSONObject();
String enteredBy = SP.getString("careportal_enteredby", "");
if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
data.put("created_at", DateUtil.toISOString(date));
data.put("eventType", event);
NSUpload.uploadCareportalEntryToNS(data);
} catch (JSONException e) {
e.printStackTrace();
}
}
}
} }

13
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/history/HistoryReceiver.java
View file

@ -43,6 +43,9 @@ public class HistoryReceiver {
filter.addAction(ACTION_SYNC_STARTED); filter.addAction(ACTION_SYNC_STARTED);
filter.addAction(ACTION_STILL_SYNCING); filter.addAction(ACTION_STILL_SYNCING);
filter.addAction(ACTION_SYNC_FINISHED); filter.addAction(ACTION_SYNC_FINISHED);
filter.addAction(ACTION_CANNULA_FILLED);
filter.addAction(ACTION_CARTRIDGE_INSERTED);
filter.addAction(ACTION_BATTERY_INSERTED);
MainApp.instance().registerReceiver(historyReceiver, filter); MainApp.instance().registerReceiver(historyReceiver, filter);
} }
@ -74,7 +77,6 @@ public class HistoryReceiver {
} }
switch (action) { switch (action) {
case ACTION_SYNC_STARTED: case ACTION_SYNC_STARTED:
status = SYNCING; status = SYNCING;
break; break;
@ -93,6 +95,15 @@ public class HistoryReceiver {
case ACTION_DAILY_TOTAL: case ACTION_DAILY_TOTAL:
intentAdapter.processDailyTotalIntent(intent); intentAdapter.processDailyTotalIntent(intent);
break; break;
case ACTION_CANNULA_FILLED:
intentAdapter.processCannulaFilledIntent(intent);
break;
case ACTION_CARTRIDGE_INSERTED:
intentAdapter.processCartridgeInsertedIntent(intent);
break;
case ACTION_BATTERY_INSERTED:
intentAdapter.processBatteryInsertedIntent(intent);
break;
} }
} }
}; };