caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Display last connection in Omnipod tab in either red or white based on local alerts settings

Browse source
This commit is contained in:
Bart Sopers 2020-08-29 01:44:31 +02:00
parent 75fa81f945
commit 01c4d34df8
7 changed files with 92 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.androidaps.utils
import info.nightscout.androidaps.Config
import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.R
import info.nightscout.androidaps.db.BgReading
import info.nightscout.androidaps.interfaces.ActivePluginProvider
@ -36,11 +37,11 @@ class LocalAlertUtils @Inject constructor(
) {
fun missedReadingsThreshold(): Long {
return T.mins(sp.getInt(resourceHelper.gs(R.string.key_missed_bg_readings_threshold), 30).toLong()).msecs()
return T.mins(sp.getInt(resourceHelper.gs(R.string.key_missed_bg_readings_threshold_minutes), Constants.DEFAULT_MISSED_BG_READINGS_THRESHOLD_MINUTES).toLong()).msecs()
}
fun pumpUnreachableThreshold(): Long {
return T.mins(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold), 30).toLong()).msecs()
return T.mins(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold_minutes), Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong()).msecs()
}
fun checkPumpUnreachableAlarm(lastConnection: Long, isStatusOutdated: Boolean, isDisconnected: Boolean) {

2
app/src/main/res/values/strings.xml
View file

@ -665,8 +665,6 @@
<string name="enable_pump_unreachable_alert">Alert if pump is unreachable</string>
<string name="pump_unreachable_threshold">Pump unreachable threshold [min]</string>
<string name="enable_carbs_req_alert">Alert if carbs are required</string>
<string name="key_pump_unreachable_threshold" translatable="false">pump_unreachable_threshold</string>
<string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
<string name="urgent_alarm">Urgent Alarm</string>
<string name="info">INFO</string>
<string name="eversense">Eversense App (patched)</string>

4
app/src/main/res/xml/pref_alerts.xml
View file

@ -16,7 +16,7 @@
android:defaultValue="30"
android:dependency="@string/key_enable_missed_bg_readings_alert"
android:inputType="number"
android:key="@string/key_missed_bg_readings_threshold"
android:key="@string/key_missed_bg_readings_threshold_minutes"
android:title="@string/nsalarm_staledatavalue_label"
validate:maxNumber="10000"
validate:minNumber="15"
@ -36,7 +36,7 @@
android:defaultValue="30"
android:dependency="@string/key_enable_pump_unreachable_alert"
android:inputType="number"
android:key="@string/key_pump_unreachable_threshold"
android:key="@string/key_pump_unreachable_threshold_minutes"
android:title="@string/pump_unreachable_threshold"
validate:maxNumber="300"
validate:minNumber="30"

3
core/src/main/java/info/nightscout/androidaps/Constants.java
View file

@ -89,6 +89,9 @@ public class Constants {
// Local profile
public static final String LOCAL_PROFILE = "LocalProfile";
// Local Alerts
public static final int DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES = 30;
public static final int DEFAULT_MISSED_BG_READINGS_THRESHOLD_MINUTES = 30;
// One Time Password

5
core/src/main/res/values/strings.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Keys-->
<string name="key_enable_fabric" translatable="false">enable_fabric</string>
<string name="key_language" translatable="false">language</string>
<string name="key_units" translatable="false">units</string>
@ -22,7 +23,8 @@
<string name="key_ns_uploadlocalprofile" translatable="false">ns_uploadlocalprofile</string>
<string name="key_btwatchdog" translatable="false">bt_watchdog</string>
<string name="key_btwatchdog_lastbark" translatable="false">bt_watchdog_last</string>
<string name="pairing">Pairing</string>
<string name="key_pump_unreachable_threshold_minutes" translatable="false">pump_unreachable_threshold</string>
<string name="key_missed_bg_readings_threshold_minutes" translatable="false">missed_bg_readings_threshold</string>
<!-- General-->
<string name="error">Error</string>
@ -88,6 +90,7 @@
<string name="bluetooth">Bluetooth</string>
<string name="btwatchdog_title">BT Watchdog</string>
<string name="btwatchdog_summary">Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes.</string>
<string name="pairing">Pairing</string>
<!-- Constraints-->
<string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>

140
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
View file

@ -9,6 +9,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import dagger.android.support.DaggerFragment
import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.events.EventPreferenceChange
import info.nightscout.androidaps.interfaces.ActivePluginProvider
import info.nightscout.androidaps.interfaces.CommandQueueProvider
@ -48,7 +49,10 @@ import org.joda.time.Duration
import javax.inject.Inject
class OmnipodFragment : DaggerFragment() {
companion object {
private val REFRESH_INTERVAL_MILLIS = 15 * 1000L; // 15 seconds
private val PLACEHOLDER = "-"; // 15 seconds
}
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var resourceHelper: ResourceHelper
@ -59,15 +63,12 @@ class OmnipodFragment : DaggerFragment() {
@Inject lateinit var warnColors: WarnColors
@Inject lateinit var podStateManager: PodStateManager
@Inject lateinit var sp: SP
@Inject lateinit var aapsOmnipodUtil: AapsOmnipodUtil
@Inject lateinit var omnipodUtil: AapsOmnipodUtil
@Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
@Inject lateinit var dateUtil: DateUtil
@Inject lateinit var aapsOmnipodManager: AapsOmnipodManager
@Inject lateinit var omnipodManager: AapsOmnipodManager
@Inject lateinit var protectionCheck: ProtectionCheck
// TODO somehow obtain the pumpUnreachableThreshold in order to display last connection time red or white
// @Inject lateinit var localAlertUtils: LocalAlertUtils
private var disposables: CompositeDisposable = CompositeDisposable()
private val loopHandler = Handler()
@ -215,28 +216,32 @@ class OmnipodFragment : DaggerFragment() {
}
if (!podStateManager.hasPodState() || !podStateManager.isPodInitialized) {
if (podStateManager.hasPodState()) {
omnipod_pod_address.text = podStateManager.address.toString()
omnipod_pod_address.text = if (podStateManager.hasPodState()) {
podStateManager.address.toString()
} else {
omnipod_pod_address.text = "-"
PLACEHOLDER
}
omnipod_pod_lot.text = "-"
omnipod_pod_tid.text = "-"
omnipod_pod_firmware_version.text = "-"
omnipod_pod_expiry.text = "-"
omnipod_base_basal_rate.text = "-"
omnipod_total_delivered.text = "-"
omnipod_reservoir.text = "-"
omnipod_tempbasal.text = "-"
omnipod_lastbolus.text = "-"
omnipod_pod_active_alerts.text = "-"
omnipod_pod_lot.text = PLACEHOLDER
omnipod_pod_tid.text = PLACEHOLDER
omnipod_pod_firmware_version.text = PLACEHOLDER
omnipod_pod_expiry.text = PLACEHOLDER
omnipod_base_basal_rate.text = PLACEHOLDER
omnipod_total_delivered.text = PLACEHOLDER
omnipod_reservoir.text = PLACEHOLDER
omnipod_temp_basal.text = PLACEHOLDER
omnipod_last_bolus.text = PLACEHOLDER
omnipod_pod_active_alerts.text = PLACEHOLDER
} else {
omnipod_pod_address.text = podStateManager.address.toString()
omnipod_pod_lot.text = podStateManager.lot.toString()
omnipod_pod_tid.text = podStateManager.tid.toString()
omnipod_pod_firmware_version.text = resourceHelper.gs(R.string.omnipod_pod_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
val expiresAt = podStateManager.expiresAt
omnipod_pod_expiry.text = if (expiresAt == null) "-" else dateUtil.dateAndTimeString(expiresAt.toDate())
omnipod_pod_expiry.text = if (expiresAt == null) {
PLACEHOLDER
} else {
dateUtil.dateAndTimeString(expiresAt.toDate())
}
if (podStateManager.hasFaultEvent()) {
val faultEventCode = podStateManager.faultEvent.faultEventCode
@ -244,11 +249,10 @@ class OmnipodFragment : DaggerFragment() {
}
// last bolus
if (podStateManager.lastBolusStartTime != null && podStateManager.lastBolusAmount != null) {
val ago = readableDuration(podStateManager.lastBolusStartTime)
omnipod_lastbolus.text = resourceHelper.gs(R.string.omnipod_last_bolus, omnipodPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), ago)
omnipod_last_bolus.text = if (podStateManager.lastBolusStartTime != null && podStateManager.lastBolusAmount != null) {
resourceHelper.gs(R.string.omnipod_last_bolus, omnipodPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), resourceHelper.gs(R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime))
} else {
omnipod_lastbolus.text = "-"
PLACEHOLDER
}
val now = DateTime.now()
@ -257,7 +261,7 @@ class OmnipodFragment : DaggerFragment() {
omnipod_base_basal_rate.text = if (podStateManager.isPodActivationCompleted) {
resourceHelper.gs(R.string.pump_basebasalrate, omnipodPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(Duration(now.withTimeAtStartOfDay(), now))))
} else {
"-"
PLACEHOLDER
}
// Temp basal
@ -267,20 +271,20 @@ class OmnipodFragment : DaggerFragment() {
if (lastTempBasalStartTime != null && lastTempBasalAmount != null && lastTempBasalDuration != null) {
val endTime = lastTempBasalStartTime.plus(lastTempBasalDuration);
val minutesRunning = Duration(lastTempBasalStartTime, now).standardMinutes
omnipod_tempbasal.text = if (endTime.isAfter(now)) {
omnipod_temp_basal.text = if (endTime.isAfter(now)) {
resourceHelper.gs(R.string.omnipod_temp_basal, lastTempBasalAmount, dateUtil.timeString(lastTempBasalStartTime.millis), minutesRunning, lastTempBasalDuration.standardMinutes)
} else {
"-"
PLACEHOLDER
}
} else {
omnipod_tempbasal.text = "-"
omnipod_temp_basal.text = PLACEHOLDER
}
// total delivered
omnipod_total_delivered.text = if (podStateManager.isPodActivationCompleted && podStateManager.totalInsulinDelivered != null) {
resourceHelper.gs(R.string.omnipod_total_delivered, podStateManager.totalInsulinDelivered - OmnipodConstants.POD_SETUP_UNITS);
} else {
"-"
PLACEHOLDER
}
// reservoir
@ -292,11 +296,15 @@ class OmnipodFragment : DaggerFragment() {
warnColors.setColorInverse(omnipod_reservoir, podStateManager.reservoirLevel, 50.0, 20.0)
}
omnipod_pod_active_alerts.text = if (podStateManager.hasActiveAlerts()) TextUtils.join(System.lineSeparator(), aapsOmnipodUtil.getTranslatedActiveAlerts(podStateManager)) else "-"
omnipod_pod_active_alerts.text = if (podStateManager.hasActiveAlerts()) {
TextUtils.join(System.lineSeparator(), omnipodUtil.getTranslatedActiveAlerts(podStateManager))
} else {
PLACEHOLDER
}
}
if (errors.size == 0) {
omnipod_errors.text = "-"
omnipod_errors.text = PLACEHOLDER
omnipod_errors.setTextColor(Color.WHITE)
} else {
omnipod_errors.text = StringUtils.join(errors, System.lineSeparator())
@ -306,71 +314,69 @@ class OmnipodFragment : DaggerFragment() {
private fun updateLastConnection() {
if (podStateManager.isPodInitialized && podStateManager.lastSuccessfulCommunication != null) {
omnipod_lastconnection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
omnipod_lastconnection.setTextColor(Color.WHITE)
/*
// TODO
if (omnipodPumpPlugin.isUnreachableAlertTimeoutExceeded(localAlertUtils.pumpUnreachableThreshold())) {
omnipod_lastconnection.setTextColor(Color.RED)
omnipod_last_connection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
val lastConnectionColor =
if (omnipodPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) {
Color.RED
} else {
omnipod_lastconnection.setTextColor(Color.WHITE)
Color.WHITE
}
*/
omnipod_last_connection.setTextColor(lastConnectionColor)
} else {
omnipod_lastconnection.setTextColor(Color.WHITE)
if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
omnipod_lastconnection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
omnipod_last_connection.setTextColor(Color.WHITE)
omnipod_last_connection.text = if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
readableDuration(podStateManager.lastSuccessfulCommunication)
} else {
omnipod_lastconnection.text = "-"
PLACEHOLDER
}
}
}
private fun updatePodStatus() {
if (!podStateManager.hasPodState()) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_no_active_pod)
omnipod_pod_status.text = if (!podStateManager.hasPodState()) {
resourceHelper.gs(R.string.omnipod_pod_status_no_active_pod)
} else if (!podStateManager.isPodActivationCompleted) {
if (!podStateManager.isPodInitialized) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
} else {
if (PodProgressStatus.ACTIVATION_TIME_EXCEEDED == podStateManager.podProgressStatus) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_activation_time_exceeded)
resourceHelper.gs(R.string.omnipod_pod_status_activation_time_exceeded)
} else if (podStateManager.podProgressStatus.isBefore(PodProgressStatus.PRIMING_COMPLETED)) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_pair_and_prime)
} else {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_cannula_insertion)
resourceHelper.gs(R.string.omnipod_pod_status_waiting_for_cannula_insertion)
}
}
} else {
if (podStateManager.podProgressStatus.isRunning) {
if (podStateManager.isSuspended) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_suspended)
resourceHelper.gs(R.string.omnipod_pod_status_suspended)
} else {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_running)
resourceHelper.gs(R.string.omnipod_pod_status_running)
}
} else if (podStateManager.podProgressStatus == PodProgressStatus.FAULT_EVENT_OCCURRED) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_pod_fault)
resourceHelper.gs(R.string.omnipod_pod_status_pod_fault)
} else if (podStateManager.podProgressStatus == PodProgressStatus.INACTIVE) {
omnipod_pod_status.text = resourceHelper.gs(R.string.omnipod_pod_status_inactive)
resourceHelper.gs(R.string.omnipod_pod_status_inactive)
} else {
omnipod_pod_status.text = podStateManager.podProgressStatus.toString()
podStateManager.podProgressStatus.toString()
}
}
if (!podStateManager.isPodActivationCompleted || podStateManager.isPodDead || podStateManager.isSuspended) {
omnipod_pod_status.setTextColor(Color.RED)
val podStatusColor = if (!podStateManager.isPodActivationCompleted || podStateManager.isPodDead || podStateManager.isSuspended) {
Color.RED
} else {
omnipod_pod_status.setTextColor(Color.WHITE)
Color.WHITE
}
omnipod_pod_status.setTextColor(podStatusColor)
}
private fun updateQueueStatus() {
val status = commandQueue.spannedStatus()
if (status.toString() == "") {
if (isQueueEmpty()) {
omnipod_queue.visibility = View.GONE
} else {
omnipod_queue.visibility = View.VISIBLE
omnipod_queue.text = status
omnipod_queue.text = commandQueue.spannedStatus().toString()
}
}
@ -405,16 +411,13 @@ class OmnipodFragment : DaggerFragment() {
}
private fun updateAcknowledgeAlertsButton() {
if (podStateManager.isPodActivationCompleted && podStateManager.hasActiveAlerts() && !podStateManager.isPodDead) {
omnipod_button_acknowledge_active_alerts.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
} else {
omnipod_button_acknowledge_active_alerts.isEnabled = false
}
omnipod_button_acknowledge_active_alerts.isEnabled = podStateManager.isPodActivationCompleted && podStateManager.hasActiveAlerts()
&& !podStateManager.isPodDead && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
}
private fun updateSuspendDeliveryButton() {
// If the Pod is currently suspended, we show the Resume delivery button instead.
if (aapsOmnipodManager.isSuspendDeliveryButtonEnabled && !(podStateManager.isPodRunning && podStateManager.isSuspended)) {
if (omnipodManager.isSuspendDeliveryButtonEnabled && !(podStateManager.isPodRunning && podStateManager.isSuspended)) {
omnipod_button_suspend_delivery.visibility = View.VISIBLE
omnipod_button_suspend_delivery.isEnabled = podStateManager.isPodRunning && !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
} else {
@ -423,7 +426,7 @@ class OmnipodFragment : DaggerFragment() {
}
private fun updatePulseLogButton() {
if (aapsOmnipodManager.isPulseLogButtonEnabled) {
if (omnipodManager.isPulseLogButtonEnabled) {
omnipod_button_pulse_log.visibility = View.VISIBLE
omnipod_button_pulse_log.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
} else {
@ -479,4 +482,9 @@ class OmnipodFragment : DaggerFragment() {
return commandQueue.size() == 0 && commandQueue.performing() == null
}
// FIXME ideally we should just have access to LocalAlertUtils here
private fun getPumpUnreachableTimeout(): Duration {
return Duration.standardMinutes(sp.getInt(resourceHelper.gs(R.string.key_pump_unreachable_threshold_minutes), Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES).toLong())
}
}

6
omnipod/src/main/res/layout/omnipod_fragment.xml
View file

@ -361,7 +361,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/omnipod_lastconnection"
android:id="@+id/omnipod_last_connection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -406,7 +406,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/omnipod_lastbolus"
android:id="@+id/omnipod_last_bolus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -497,7 +497,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/omnipod_tempbasal"
android:id="@+id/omnipod_temp_basal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"