caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Insight history fix

Browse source
This commit is contained in:
TebbeUbben 2019-01-30 20:25:48 +01:00
parent e23657bfe5
commit 827d26a39a
1 changed files with 79 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java
View file

@ -116,6 +116,7 @@ import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.InsightSt
import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode; import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.OperatingMode;
import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime; import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.PumpTime;
import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose; import info.nightscout.androidaps.plugins.PumpInsightLocal.descriptors.TotalDailyDose;
import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.InsightException;
import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException; import info.nightscout.androidaps.plugins.PumpInsightLocal.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator; import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ExceptionTranslator;
import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ParameterBlockUtil; import info.nightscout.androidaps.plugins.PumpInsightLocal.utils.ParameterBlockUtil;
@ -134,8 +135,6 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
private PumpDescription pumpDescription; private PumpDescription pumpDescription;
private InsightAlertService alertService; private InsightAlertService alertService;
private InsightConnectionService connectionService; private InsightConnectionService connectionService;
private List<TemporaryBasal> temporaryBasals;
private List<InsightPumpID> pumpStartedEvents;
private long timeOffset; private long timeOffset;
private ServiceConnection serviceConnection = new ServiceConnection() { private ServiceConnection serviceConnection = new ServiceConnection() {
@Override @Override
@ -308,8 +307,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
fetchLimitations(); fetchLimitations();
updatePumpTimeIfNeeded(); updatePumpTimeIfNeeded();
readHistory(); readHistory();
} catch (InsightException e) {
log.info("Exception while fetching status: " + e.getClass().getCanonicalName());
} catch (Exception e) { } catch (Exception e) {
log.info("Error while fetching status: " + e.getClass().getCanonicalName()); log.error("Exception while fetching status", e);
} }
} }
@ -481,7 +482,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
fetchStatus(); fetchStatus();
} catch (Exception ignored) { } catch (Exception ignored) {
} }
} catch (InsightException e) {
log.info("Exception while setting profile: " + e.getClass().getCanonicalName());
Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
MainApp.bus().post(new EventNewNotification(notification));
result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) { } catch (Exception e) {
log.error("Exception while setting profile", e);
Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT); Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
MainApp.bus().post(new EventNewNotification(notification)); MainApp.bus().post(new EventNewNotification(notification));
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
@ -569,10 +576,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
MainApp.bus().post(bolusingEvent); MainApp.bus().post(bolusingEvent);
readHistory(); readHistory();
fetchStatus(); fetchStatus();
} catch (Exception e) { } catch (InsightException e) {
e.printStackTrace();
log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName()); log.info("Exception while delivering bolus: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) {
log.error("Exception while delivering bolus", e);
result.comment = ExceptionTranslator.getString(e);
} }
} else if (detailedBolusInfo.carbs > 0) { } else if (detailedBolusInfo.carbs > 0) {
result.success = true; result.success = true;
@ -591,8 +600,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
cancelBolusMessage.setBolusID(bolusID); cancelBolusMessage.setBolusID(bolusID);
connectionService.requestMessage(cancelBolusMessage).await(); connectionService.requestMessage(cancelBolusMessage).await();
confirmAlert(AlertType.WARNING_38); confirmAlert(AlertType.WARNING_38);
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName()); log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName());
} catch (Exception e) {
log.error("Exception while canceling bolus", e);
} }
}).start(); }).start();
} }
@ -635,8 +646,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
try { try {
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (InsightException e) {
log.info("Exception after setting TBR: " + e.getClass().getCanonicalName());
} catch (Exception e) { } catch (Exception e) {
log.info("Error after setting TBR: " + e.getClass().getCanonicalName()); log.error("Exception after setting TBR", e);
} }
return result; return result;
} }
@ -667,8 +680,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
result.comment = MainApp.gs(R.string.virtualpump_resultok); result.comment = MainApp.gs(R.string.virtualpump_resultok);
readHistory(); readHistory();
fetchStatus(); fetchStatus();
} catch (InsightException e) {
log.info("Exception while setting TBR: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) { } catch (Exception e) {
log.info("Error while setting TBR: " + e.getClass().getCanonicalName()); log.error("Exception while setting TBR", e);
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
@ -680,8 +696,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
try { try {
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName()); log.info("Exception after delivering extended bolus: " + e.getClass().getCanonicalName());
} catch (Exception e) {
log.error("Exception after delivering extended bolus", e);
} }
return result; return result;
} }
@ -710,9 +728,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
result.success = true; result.success = true;
result.enacted = true; result.enacted = true;
result.comment = MainApp.gs(R.string.virtualpump_resultok); result.comment = MainApp.gs(R.string.virtualpump_resultok);
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName()); log.info("Exception while delivering extended bolus: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) {
log.error("Exception while delivering extended bolus", e);
result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
} }
@ -729,8 +750,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
try { try {
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName()); log.info("Exception after canceling TBR: " + e.getClass().getCanonicalName());
} catch (Exception e) {
log.error("Exception after canceling TBR", e);
} }
return result; return result;
} }
@ -749,9 +772,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} catch (NoActiveTBRToCanceLException e) { } catch (NoActiveTBRToCanceLException e) {
result.success = true; result.success = true;
result.comment = MainApp.gs(R.string.virtualpump_resultok); result.comment = MainApp.gs(R.string.virtualpump_resultok);
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName()); log.info("Exception while canceling TBR: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) {
log.error("Exception while canceling TBR", e);
result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
} }
@ -762,8 +788,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
try { try {
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception after canceling bolus: " + e.getClass().getCanonicalName()); log.info("Exception after canceling bolus: " + e.getClass().getCanonicalName());
} catch (Exception e) {
log.error("Exception after canceling bolus", e);
} }
return result; return result;
} }
@ -799,9 +827,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} }
result.success = true; result.success = true;
result.comment = MainApp.gs(R.string.virtualpump_resultok); result.comment = MainApp.gs(R.string.virtualpump_resultok);
} catch (Exception e) { } catch (InsightException e) {
log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName()); log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) {
log.error("Exception while canceling bolus", e);
result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
} }
@ -819,8 +850,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} else break; } else break;
} }
} }
} catch (InsightException e) {
log.info("Exception while confirming alert: " + e.getClass().getCanonicalName());
} catch (Exception e) { } catch (Exception e) {
log.info("Error while confirming alert: " + e.getClass().getCanonicalName()); log.error("Exception while confirming alert", e);
} }
} }
@ -888,8 +921,11 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
result.enacted = true; result.enacted = true;
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (InsightException e) {
log.info("Exception while stopping pump: " + e.getClass().getCanonicalName());
result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) { } catch (Exception e) {
log.info("Error while stopping pump: " + e.getClass().getCanonicalName()); log.error("Exception while stopping pump", e);
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
@ -905,8 +941,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
result.enacted = true; result.enacted = true;
fetchStatus(); fetchStatus();
readHistory(); readHistory();
} catch (InsightException e) {
log.info("Exception while starting pump: " + e.getClass().getCanonicalName());
} catch (Exception e) { } catch (Exception e) {
log.info("Error while starting pump: " + e.getClass().getCanonicalName()); log.error("Exception while starting pump", e);
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
@ -920,9 +958,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
ParameterBlockUtil.writeConfigurationBlock(connectionService, tbrOverNotificationBlock); ParameterBlockUtil.writeConfigurationBlock(connectionService, tbrOverNotificationBlock);
result.success = true; result.success = true;
result.enacted = true; result.enacted = true;
} catch (InsightException e) {
tbrOverNotificationBlock.setEnabled(valueBefore);
log.info("Exception while updating TBR notification block: " + e.getClass().getSimpleName());
result.comment = ExceptionTranslator.getString(e);
} catch (Exception e) { } catch (Exception e) {
tbrOverNotificationBlock.setEnabled(valueBefore); tbrOverNotificationBlock.setEnabled(valueBefore);
log.info("Error while starting pump: " + e.getClass().getCanonicalName()); log.error("Exception while updating TBR notification block", e);
result.comment = ExceptionTranslator.getString(e); result.comment = ExceptionTranslator.getString(e);
} }
return result; return result;
@ -1003,17 +1045,20 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} }
} }
processHistoryEvents(pumpSerial, historyEvents); processHistoryEvents(pumpSerial, historyEvents);
} catch (Exception e) { } catch (InsightException e) {
e.printStackTrace();
log.info("Error while reading history: " + e.getClass().getSimpleName()); log.info("Error while reading history: " + e.getClass().getSimpleName());
} catch (Exception e) {
log.error("Error while reading history", e);
} finally { } finally {
try { try {
connectionService.requestMessage(new StopReadingHistoryMessage()).await(); connectionService.requestMessage(new StopReadingHistoryMessage()).await();
} catch (Exception ignored) { } catch (Exception ignored) {
} }
} }
} catch (InsightException e) {
log.info("Exception while reading history: " + e.getClass().getSimpleName());
} catch (Exception e) { } catch (Exception e) {
log.info("Error while reading history: " + e.getClass().getSimpleName()); log.error("Exception while reading history", e);
} }
new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventRefreshOverview("LocalInsightPlugin::readHistory"))); new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventRefreshOverview("LocalInsightPlugin::readHistory")));
} }
@ -1021,13 +1066,15 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
private void processHistoryEvents(String serial, List<HistoryEvent> historyEvents) { private void processHistoryEvents(String serial, List<HistoryEvent> historyEvents) {
Collections.sort(historyEvents); Collections.sort(historyEvents);
Collections.reverse(historyEvents); Collections.reverse(historyEvents);
temporaryBasals = new ArrayList<>(); List<TemporaryBasal> temporaryBasals = new ArrayList<>();
pumpStartedEvents = new ArrayList<>(); List<InsightPumpID> pumpStartedEvents = new ArrayList<>();
for (HistoryEvent historyEvent : historyEvents) for (HistoryEvent historyEvent : historyEvents)
if (!processHistoryEvent(serial, historyEvent)) break; if (!processHistoryEvent(serial, temporaryBasals, pumpStartedEvents, historyEvent)) break;
Collections.reverse(temporaryBasals); Collections.reverse(temporaryBasals);
for (InsightPumpID pumpID : pumpStartedEvents) { for (InsightPumpID pumpID : pumpStartedEvents) {
long tbrStart = MainApp.getDbHelper().getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp).timestamp + 10000; InsightPumpID stoppedEvent = MainApp.getDbHelper().getPumpStoppedEvent(pumpID.pumpSerial, pumpID.timestamp);
if (stoppedEvent == null) continue;
long tbrStart = stoppedEvent.timestamp + 10000;
TemporaryBasal temporaryBasal = new TemporaryBasal(); TemporaryBasal temporaryBasal = new TemporaryBasal();
temporaryBasal.durationInMinutes = (int) ((pumpID.timestamp - tbrStart) / 60000); temporaryBasal.durationInMinutes = (int) ((pumpID.timestamp - tbrStart) / 60000);
temporaryBasal.date = tbrStart; temporaryBasal.date = tbrStart;
@ -1037,10 +1084,8 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
temporaryBasal.isAbsolute = false; temporaryBasal.isAbsolute = false;
temporaryBasals.add(temporaryBasal); temporaryBasals.add(temporaryBasal);
} }
pumpStartedEvents = null;
Collections.sort(temporaryBasals, (o1, o2) -> (int) (o1.date - o2.date)); Collections.sort(temporaryBasals, (o1, o2) -> (int) (o1.date - o2.date));
for (TemporaryBasal temporaryBasal : temporaryBasals) TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal); for (TemporaryBasal temporaryBasal : temporaryBasals) TreatmentsPlugin.getPlugin().addToHistoryTempBasal(temporaryBasal);
temporaryBasals = null;
if (historyEvents.size() > 0) { if (historyEvents.size() > 0) {
InsightHistoryOffset historyOffset = new InsightHistoryOffset(); InsightHistoryOffset historyOffset = new InsightHistoryOffset();
historyOffset.pumpSerial = serial; historyOffset.pumpSerial = serial;
@ -1049,7 +1094,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} }
} }
private boolean processHistoryEvent(String serial, HistoryEvent event) { private boolean processHistoryEvent(String serial, List<TemporaryBasal> temporaryBasals, List<InsightPumpID> pumpStartedEvents, HistoryEvent event) {
if (event instanceof DefaultDateTimeSetEvent) return false; if (event instanceof DefaultDateTimeSetEvent) return false;
else if (event instanceof DateTimeChangedEvent) processDateTimeChangedEvent((DateTimeChangedEvent) event); else if (event instanceof DateTimeChangedEvent) processDateTimeChangedEvent((DateTimeChangedEvent) event);
else if (event instanceof CannulaFilledEvent) processCannulaFilledEvent((CannulaFilledEvent) event); else if (event instanceof CannulaFilledEvent) processCannulaFilledEvent((CannulaFilledEvent) event);
@ -1057,9 +1102,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
else if (event instanceof TubeFilledEvent) processTubeFilledEvent((TubeFilledEvent) event); else if (event instanceof TubeFilledEvent) processTubeFilledEvent((TubeFilledEvent) event);
else if (event instanceof SniffingDoneEvent) processSniffingDoneEvent((SniffingDoneEvent) event); else if (event instanceof SniffingDoneEvent) processSniffingDoneEvent((SniffingDoneEvent) event);
else if (event instanceof PowerUpEvent) processPowerUpEvent((PowerUpEvent) event); else if (event instanceof PowerUpEvent) processPowerUpEvent((PowerUpEvent) event);
else if (event instanceof OperatingModeChangedEvent) processOperatingModeChangedEvent(serial, (OperatingModeChangedEvent) event); else if (event instanceof OperatingModeChangedEvent) processOperatingModeChangedEvent(serial, pumpStartedEvents, (OperatingModeChangedEvent) event);
else if (event instanceof StartOfTBREvent) processStartOfTBREvent(serial, (StartOfTBREvent) event); else if (event instanceof StartOfTBREvent) processStartOfTBREvent(serial, temporaryBasals, (StartOfTBREvent) event);
else if (event instanceof EndOfTBREvent) processEndOfTBREvent(serial, (EndOfTBREvent) event); else if (event instanceof EndOfTBREvent) processEndOfTBREvent(serial, temporaryBasals, (EndOfTBREvent) event);
else if (event instanceof BolusProgrammedEvent) processBolusProgrammedEvent(serial, (BolusProgrammedEvent) event); else if (event instanceof BolusProgrammedEvent) processBolusProgrammedEvent(serial, (BolusProgrammedEvent) event);
else if (event instanceof BolusDeliveredEvent) processBolusDeliveredEvent(serial, (BolusDeliveredEvent) event); else if (event instanceof BolusDeliveredEvent) processBolusDeliveredEvent(serial, (BolusDeliveredEvent) event);
else if (event instanceof OccurrenceOfAlertEvent) processOccurrenceOfAlertEvent((OccurrenceOfAlertEvent) event); else if (event instanceof OccurrenceOfAlertEvent) processOccurrenceOfAlertEvent((OccurrenceOfAlertEvent) event);
@ -1113,7 +1158,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
uploadCareportalEvent(timestamp, CareportalEvent.PUMPBATTERYCHANGE); uploadCareportalEvent(timestamp, CareportalEvent.PUMPBATTERYCHANGE);
} }
private void processOperatingModeChangedEvent(String serial, OperatingModeChangedEvent event) { private void processOperatingModeChangedEvent(String serial, List<InsightPumpID> pumpStartedEvents, OperatingModeChangedEvent event) {
long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
InsightPumpID pumpID = new InsightPumpID(); InsightPumpID pumpID = new InsightPumpID();
@ -1141,7 +1186,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
} }
} }
private void processStartOfTBREvent(String serial, StartOfTBREvent event) { private void processStartOfTBREvent(String serial, List<TemporaryBasal> temporaryBasals, StartOfTBREvent event) {
long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
InsightPumpID pumpID = new InsightPumpID(); InsightPumpID pumpID = new InsightPumpID();
@ -1160,7 +1205,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
temporaryBasals.add(temporaryBasal); temporaryBasals.add(temporaryBasal);
} }
private void processEndOfTBREvent(String serial, EndOfTBREvent event) { private void processEndOfTBREvent(String serial, List<TemporaryBasal> temporaryBasals, EndOfTBREvent event) {
long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(), long timestamp = parseDate(event.getEventYear(), event.getEventMonth(), event.getEventDay(),
event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset; event.getEventHour(), event.getEventMinute(), event.getEventSecond()) + timeOffset;
InsightPumpID pumpID = new InsightPumpID(); InsightPumpID pumpID = new InsightPumpID();