caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Synchronize Butterknife / Eventbus

Browse source
This commit is contained in:
Nico Schmitz 2018-06-20 22:57:31 +02:00
parent 6eef71c4c0
commit c3050740a8
5 changed files with 135 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/HistoryBrowseActivity.java
View file

@ -176,7 +176,9 @@ public class HistoryBrowseActivity extends AppCompatActivity {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
updateGUI("EventAutosensCalculationFinished"); synchronized (HistoryBrowseActivity.this) {
updateGUI("EventAutosensCalculationFinished");
}
} }
}); });
} }

56
app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopFragment.java
View file

@ -80,7 +80,7 @@ public class LoopFragment extends SubscriberFragment {
clearGUI(); clearGUI();
final Activity activity = getActivity(); final Activity activity = getActivity();
if (activity != null) if (activity != null)
activity.runOnUiThread(() -> lastRunView.setText(ev.text)); activity.runOnUiThread(() -> { synchronized (LoopFragment.this) { lastRunView.setText(ev.text); } });
} }
@ -89,26 +89,28 @@ public class LoopFragment extends SubscriberFragment {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) if (activity != null)
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
LoopPlugin.LastRun lastRun = LoopPlugin.lastRun; synchronized (LoopFragment.this) {
if (lastRun != null) { LoopPlugin.LastRun lastRun = LoopPlugin.lastRun;
requestView.setText(lastRun.request != null ? lastRun.request.toSpanned() : ""); if (lastRun != null) {
constraintsProcessedView.setText(lastRun.constraintsProcessed != null ? lastRun.constraintsProcessed.toSpanned() : ""); requestView.setText(lastRun.request != null ? lastRun.request.toSpanned() : "");
sourceView.setText(lastRun.source != null ? lastRun.source : ""); constraintsProcessedView.setText(lastRun.constraintsProcessed != null ? lastRun.constraintsProcessed.toSpanned() : "");
lastRunView.setText(lastRun.lastAPSRun != null && lastRun.lastAPSRun.getTime() != 0 ? lastRun.lastAPSRun.toLocaleString() : ""); sourceView.setText(lastRun.source != null ? lastRun.source : "");
lastEnactView.setText(lastRun.lastEnact != null && lastRun.lastEnact.getTime() != 0 ? lastRun.lastEnact.toLocaleString() : ""); lastRunView.setText(lastRun.lastAPSRun != null && lastRun.lastAPSRun.getTime() != 0 ? lastRun.lastAPSRun.toLocaleString() : "");
tbrSetByPumpView.setText(lastRun.tbrSetByPump != null ? Html.fromHtml(lastRun.tbrSetByPump.toHtml()) : ""); lastEnactView.setText(lastRun.lastEnact != null && lastRun.lastEnact.getTime() != 0 ? lastRun.lastEnact.toLocaleString() : "");
smbSetByPumpView.setText(lastRun.smbSetByPump != null ? Html.fromHtml(lastRun.smbSetByPump.toHtml()) : ""); tbrSetByPumpView.setText(lastRun.tbrSetByPump != null ? Html.fromHtml(lastRun.tbrSetByPump.toHtml()) : "");
smbSetByPumpView.setText(lastRun.smbSetByPump != null ? Html.fromHtml(lastRun.smbSetByPump.toHtml()) : "");
String constraints = ""; String constraints = "";
if (lastRun.constraintsProcessed != null) { if (lastRun.constraintsProcessed != null) {
Constraint<Double> allConstraints = new Constraint<>(0d); Constraint<Double> allConstraints = new Constraint<>(0d);
if (lastRun.constraintsProcessed.rateConstraint != null) if (lastRun.constraintsProcessed.rateConstraint != null)
allConstraints.copyReasons(lastRun.constraintsProcessed.rateConstraint); allConstraints.copyReasons(lastRun.constraintsProcessed.rateConstraint);
if (lastRun.constraintsProcessed.smbConstraint != null) if (lastRun.constraintsProcessed.smbConstraint != null)
allConstraints.copyReasons(lastRun.constraintsProcessed.smbConstraint); allConstraints.copyReasons(lastRun.constraintsProcessed.smbConstraint);
constraints = allConstraints.getMostLimitedReasons(); constraints = allConstraints.getMostLimitedReasons();
}
constraintsView.setText(constraints);
} }
constraintsView.setText(constraints);
} }
}); });
} }
@ -117,13 +119,15 @@ public class LoopFragment extends SubscriberFragment {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) if (activity != null)
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
requestView.setText(""); synchronized (LoopFragment.this) {
constraintsProcessedView.setText(""); requestView.setText("");
sourceView.setText(""); constraintsProcessedView.setText("");
lastRunView.setText(""); sourceView.setText("");
lastEnactView.setText(""); lastRunView.setText("");
tbrSetByPumpView.setText(""); lastEnactView.setText("");
smbSetByPumpView.setText(""); tbrSetByPumpView.setText("");
smbSetByPumpView.setText("");
}
}); });
} }
} }

78
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
View file

