Improve button state handling in Omnipod tab, read Pod status on AAPS startup and some cleanup
This commit is contained in:
Bart Sopers
parent
219b1e02ba
commit
c70fedbc72
|
|
@ -24,7 +24,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManage
|
|||
import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.PodManagementActivity
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodRefreshButtonState
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil
|
||||
import info.nightscout.androidaps.queue.Callback
|
||||
import info.nightscout.androidaps.utils.DateUtil
|
||||
|
|
@ -99,18 +98,16 @@ class OmnipodFragment : DaggerFragment() {
|
|||
}
|
||||
|
||||
omnipod_refresh.setOnClickListener {
|
||||
if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() != true) {
|
||||
displayNotConfiguredDialog()
|
||||
} else {
|
||||
omnipod_pod_active_alerts_ack.isEnabled = false
|
||||
omnipod_refresh.isEnabled = false
|
||||
omnipod_pod_debug.isEnabled = false
|
||||
omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequest.GetPodState);
|
||||
commandQueue.readStatus("Clicked Refresh", object : Callback() {
|
||||
override fun run() {
|
||||
activity?.runOnUiThread { omnipod_refresh.isEnabled = true }
|
||||
activity?.runOnUiThread { updateOmipodUiElements() }
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
omnipod_stats.setOnClickListener {
|
||||
if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
|
||||
|
|
@ -125,8 +122,14 @@ class OmnipodFragment : DaggerFragment() {
|
|||
displayNotConfiguredDialog()
|
||||
} else {
|
||||
omnipod_pod_active_alerts_ack.isEnabled = false
|
||||
omnipod_refresh.isEnabled = false
|
||||
omnipod_pod_debug.isEnabled = false
|
||||
omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequest.AcknowledgeAlerts);
|
||||
commandQueue.readStatus("Clicked Alert Ack", null)
|
||||
commandQueue.readStatus("Clicked Alert Ack", object : Callback() {
|
||||
override fun run() {
|
||||
activity?.runOnUiThread { updateOmipodUiElements() }
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -134,11 +137,13 @@ class OmnipodFragment : DaggerFragment() {
|
|||
if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() != true) {
|
||||
displayNotConfiguredDialog()
|
||||
} else {
|
||||
omnipod_pod_active_alerts_ack.isEnabled = false
|
||||
omnipod_refresh.isEnabled = false
|
||||
omnipod_pod_debug.isEnabled = false
|
||||
omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequest.GetPodPulseLog);
|
||||
commandQueue.readStatus("Clicked Refresh", object : Callback() {
|
||||
override fun run() {
|
||||
activity?.runOnUiThread { omnipod_pod_debug.isEnabled = true }
|
||||
activity?.runOnUiThread { updateOmipodUiElements() }
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -148,10 +153,6 @@ class OmnipodFragment : DaggerFragment() {
|
|||
override fun onResume() {
|
||||
super.onResume()
|
||||
loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
|
||||
disposables += rxBus
|
||||
.toObservable(EventOmnipodRefreshButtonState::class.java)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe({ omnipod_refresh.isEnabled = it.newState }, { fabricPrivacy.logException(it) })
|
||||
disposables += rxBus
|
||||
.toObservable(EventRileyLinkDeviceStatusChange::class.java)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
|
|
@ -170,13 +171,13 @@ class OmnipodFragment : DaggerFragment() {
|
|||
}
|
||||
|
||||
fun setVisibilityOfPodDebugButton() {
|
||||
val isEnabled = aapsOmnipodManager.isPodDebuggingOptionsEnabled
|
||||
|
||||
if (isEnabled)
|
||||
if (aapsOmnipodManager.isPodDebuggingOptionsEnabled) {
|
||||
omnipod_pod_debug.visibility = View.VISIBLE
|
||||
else
|
||||
omnipod_pod_debug.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && !commandQueue.statusInQueue()
|
||||
} else {
|
||||
omnipod_pod_debug.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
private fun displayNotConfiguredDialog() {
|
||||
context?.let {
|
||||
|
|
@ -294,7 +295,8 @@ class OmnipodFragment : DaggerFragment() {
|
|||
omnipod_queue.text = status
|
||||
}
|
||||
|
||||
omnipod_refresh.isEnabled = podStateManager.isPodInitialized && podStateManager.podProgressStatus.isAtLeast(PodProgressStatus.PAIRING_COMPLETED)
|
||||
omnipod_refresh.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && podStateManager.isPodInitialized
|
||||
&& podStateManager.podProgressStatus.isAtLeast(PodProgressStatus.PAIRING_COMPLETED) && !commandQueue.statusInQueue()
|
||||
}
|
||||
|
||||
private fun updateLastConnectionUiElements() {
|
||||
|
|
@ -358,12 +360,12 @@ class OmnipodFragment : DaggerFragment() {
|
|||
}
|
||||
|
||||
private fun updateAcknowledgeAlertsUiElements() {
|
||||
if (podStateManager.isPodInitialized && podStateManager.hasActiveAlerts()) {
|
||||
omnipod_pod_active_alerts_ack.isEnabled = true
|
||||
if (podStateManager.isPodInitialized && podStateManager.hasActiveAlerts() && !podStateManager.isPodDead) {
|
||||
omnipod_pod_active_alerts.text = TextUtils.join(System.lineSeparator(), omnipodUtil.getTranslatedActiveAlerts(podStateManager))
|
||||
omnipod_pod_active_alerts_ack.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && !commandQueue.statusInQueue()
|
||||
} else {
|
||||
omnipod_pod_active_alerts_ack.isEnabled = false
|
||||
omnipod_pod_active_alerts.text = "-"
|
||||
omnipod_pod_active_alerts_ack.isEnabled = false
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,12 +67,12 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.pod
|
|||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCustomActionType;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodStatusRequest;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUIComm;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUITask;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodRefreshButtonState;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.service.RileyLinkOmnipodService;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
|
||||
|
|
@ -117,11 +117,9 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
// variables for handling statuses and history
|
||||
protected boolean firstRun = true;
|
||||
protected boolean isRefresh = false;
|
||||
protected boolean hasTimeDateOrTimeZoneChanged = false;
|
||||
protected boolean serviceRunning = false;
|
||||
protected boolean displayConnectionMessages = false;
|
||||
private boolean isInitialized = false;
|
||||
private RileyLinkOmnipodService rileyLinkOmnipodService;
|
||||
private boolean busy = false;
|
||||
private int timeChangeRetries;
|
||||
|
|
@ -412,16 +410,15 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
@Override
|
||||
public void getPumpStatus() {
|
||||
if (firstRun) {
|
||||
initializePump(!isRefresh);
|
||||
triggerUIChange();
|
||||
|
||||
initializePump();
|
||||
} else if (!omnipodStatusRequestList.isEmpty()) {
|
||||
Iterator<OmnipodStatusRequest> iterator = omnipodStatusRequestList.iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
OmnipodStatusRequest omnipodStatusRequest = iterator.next();
|
||||
OmnipodUITask omnipodUITask;
|
||||
if (omnipodStatusRequest == OmnipodStatusRequest.GetPodPulseLog) {
|
||||
OmnipodUITask omnipodUITask = getDeviceCommandExecutor().executeCommand(omnipodStatusRequest.getCommandType());
|
||||
omnipodUITask = getDeviceCommandExecutor().executeCommand(omnipodStatusRequest.getCommandType());
|
||||
|
||||
PodInfoRecentPulseLog result = (PodInfoRecentPulseLog) omnipodUITask.returnDataObject;
|
||||
|
||||
|
|
@ -440,7 +437,11 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
}
|
||||
|
||||
} else {
|
||||
getDeviceCommandExecutor().executeCommand(omnipodStatusRequest.getCommandType());
|
||||
omnipodUITask = getDeviceCommandExecutor().executeCommand(omnipodStatusRequest.getCommandType());
|
||||
}
|
||||
|
||||
if (!omnipodUITask.wasCommandSuccessful()) {
|
||||
// TODO Refresh buttons
|
||||
}
|
||||
iterator.remove();
|
||||
}
|
||||
|
|
@ -471,8 +472,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
@NotNull
|
||||
@Override
|
||||
public PumpEnactResult setNewBasalProfile(Profile profile) {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
OmnipodUITask responseTask = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.SetBasalProfile,
|
||||
profile);
|
||||
|
||||
|
|
@ -538,8 +537,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
@NonNull @Override
|
||||
public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
|
||||
|
||||
try {
|
||||
if (detailedBolusInfo.insulin == 0 && detailedBolusInfo.carbs == 0) {
|
||||
// neither carbs nor bolus requested
|
||||
aapsLogger.error("deliverTreatment: Invalid input");
|
||||
|
|
@ -563,18 +560,11 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
|
||||
.carbsDelivered(detailedBolusInfo.carbs).comment(getResourceHelper().gs(info.nightscout.androidaps.core.R.string.common_resultok));
|
||||
}
|
||||
} finally {
|
||||
triggerUIChange();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopBolusDelivering() {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
getDeviceCommandExecutor().executeCommand(OmnipodCommandType.CancelBolus);
|
||||
|
||||
setRefreshButtonEnabled(true);
|
||||
}
|
||||
|
||||
// if enforceNew===true current temp basal is canceled and new TBR set (duration is prolonged),
|
||||
|
|
@ -582,8 +572,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
@Override
|
||||
public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer
|
||||
durationInMinutes, Profile profile, boolean enforceNew) {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: rate: {}, duration={}", absoluteRate, durationInMinutes);
|
||||
|
||||
// read current TBR
|
||||
|
|
@ -597,7 +585,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
if (tbrCurrent != null && !enforceNew) {
|
||||
if (Round.isSame(tbrCurrent.absoluteRate, absoluteRate)) {
|
||||
aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute - No enforceNew and same rate. Exiting.");
|
||||
finishAction("TBR");
|
||||
refreshOverview("TBR");
|
||||
return new PumpEnactResult(getInjector()).success(true).enacted(false);
|
||||
}
|
||||
}
|
||||
|
|
@ -614,7 +602,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
incrementStatistics(OmnipodConst.Statistics.TBRsSet);
|
||||
}
|
||||
|
||||
finishAction("TBR");
|
||||
refreshOverview("TBR");
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -632,21 +620,19 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
@Override
|
||||
public PumpEnactResult cancelTempBasal(boolean enforceNew) {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
TemporaryBasal tbrCurrent = readTBR();
|
||||
|
||||
if (tbrCurrent == null) {
|
||||
aapsLogger.info(LTag.PUMP, "cancelTempBasal - TBR already canceled.");
|
||||
finishAction("TBR");
|
||||
refreshOverview("TBR");
|
||||
return new PumpEnactResult(getInjector()).success(true).enacted(false);
|
||||
}
|
||||
|
||||
OmnipodUITask responseTask2 = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.CancelTemporaryBasal);
|
||||
OmnipodUITask responseTask = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.CancelTemporaryBasal);
|
||||
|
||||
PumpEnactResult result = responseTask2.getResult();
|
||||
PumpEnactResult result = responseTask.getResult();
|
||||
|
||||
finishAction("TBR");
|
||||
refreshOverview("TBR");
|
||||
|
||||
if (result.success) {
|
||||
// TODO is this necessary?
|
||||
|
|
@ -836,43 +822,23 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
return rileyLinkOmnipodService.getDeviceCommandExecutor();
|
||||
}
|
||||
|
||||
private void getPodPumpStatus() {
|
||||
// TODO read pod status
|
||||
aapsLogger.error(LTag.PUMP, "getPodPumpStatus() NOT IMPLEMENTED");
|
||||
}
|
||||
|
||||
public void addPodStatusRequest(OmnipodStatusRequest pumpStatusRequest) {
|
||||
if (pumpStatusRequest == OmnipodStatusRequest.ResetState) {
|
||||
resetStatusState();
|
||||
} else {
|
||||
omnipodStatusRequestList.add(pumpStatusRequest);
|
||||
}
|
||||
}
|
||||
|
||||
public void resetStatusState() {
|
||||
firstRun = true;
|
||||
isRefresh = true;
|
||||
}
|
||||
|
||||
// FIXME do we actually need this? If a user presses refresh during an action,
|
||||
// I suppose the GetStatusCommand would just be queued?
|
||||
private void setRefreshButtonEnabled(boolean enabled) {
|
||||
rxBus.send(new EventOmnipodRefreshButtonState(enabled));
|
||||
}
|
||||
|
||||
// FIXME strange
|
||||
private void initializePump(boolean realInit) {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
if (podStateManager.isPodInitialized()) {
|
||||
aapsLogger.debug(LTag.PUMP, "PodStateManager (saved): " + podStateManager);
|
||||
// TODO handle if session state too old
|
||||
getPodPumpStatus();
|
||||
private void initializePump() {
|
||||
if (podStateManager.isPodInitialized() && podStateManager.getPodProgressStatus().isAtLeast(PodProgressStatus.PAIRING_COMPLETED)) {
|
||||
OmnipodUITask omnipodUITask = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.GetPodStatus);
|
||||
if (omnipodUITask.wasCommandSuccessful()) {
|
||||
aapsLogger.debug(LTag.PUMP, "Successfully retrieved Pod status on startup");
|
||||
} else {
|
||||
aapsLogger.debug(LTag.PUMP, "No Pod running");
|
||||
aapsLogger.warn(LTag.PUMP, "Failed to retrieve Pod status on startup");
|
||||
}
|
||||
} else {
|
||||
aapsLogger.debug(LTag.PUMP, "Not retrieving Pod status on startup: no Pod running");
|
||||
}
|
||||
|
||||
finishAction("Omnipod Pump");
|
||||
refreshOverview("Omnipod Pump");
|
||||
|
||||
if (!sentIdToFirebase) {
|
||||
Bundle params = new Bundle();
|
||||
|
|
@ -883,27 +849,17 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
sentIdToFirebase = true;
|
||||
}
|
||||
|
||||
isInitialized = true;
|
||||
|
||||
this.firstRun = false;
|
||||
}
|
||||
|
||||
protected void triggerUIChange() {
|
||||
rxBus.send(new EventOmnipodPumpValuesChanged());
|
||||
}
|
||||
|
||||
@NonNull
|
||||
protected PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
|
||||
setRefreshButtonEnabled(false);
|
||||
|
||||
try {
|
||||
OmnipodUITask responseTask = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.SetBolus,
|
||||
detailedBolusInfo);
|
||||
|
||||
PumpEnactResult result = responseTask.getResult();
|
||||
|
||||
setRefreshButtonEnabled(true);
|
||||
|
||||
if (result.success) {
|
||||
incrementStatistics(detailedBolusInfo.isSMB ? OmnipodConst.Statistics.SMBBoluses
|
||||
: OmnipodConst.Statistics.StandardBoluses);
|
||||
|
|
@ -913,7 +869,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
|
||||
return result;
|
||||
} finally {
|
||||
finishAction("Bolus");
|
||||
refreshOverview("Bolus");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -927,13 +883,8 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
|
|||
return activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
|
||||
}
|
||||
|
||||
protected void finishAction(String overviewKey) {
|
||||
if (overviewKey != null)
|
||||
protected void refreshOverview(String overviewKey) {
|
||||
rxBus.send(new EventRefreshOverview(overviewKey, false));
|
||||
|
||||
triggerUIChange();
|
||||
|
||||
setRefreshButtonEnabled(true);
|
||||
}
|
||||
|
||||
private PumpEnactResult getOperationNotSupportedWithCustomText(int resourceId) {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.defs;
|
|||
* Created by andy on 4.8.2019
|
||||
*/
|
||||
public enum OmnipodCommandType {
|
||||
|
||||
PairAndPrimePod, //
|
||||
FillCanulaAndSetBasalProfile, //
|
||||
//InitPod, //
|
||||
PairAndPrimePod, // First step of Pod activation
|
||||
FillCanulaAndSetBasalProfile, // Second step of Pod activation
|
||||
DeactivatePod, //
|
||||
SetBasalProfile, //
|
||||
SetBolus, //
|
||||
|
|
@ -19,6 +17,4 @@ public enum OmnipodCommandType {
|
|||
SetTime, //
|
||||
AcknowledgeAlerts, //
|
||||
GetPodPulseLog;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.defs;
|
||||
|
||||
public enum OmnipodStatusRequest {
|
||||
ResetState(OmnipodCommandType.ResetPodStatus), //
|
||||
AcknowledgeAlerts(OmnipodCommandType.AcknowledgeAlerts), //
|
||||
GetPodState(OmnipodCommandType.GetPodStatus), //
|
||||
GetPodPulseLog(OmnipodCommandType.GetPodPulseLog);
|
||||
|
|
@ -12,7 +11,6 @@ public enum OmnipodStatusRequest {
|
|||
this.commandType = commandType;
|
||||
}
|
||||
|
||||
|
||||
public OmnipodCommandType getCommandType() {
|
||||
return commandType;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.events
|
||||
|
||||
import info.nightscout.androidaps.events.Event
|
||||
|
||||
class EventOmnipodRefreshButtonState(val newState: Boolean) : Event()
|
||||
Loading…
Reference in a new issue