caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- combo changes to display error count

Browse source
This commit is contained in:
Andy Rozman 2021-12-28 22:54:04 +00:00
parent e14cdd7c2a
commit 1ca04777c3
9 changed files with 304 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
View file

@ -8,6 +8,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -19,6 +20,7 @@ import dagger.android.support.DaggerFragment;
import info.nightscout.androidaps.combo.R;
import info.nightscout.androidaps.interfaces.CommandQueue;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.combo.data.ComboErrorUtil;
import info.nightscout.androidaps.plugins.pump.combo.events.EventComboPumpUpdateGUI;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
@ -53,6 +55,12 @@ public class ComboFragment extends DaggerFragment {
private TextView bolusCount;
private TextView tbrCount;
private View errorCountDelimiter;
private LinearLayout errorCountLayout;
private TextView errorCountLabel;
private TextView errorCountDots;
private TextView errorCountValue;
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@ -69,6 +77,12 @@ public class ComboFragment extends DaggerFragment {
bolusCount = view.findViewById(R.id.combo_bolus_count);
tbrCount = view.findViewById(R.id.combo_tbr_count);
errorCountDelimiter = view.findViewById(R.id.combo_connection_error_delimiter);
errorCountLayout = view.findViewById(R.id.combo_connection_error_layout);
errorCountLabel = view.findViewById(R.id.combo_connection_error_label);
errorCountDots = view.findViewById(R.id.combo_connection_error_dots);
errorCountValue = view.findViewById(R.id.combo_connection_error_value);
refreshButton = view.findViewById(R.id.combo_refresh_button);
refreshButton.setOnClickListener(v -> {
refreshButton.setEnabled(false);
@ -240,6 +254,47 @@ public class ComboFragment extends DaggerFragment {
// stats
bolusCount.setText(String.valueOf(comboPlugin.getBolusesDelivered()));
tbrCount.setText(String.valueOf(comboPlugin.getTbrsSet()));
updateErrorDisplay(false);
} else {
updateErrorDisplay(true);
}
}
}
private void updateErrorDisplay(boolean forceHide) {
int errorCount = -1;
ComboErrorUtil errorUtil = ComboErrorUtil.getInstance();
if (!forceHide) {
ComboErrorUtil.DisplayType displayType = errorUtil.getDisplayType();
if (displayType== ComboErrorUtil.DisplayType.ON_ERROR || displayType== ComboErrorUtil.DisplayType.ALWAYS) {
int errorCountInternal = errorUtil.getErrorCount();
if (errorCountInternal>0) {
errorCount = errorCountInternal;
} else if (displayType== ComboErrorUtil.DisplayType.ALWAYS) {
errorCount = 0;
}
}
}
if (errorCount >=0) {
errorCountDelimiter.setVisibility(View.VISIBLE);
errorCountLayout.setVisibility(View.VISIBLE);
errorCountLabel.setVisibility(View.VISIBLE);
errorCountDots.setVisibility(View.VISIBLE);
errorCountValue.setVisibility(View.VISIBLE);
errorCountValue.setText(errorCount==0 ?
"-" :
""+errorCount);
} else {
errorCountDelimiter.setVisibility(View.GONE);
errorCountLayout.setVisibility(View.GONE);
errorCountLabel.setVisibility(View.GONE);
errorCountDots.setVisibility(View.GONE);
errorCountValue.setVisibility(View.GONE);
}
}
}

5
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
View file

@ -38,6 +38,7 @@ import info.nightscout.androidaps.interfaces.Pump;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.interfaces.PumpSync;
import info.nightscout.androidaps.plugins.pump.combo.data.ComboErrorUtil;
import info.nightscout.shared.logging.AAPSLogger;
import info.nightscout.shared.logging.LTag;
import info.nightscout.androidaps.plugins.bus.RxBus;
@ -161,6 +162,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
.pluginIcon(R.drawable.ic_combo_128)
.pluginName(R.string.combopump)
.shortName(R.string.combopump_shortname)
.preferencesId(R.xml.pref_combo)
.description(R.string.description_pump_combo),
injector, aapsLogger, rh, commandQueue
);
@ -172,6 +174,9 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
this.pumpSync = pumpSync;
this.dateUtil = dateUtil;
ComboErrorUtil.getInstance().setSP(sp);
ComboErrorUtil.getInstance().clearErrors();
pumpDescription.fillFor(PumpType.ACCU_CHEK_COMBO);
}

