caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Display active alert in Combo tab.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-19 21:25:08 +01:00
parent 3070cba612
commit dafb6d225b
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -96,9 +96,11 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
// state
stateView.setText(plugin.getStateSummary());
PumpState ps = plugin.getPump().state;
if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY) {
if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY
|| ps.activeAlert != null && ps.activeAlert.errorCode != null) {
stateView.setTextColor(Color.RED);
} else if (plugin.getPump().state.suspended) {
} else if (plugin.getPump().state.suspended
|| ps.activeAlert != null && ps.activeAlert.warningCode != null) {
stateView.setTextColor(Color.YELLOW);
} else {
stateView.setTextColor(Color.WHITE);

9
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -141,7 +141,11 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
String getStateSummary() {
PumpState ps = pump.state;
if (ps.menu == null)
if (ps.activeAlert != null) {
return ps.activeAlert.errorCode != null
? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message
: "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message;
} else if (ps.menu == null)
return MainApp.sResources.getString(R.string.combo_pump_state_disconnected);
else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY))
return MainApp.sResources.getString(R.string.combo_pump_state_suspended_due_to_error);
@ -642,6 +646,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
if (!ruffyScripter.isConnected()) {
CommandResult preCheckError = runOnConnectChecks();
if (preCheckError != null) {
updateLocalData(preCheckError);
return preCheckError;
}
}
@ -656,7 +661,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
}
for (Integer forwardedWarning : commandResult.forwardedWarnings) {
notifyAboutPumpWarning(new WarningOrErrorCode(forwardedWarning, null));
notifyAboutPumpWarning(new WarningOrErrorCode(forwardedWarning, null, null));
}
if (commandResult.success) {

6
ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/WarningOrErrorCode.java
View file

@ -7,13 +7,16 @@ public class WarningOrErrorCode {
public final Integer warningCode;
@Nullable
public final Integer errorCode;
@Nullable
public String message;
public WarningOrErrorCode(@Nullable Integer warningCode, @Nullable Integer errorCode) {
public WarningOrErrorCode(@Nullable Integer warningCode, @Nullable Integer errorCode, @Nullable String message) {
if (warningCode == null && errorCode == null) {
throw new IllegalArgumentException("Either code must be non-null");
}
this.warningCode = warningCode;
this.errorCode = errorCode;
this.message = message;
}
@Override
@ -21,6 +24,7 @@ public class WarningOrErrorCode {
return "WarningOrErrorCode{" +
"warningCode=" + warningCode +
", errorCode=" + errorCode +
", message=" + message +
'}';
}
}

4
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -254,6 +254,7 @@ public class RuffyScripter implements RuffyCommands {
// check pump in a suitable state to run the requested command
if (cmd instanceof ReadPumpStateCommand) {
// always allowed, state is set at the end of runCommand method
activeCmd.getResult().success = true;
} else if (getCurrentMenu().getType() == MenuType.STOP && cmd.needsRunMode()) {
log.error("Requested command requires run mode, but pump is suspended");
activeCmd.getResult().success = false;
@ -508,8 +509,9 @@ public class RuffyScripter implements RuffyCommands {
errorCode = (Integer) getCurrentMenu().getAttribute(MenuAttribute.ERROR);
retries--;
}
String message = (String) getCurrentMenu().getAttribute(MenuAttribute.MESSAGE);
return (warningCode != null || errorCode != null)
? new WarningOrErrorCode(warningCode, errorCode) : null;
? new WarningOrErrorCode(warningCode, errorCode, message) : null;
}
public static class Key {