caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Cleanup: ComboFragement.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-31 11:02:14 +01:00
parent 9121aa5217
commit 88f500417d
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import com.squareup.otto.Subscribe;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import de.jotomo.ruffy.spi.CommandResult;
import de.jotomo.ruffy.spi.PumpState; import de.jotomo.ruffy.spi.PumpState;
import de.jotomo.ruffy.spi.history.Bolus; import de.jotomo.ruffy.spi.history.Bolus;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
@ -124,51 +123,47 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
} }
// last connection // last connection
CommandResult lastCmdResult = plugin.getPump().lastCmdResult; String minAgo = DateUtil.minAgo(plugin.getPump().lastSuccessfulConnection);
if (lastCmdResult != null) { String time = DateUtil.timeString(plugin.getPump().lastSuccessfulConnection);
String minAgo = DateUtil.minAgo(plugin.getPump().lastSuccessfulConnection); String timeAgo = getString(R.string.combo_last_connection_time, minAgo, time);
String time = DateUtil.timeString(plugin.getPump().lastSuccessfulConnection); if (plugin.getPump().lastSuccessfulConnection == 0) {
String timeAgo = getString(R.string.combo_last_connection_time, minAgo, time); lastConnectionView.setText(R.string.combo_pump_never_connected);
if (plugin.getPump().lastSuccessfulConnection == 0) { lastConnectionView.setTextColor(Color.RED);
lastConnectionView.setText(R.string.combo_pump_never_connected); } else if (plugin.getPump().lastSuccessfulConnection < System.currentTimeMillis() - 30 * 60 * 1000) {
lastConnectionView.setTextColor(Color.RED); lastConnectionView.setText(getString(R.string.combo_no_pump_connection, minAgo));
} else if (plugin.getPump().lastSuccessfulConnection < System.currentTimeMillis() - 30 * 60 * 1000) { lastConnectionView.setTextColor(Color.RED);
lastConnectionView.setText(getString(R.string.combo_no_pump_connection, minAgo)); } else if (plugin.getPump().lastConnectionAttempt > plugin.getPump().lastSuccessfulConnection) {
lastConnectionView.setTextColor(Color.RED); lastConnectionView.setText(timeAgo + "\n" + R.string.combo_connect_attempt_failed);
} else if (plugin.getPump().lastConnectionAttempt > plugin.getPump().lastSuccessfulConnection) { lastConnectionView.setTextColor(Color.YELLOW);
lastConnectionView.setText(timeAgo + "\n" + R.string.combo_connect_attempt_failed); } else {
lastConnectionView.setTextColor(Color.YELLOW); lastConnectionView.setText(timeAgo);
} else { lastConnectionView.setTextColor(Color.WHITE);
lastConnectionView.setText(timeAgo);
lastConnectionView.setTextColor(Color.WHITE);
}
// last bolus
Bolus bolus = plugin.getPump().lastBolus;
if (bolus != null && bolus.timestamp + 6 * 60 * 60 * 1000 >= System.currentTimeMillis()) {
long agoMsc = System.currentTimeMillis() - bolus.timestamp;
double agoHours = agoMsc / 60d / 60d / 1000d;
lastBolusView.setText(getString(R.string.combo_last_bolus,
bolus.amount,
agoHours,
getString(R.string.hoursago),
DateUtil.timeString(bolus.timestamp)));
} else {
lastBolusView.setText("");
}
// TBR
boolean tbrActive = ps.tbrPercent != -1 && ps.tbrPercent != 100;
String tbrStr = "";
if (tbrActive) {
long minSinceRead = (System.currentTimeMillis() - plugin.getPump().state.timestamp) / 1000 / 60;
long remaining = ps.tbrRemainingDuration - minSinceRead;
if (remaining >= 0) {
tbrStr = getString(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
}
}
tempBasalText.setText(tbrStr);
} }
// last bolus
Bolus bolus = plugin.getPump().lastBolus;
if (bolus != null && bolus.timestamp + 6 * 60 * 60 * 1000 >= System.currentTimeMillis()) {
long agoMsc = System.currentTimeMillis() - bolus.timestamp;
double agoHours = agoMsc / 60d / 60d / 1000d;
lastBolusView.setText(getString(R.string.combo_last_bolus,
bolus.amount,
agoHours,
getString(R.string.hoursago),
DateUtil.timeString(bolus.timestamp)));
} else {
lastBolusView.setText("");
}
// TBR
String tbrStr = "";
if (ps.tbrPercent != -1 && ps.tbrPercent != 100) {
long minSinceRead = (System.currentTimeMillis() - plugin.getPump().state.timestamp) / 1000 / 60;
long remaining = ps.tbrRemainingDuration - minSinceRead;
if (remaining >= 0) {
tbrStr = getString(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
}
}
tempBasalText.setText(tbrStr);
} }
}); });
} }