@ -87,34 +87,36 @@ public class OpenAPSSMBFragment extends SubscriberFragment {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
OpenAPSSMBPlugin plugin = OpenAPSSMBPlugin.getPlugin(); synchronized (OpenAPSSMBFragment.this) {
DetermineBasalResultSMB lastAPSResult = plugin.lastAPSResult; OpenAPSSMBPlugin plugin = OpenAPSSMBPlugin.getPlugin();
if (lastAPSResult != null) { DetermineBasalResultSMB lastAPSResult = plugin.lastAPSResult;
resultView.setText(JSONFormatter.format(lastAPSResult.json)); if (lastAPSResult != null) {
requestView.setText(lastAPSResult.toSpanned()); resultView.setText(JSONFormatter.format(lastAPSResult.json));
} requestView.setText(lastAPSResult.toSpanned());
DetermineBasalAdapterSMBJS determineBasalAdapterSMBJS = plugin.lastDetermineBasalAdapterSMBJS; }
if (determineBasalAdapterSMBJS != null) { DetermineBasalAdapterSMBJS determineBasalAdapterSMBJS = plugin.lastDetermineBasalAdapterSMBJS;
glucoseStatusView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getGlucoseStatusParam()).toString().trim()); if (determineBasalAdapterSMBJS != null) {
currentTempView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getCurrentTempParam()).toString().trim()); glucoseStatusView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getGlucoseStatusParam()).toString().trim());
try { currentTempView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getCurrentTempParam()).toString().trim());
JSONArray iobArray = new JSONArray(determineBasalAdapterSMBJS.getIobDataParam()); try {
iobDataView.setText((String.format(MainApp.gs(R.string.array_of_elements), iobArray.length()) + "\n" + JSONFormatter.format(iobArray.getString(0))).trim()); JSONArray iobArray = new JSONArray(determineBasalAdapterSMBJS.getIobDataParam());
} catch (JSONException e) { iobDataView.setText((String.format(MainApp.gs(R.string.array_of_elements), iobArray.length()) + "\n" + JSONFormatter.format(iobArray.getString(0))).trim());
log.error("Unhandled exception", e); } catch (JSONException e) {
iobDataView.setText("JSONException see log for details"); log.error("Unhandled exception", e);
iobDataView.setText("JSONException see log for details");
}
profileView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getProfileParam()).toString().trim());
mealDataView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getMealDataParam()).toString().trim());
scriptdebugView.setText(determineBasalAdapterSMBJS.getScriptDebug().trim());
if (lastAPSResult != null && lastAPSResult.inputConstraints != null)
constraintsView.setText(lastAPSResult.inputConstraints.getReasons().trim());
}
if (plugin.lastAPSRun != null) {
lastRunView.setText(plugin.lastAPSRun.toLocaleString().trim());
}
if (plugin.lastAutosensResult != null) {
autosensDataView.setText(JSONFormatter.format(plugin.lastAutosensResult.json()).toString().trim());
} }
profileView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getProfileParam()).toString().trim());
mealDataView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getMealDataParam()).toString().trim());
scriptdebugView.setText(determineBasalAdapterSMBJS.getScriptDebug().trim());
if (lastAPSResult != null && lastAPSResult.inputConstraints != null)
constraintsView.setText(lastAPSResult.inputConstraints.getReasons().trim());
}
if (plugin.lastAPSRun != null) {
lastRunView.setText(plugin.lastAPSRun.toLocaleString().trim());
}
if (plugin.lastAutosensResult != null) {
autosensDataView.setText(JSONFormatter.format(plugin.lastAutosensResult.json()).toString().trim());
} }
} }
}); });
@ -126,16 +128,18 @@ public class OpenAPSSMBFragment extends SubscriberFragment {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
resultView.setText(text); synchronized (OpenAPSSMBFragment.this) {
glucoseStatusView.setText(""); resultView.setText(text);
currentTempView.setText(""); glucoseStatusView.setText("");
iobDataView.setText(""); currentTempView.setText("");
profileView.setText(""); iobDataView.setText("");
mealDataView.setText(""); profileView.setText("");
autosensDataView.setText(""); mealDataView.setText("");
scriptdebugView.setText(""); autosensDataView.setText("");
requestView.setText(""); scriptdebugView.setText("");
lastRunView.setText(""); requestView.setText("");
lastRunView.setText("");
}
} }
}); });
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java
View file

@ -79,7 +79,7 @@ public class NSProfileFragment extends SubscriberFragment {
public void onStatusEvent(final EventNSProfileUpdateGUI ev) { public void onStatusEvent(final EventNSProfileUpdateGUI ev) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) if (activity != null)
activity.runOnUiThread(() -> updateGUI()); activity.runOnUiThread(() -> { synchronized (NSProfileFragment.this) { updateGUI(); } });
} }
@Override @Override

118
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
View file