106
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ComboErrorUtil.java Executable file
View file

@ -0,0 +1,106 @@
package info.nightscout.androidaps.plugins.pump.combo.data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import info.nightscout.androidaps.combo.R;
import info.nightscout.shared.sharedPreferences.SP;
/**
* Created by andy on 3/17/18.
*/
public class ComboErrorUtil {
private SP sp;
Map<String, List<ErrorState>> errorMap = new HashMap<>();
private static final ComboErrorUtil comboDataUtil = new ComboErrorUtil();
private ComboErrorUtil() {
}
public static ComboErrorUtil getInstance() {
return comboDataUtil;
}
public void setSP(SP sp) {
this.sp = sp;
}
public void addError(Exception exception) {
String exceptionMsg = exception.getMessage();
if (!errorMap.containsKey(exceptionMsg)) {
List<ErrorState> list = new ArrayList<>();
list.add(createErrorState(exception));
errorMap.put(exceptionMsg, list);
} else {
errorMap.get(exceptionMsg).add(createErrorState(exception));
}
updateErrorCount();
}
private void updateErrorCount() {
int errorCount = 0;
if (!isErrorPresent()) {
for (List<ErrorState> errorStates : errorMap.values()) {
errorCount += errorStates.size();
}
}
if (errorCount==0) {
if (sp.contains(R.string.key_combo_error_count)) {
sp.remove(R.string.key_combo_error_count);
}
} else {
sp.putInt(R.string.key_combo_error_count, errorCount);
}
}
private ErrorState createErrorState(Exception exception) {
ErrorState errorState = new ErrorState();
errorState.setException(exception);
errorState.setTimeInMillis(System.currentTimeMillis());
return errorState;
}
public void clearErrors() {
if (errorMap != null)
this.errorMap.clear();
else
this.errorMap = new HashMap<>();
if (sp.contains(R.string.key_combo_error_count)) {
sp.remove(R.string.key_combo_error_count);
}
}
public boolean isErrorPresent() {
return !this.errorMap.isEmpty();
}
public int getErrorCount() {
return sp.contains(R.string.key_combo_error_count) ?
sp.getInt(R.string.key_combo_error_count, -1) : -1;
}
public DisplayType getDisplayType() {
String displayTypeString = sp.getString(R.string.key_show_comm_error_count, "ON_ERROR");
return DisplayType.valueOf(displayTypeString);
}
public enum DisplayType {
NEVER,
ON_ERROR,
ALWAYS
}
}

17
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/data/ErrorState.java Executable file
View file

@ -0,0 +1,17 @@
package info.nightscout.androidaps.plugins.pump.combo.data;
public class ErrorState {
private Exception exception;
private long timeInMillis;
public void setException(Exception exception) {
this.exception = exception;
}
public void setTimeInMillis(long timeInMillis) {
this.timeInMillis = timeInMillis;
}
}

19
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
View file

