From ad60009a1ce79c909f24e71d23dc97e2b7fb70b9 Mon Sep 17 00:00:00 2001
From: Youngjin <inararo@eoflow.com>
Date: Thu, 31 Mar 2022 19:44:12 +0900
Subject: [PATCH] Modified so that the basal rate of the EOPATCH2 overview
 screen is updated immediately when the basal profile is changed

---
 .../eopatch/ui/EopatchOverviewFragment.kt     | 10 +++++
 .../ui/viewmodel/EopatchOverviewViewModel.kt  | 39 ++++++++++++++-----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt b/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt
index 2346f206be..eb4707c8d8 100644
--- a/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt
+++ b/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt
@@ -80,6 +80,16 @@ class EopatchOverviewFragment: EoBaseFragment<FragmentEopatchOverviewBinding>()
         }
     }
 
+    override fun onPause() {
+        super.onPause()
+        binding.viewmodel?.stopBasalRateUpdate()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        binding.viewmodel?.startBasalRateUpdate()
+    }
+
     private fun showToast(@StringRes strId: Int){
         Toast.makeText(requireContext(), strId, Toast.LENGTH_SHORT).show()
     }
diff --git a/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt b/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt
index c7252158fb..76529dcb27 100644
--- a/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt
+++ b/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/viewmodel/EopatchOverviewViewModel.kt
@@ -19,6 +19,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
+import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.max
@@ -69,7 +70,8 @@ class EopatchOverviewViewModel @Inject constructor(
 
     private val _patchRemainingInsulin = MutableLiveData(0f)
 
-    private var mDisposable: Disposable? = null
+    private var mPauseTimeDisposable: Disposable? = null
+    private var mBasalRateDisposable: Disposable? = null
 
     val patchRemainingInsulin: LiveData<String>
         get() = Transformations.map(_patchRemainingInsulin) { insulin ->
@@ -125,7 +127,7 @@ class EopatchOverviewViewModel @Inject constructor(
             .addTo()
 
         if(preferenceManager.getPatchState().isNormalBasalPaused){
-            startPeriodicallyUpdate()
+            startPauseTimeUpdate()
         }else {
             updateBasalInfo()
         }
@@ -198,7 +200,7 @@ class EopatchOverviewViewModel @Inject constructor(
             .subscribe({ response ->
                 if (response.isSuccess) {
                     navigator?.toast(R.string.string_suspended_insulin_delivery_message)
-                    startPeriodicallyUpdate()
+                    startPauseTimeUpdate()
                 } else {
                     UIEvent(EventType.PAUSE_BASAL_FAILED).apply { value = pauseDurationHour }.let { _eventHandler.postValue(it) }
                 }
@@ -214,7 +216,7 @@ class EopatchOverviewViewModel @Inject constructor(
             .subscribe({
                 if (it.isSuccess) {
                     navigator?.toast(R.string.string_resumed_insulin_delivery_message)
-                    stopPeriodicallyUpdate()
+                    stopPauseTimeUpdate()
                 } else {
                     _eventHandler.postValue(UIEvent(EventType.RESUME_BASAL_FAILED))
                 }
@@ -223,16 +225,33 @@ class EopatchOverviewViewModel @Inject constructor(
             }).addTo()
     }
 
-    private fun startPeriodicallyUpdate(){
-        if(mDisposable == null) {
-            mDisposable = Observable.interval(30, TimeUnit.SECONDS)
+    private fun startPauseTimeUpdate(){
+        if(mPauseTimeDisposable == null) {
+            mPauseTimeDisposable = Observable.interval(30, TimeUnit.SECONDS)
                 .observeOn(aapsSchedulers.main)
                 .subscribe { updatePatchStatus() }
         }
     }
 
-    private fun stopPeriodicallyUpdate(){
-        mDisposable?.dispose()
-        mDisposable = null
+    private fun stopPauseTimeUpdate(){
+        mPauseTimeDisposable?.dispose()
+        mPauseTimeDisposable = null
+    }
+
+    fun startBasalRateUpdate(){
+        val initialDelaySecs = Calendar.getInstance().let { c ->
+            (60 - c.get(Calendar.MINUTE) - 1) * 60 + (60 - c.get(Calendar.SECOND))
+        }
+        if(mBasalRateDisposable == null) {
+            mBasalRateDisposable = Observable.interval(initialDelaySecs.toLong(), 3600L, TimeUnit.SECONDS)
+                .observeOn(aapsSchedulers.main)
+                .subscribe { updateBasalInfo() }
+        }
+        updateBasalInfo()
+    }
+
+    fun stopBasalRateUpdate(){
+        mBasalRateDisposable?.dispose()
+        mBasalRateDisposable = null
     }
 }
\ No newline at end of file