@ -216,71 +216,73 @@ public class DanaRFragment extends SubscriberFragment {
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@Override @Override
public void run() { public void run() {
DanaRPump pump = DanaRPump.getInstance(); synchronized(DanaRFragment.this) {
if (pump.lastConnection != 0) { DanaRPump pump = DanaRPump.getInstance();
Long agoMsec = System.currentTimeMillis() - pump.lastConnection; if (pump.lastConnection != 0) {
int agoMin = (int) (agoMsec / 60d / 1000d); Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.gs(R.string.minago), agoMin) + ")"); int agoMin = (int) (agoMsec / 60d / 1000d);
SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.gs(R.string.minago), agoMin) + ")");
} SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
if (pump.lastBolusTime.getTime() != 0) { }
Long agoMsec = System.currentTimeMillis() - pump.lastBolusTime.getTime(); if (pump.lastBolusTime.getTime() != 0) {
double agoHours = agoMsec / 60d / 60d / 1000d; Long agoMsec = System.currentTimeMillis() - pump.lastBolusTime.getTime();
if (agoHours < 6) // max 6h back double agoHours = agoMsec / 60d / 60d / 1000d;
lastBolusView.setText(DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime.getTime()) + " " + DecimalFormatter.to2Decimal(DanaRPump.getInstance().lastBolusAmount) + " U"); if (agoHours < 6) // max 6h back
else lastBolusView.setText(""); lastBolusView.setText(DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime.getTime()) + " " + DecimalFormatter.to2Decimal(DanaRPump.getInstance().lastBolusAmount) + " U");
} else lastBolusView.setText("");
}
dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U"); dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d); SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " ) " + DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h"); basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " ) " + DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h");
// DanaRPlugin, DanaRKoreanPlugin // DanaRPlugin, DanaRKoreanPlugin
if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) { if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress()) { if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress()) {
tempBasalView.setText(TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull()); tempBasalView.setText(TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
} else {
tempBasalView.setText("");
}
} else { } else {
tempBasalView.setText(""); // v2 plugin
if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) {
tempBasalView.setText(TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
} else {
tempBasalView.setText("");
}
} }
} else { ExtendedBolus activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis());
// v2 plugin if (activeExtendedBolus != null) {
if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) { extendedBolusView.setText(activeExtendedBolus.toString());
tempBasalView.setText(TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
} else { } else {
tempBasalView.setText(""); extendedBolusView.setText("");
} }
} reservoirView.setText(DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + " / 300 U");
ExtendedBolus activeExtendedBolus = TreatmentsPlugin.getPlugin().getExtendedBolusFromHistory(System.currentTimeMillis()); SetWarnColor.setColorInverse(reservoirView, pump.reservoirRemainingUnits, 50d, 20d);
if (activeExtendedBolus != null) { batteryView.setText("{fa-battery-" + (pump.batteryRemaining / 25) + "}");
extendedBolusView.setText(activeExtendedBolus.toString()); SetWarnColor.setColorInverse(batteryView, pump.batteryRemaining, 51d, 26d);
} else { iobView.setText(pump.iob + " U");
extendedBolusView.setText(""); if (pump.model != 0 || pump.protocol != 0 || pump.productCode != 0) {
} firmwareView.setText(String.format(MainApp.gs(R.string.danar_model), pump.model, pump.protocol, pump.productCode));
reservoirView.setText(DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + " / 300 U");
SetWarnColor.setColorInverse(reservoirView, pump.reservoirRemainingUnits, 50d, 20d);
batteryView.setText("{fa-battery-" + (pump.batteryRemaining / 25) + "}");
SetWarnColor.setColorInverse(batteryView, pump.batteryRemaining, 51d, 26d);
iobView.setText(pump.iob + " U");
if (pump.model != 0 || pump.protocol != 0 || pump.productCode != 0) {
firmwareView.setText(String.format(MainApp.gs(R.string.danar_model), pump.model, pump.protocol, pump.productCode));
} else {
firmwareView.setText("OLD");
}
basalStepView.setText("" + pump.basalStep);
bolusStepView.setText("" + pump.bolusStep);
serialNumberView.setText("" + pump.serialNumber);
if (queueView != null) {
Spanned status = ConfigBuilderPlugin.getCommandQueue().spannedStatus();
if (status.toString().equals("")) {
queueView.setVisibility(View.GONE);
} else { } else {
queueView.setVisibility(View.VISIBLE); firmwareView.setText("OLD");
queueView.setText(status); }
basalStepView.setText("" + pump.basalStep);
bolusStepView.setText("" + pump.bolusStep);
serialNumberView.setText("" + pump.serialNumber);
if (queueView != null) {
Spanned status = ConfigBuilderPlugin.getCommandQueue().spannedStatus();
if (status.toString().equals("")) {
queueView.setVisibility(View.GONE);
} else {
queueView.setVisibility(View.VISIBLE);
queueView.setText(status);
}
}
//hide user options button if not an RS pump
boolean isKorean = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class) != null && MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isEnabled(PluginType.PUMP);
if (isKorean ) {
danar_user_options.setVisibility(View.GONE);
} }
}
//hide user options button if not an RS pump
boolean isKorean = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class) != null && MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isEnabled(PluginType.PUMP);
if (isKorean ) {
danar_user_options.setVisibility(View.GONE);
} }
} }
}); });