@ -25,6 +25,7 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
import info.nightscout.androidaps.plugins.pump.combo.data.ComboErrorUtil;
import info.nightscout.shared.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadQuickInfoCommand;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
@ -188,6 +189,14 @@ public class RuffyScripter implements RuffyCommands {
}
}
private void addError(Exception e) {
try {
ComboErrorUtil.getInstance().addError(e);
} catch (Exception ex) {
log.error("Combo data util problem." + ex.getMessage(), ex);
}
}
@Override
public synchronized void disconnect() {
if (ruffyService == null) {
@ -196,10 +205,16 @@ public class RuffyScripter implements RuffyCommands {
try {
log.debug("Disconnecting");
ruffyService.doRTDisconnect();
try {
ComboErrorUtil.getInstance().clearErrors();
} catch (Exception ex) {
log.error("Combo data util problem." + ex.getMessage(), ex);
}
} catch (RemoteException e) {
// ignore
} catch (Exception e) {
log.warn("Disconnect not happy", e);
addError(e);
}
}
@ -262,9 +277,11 @@ public class RuffyScripter implements RuffyCommands {
log.debug("Executing " + cmd + " took " + (cmdEndTime - cmdStartTime) + "ms");
} catch (CommandException e) {
log.info("CommandException running command", e);
addError(e);
cmd.getResult().success = false;
} catch (Exception e) {
log.error("Unexpected exception running cmd", e);
addError(e);
cmd.getResult().success = false;
}
}, cmd.getClass().getSimpleName());
@ -329,10 +346,12 @@ public class RuffyScripter implements RuffyCommands {
} catch (CommandException e) {
log.error("CommandException while executing command", e);
PumpState pumpState = recoverFromCommandFailure();
addError(e);
return activeCmd.getResult().success(false).state(pumpState);
} catch (Exception e) {
log.error("Unexpected exception communication with ruffy", e);
PumpState pumpState = recoverFromCommandFailure();
addError(e);
return activeCmd.getResult().success(false).state(pumpState);
} finally {
Menu menu = this.currentMenu;

49
combo/src/main/res/layout/combopump_fragment.xml
View file

@ -462,6 +462,55 @@
</LinearLayout>
<View
android:id="@+id/combo_connection_error_delimiter"
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/list_delimiter" />
<LinearLayout
android:id="@+id/combo_connection_error_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/combo_connection_error_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/pump_commerror_label"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_connection_error_dots"
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_connection_error_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"

14
combo/src/main/res/values/arrays.xml Executable file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="comboErrorDisplay">
<item>@string/combo_error_display_never</item>
<item>@string/combo_error_display_error</item>
<item>@string/combo_error_display_always</item>
</string-array>
<string-array name="comboErrorDisplayValues">
<item>@string/key_combo_error_display_never</item>
<item>@string/key_combo_error_display_error</item>
<item>@string/key_combo_error_display_always</item>
</string-array>
</resources>

17
combo/src/main/res/values/strings.xml
View file

@ -57,4 +57,19 @@
<string name="combo_pump_serial" translatable="false">combo_pump_serial</string>
<string name="combo_tbrs_set" translatable="false">combo_tbrs_set</string>
<string name="combo_boluses_delivered" translatable="false">combo_boluses_delivered</string>
</resources>
<string name="pump_commerror_label">Comm. Error count</string>
<string name="key_combo_error_count" translatable="false">combo_error_count</string>
<string name="key_combo_name_settings" translatable="false">combo_name_settings</string>
<string name="key_show_comm_error_count" translatable="false">show_error_count</string>
<string name="show_comm_error_count_title">Show comm. error count</string>
<string name="show_comm_error_count_summary">Shows count of errors, when communicating with Ruffy. In most cases number higher than 0 denotes, Ruffy communication problems (restart might be needed).</string>
<string name="combo_error_display_never">Never</string>
<string name="combo_error_display_error">When Error</string>
<string name="combo_error_display_always">Always</string>
<string name="key_combo_error_display_never" translatable="false">NEVER</string>
<string name="key_combo_error_display_error" translatable="false">ON_ERROR</string>
<string name="key_combo_error_display_always" translatable="false">ALWAYS</string>
</resources>

22
combo/src/main/res/xml/pref_combo.xml Executable file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:validate="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:key="@string/key_combo_name_settings"
android:title="@string/combopump"
app:initialExpandedChildrenCount="0">
<ListPreference
android:defaultValue="@string/combo_error_display_error"
android:entries="@array/comboErrorDisplay"
android:entryValues="@array/comboErrorDisplayValues"
android:key="@string/key_show_comm_error_count"
android:summary="@string/show_comm_error_count_summary"
android:selectable="true"
android:title="@string/show_comm_error_count_title" />
</PreferenceCategory>
</androidx.preference.PreferenceScreen>