caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix progress bar #2

Browse source
This commit is contained in:
Milos Kozak 2023-01-13 13:41:15 +01:00
parent 7da84536eb
commit 14a329d178
7 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
View file

@ -367,7 +367,7 @@ class HistoryBrowseActivity : DaggerAppCompatActivity() {
} }
private fun updateCalcProgress(percent: Int) { private fun updateCalcProgress(percent: Int) {
binding.progressBar.progress = percent
binding.progressBar.visibility = (percent != 100).toVisibilityKeepSpace() binding.progressBar.visibility = (percent != 100).toVisibilityKeepSpace()
binding.progressBar.progress = percent
} }
} }

11
app/src/main/java/info/nightscout/androidaps/workflow/CalculationWorkflowImpl.kt
View file

@ -16,6 +16,7 @@ import info.nightscout.core.utils.worker.then
import info.nightscout.core.workflow.CalculationWorkflow import info.nightscout.core.workflow.CalculationWorkflow
import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB import info.nightscout.core.workflow.CalculationWorkflow.Companion.JOB
import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION import info.nightscout.core.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION
import info.nightscout.core.workflow.CalculationWorkflow.Companion.PASS
import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.iob.IobCobCalculator
import info.nightscout.interfaces.plugin.ActivePlugin import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
@ -157,7 +158,7 @@ class CalculationWorkflowImpl @Inject constructor(
) )
.then( .then(
OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java) OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java)
.setInputData(Data.Builder().putString(JOB, job).build()) .setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_BG.pass).build())
.build() .build()
) )
.then( .then(
@ -177,7 +178,7 @@ class CalculationWorkflowImpl @Inject constructor(
) )
.then( .then(
OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java) OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java)
.setInputData(Data.Builder().putString(JOB, job).build()) .setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_TT.pass).build())
.build() .build()
) )
.then( .then(
@ -197,8 +198,9 @@ class CalculationWorkflowImpl @Inject constructor(
.build() .build()
) )
.then( .then(
job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java) OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java)
.setInputData(Data.Builder().putString(JOB, job).build()) .setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_IOB.pass).build())
.build() .build()
) )
.then( .then(
@ -214,9 +216,8 @@ class CalculationWorkflowImpl @Inject constructor(
.build() .build()
) )
.then( .then(
job == MAIN_CALCULATION,
OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java) OneTimeWorkRequest.Builder(UpdateGraphWorker::class.java)
.setInputData(Data.Builder().putString(JOB, job).build()) .setInputData(Data.Builder().putString(JOB, job).putInt(PASS, CalculationWorkflow.ProgressData.DRAW_FINAL.pass).build())
.build() .build()
) )
.enqueue() .enqueue()

18
core/main/src/main/java/info/nightscout/core/workflow/CalculationWorkflow.kt
View file

@ -10,15 +10,19 @@ interface CalculationWorkflow {
const val MAIN_CALCULATION = "calculation" const val MAIN_CALCULATION = "calculation"
const val HISTORY_CALCULATION = "history_calculation" const val HISTORY_CALCULATION = "history_calculation"
const val JOB = "job" const val JOB = "job"
const val PASS = "pass"
} }
enum class ProgressData(private val pass: Int, val percentOfTotal: Int) { enum class ProgressData(val pass: Int, val percentOfTotal: Int) {
PREPARE_BASAL_DATA(0, 5), DRAW_BG(0, 1),
PREPARE_TEMPORARY_TARGET_DATA(1, 5), PREPARE_TREATMENTS_DATA(1, 2),
PREPARE_TREATMENTS_DATA(2, 5), PREPARE_BASAL_DATA(2, 6),
IOB_COB_OREF(3, 74), PREPARE_TEMPORARY_TARGET_DATA(3, 6),
PREPARE_IOB_AUTOSENS_DATA(4, 10), DRAW_TT(4, 1),
DRAW(5, 1); IOB_COB_OREF(5, 77),
PREPARE_IOB_AUTOSENS_DATA(6, 5),
DRAW_IOB(7, 1),
DRAW_FINAL(8, 1);
fun finalPercent(progress: Int): Int { fun finalPercent(progress: Int): Int {
var total = 0 var total = 0

2
plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
View file

@ -1085,8 +1085,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
private fun updateCalcProgress() { private fun updateCalcProgress() {
_binding ?: return _binding ?: return
binding.progressBar.progress = overviewData.calcProgressPct
binding.progressBar.visibility = (overviewData.calcProgressPct != 100).toVisibility() binding.progressBar.visibility = (overviewData.calcProgressPct != 100).toVisibility()
binding.progressBar.progress = overviewData.calcProgressPct
} }
private fun updateSensitivity() { private fun updateSensitivity() {

2
workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
View file

@ -57,7 +57,7 @@ class PrepareBasalDataWorker(
val fromTime = data.overviewData.fromTime val fromTime = data.overviewData.fromTime
var time = fromTime var time = fromTime
while (time < endTime) { while (time < endTime) {
val progress = (time - endTime).toDouble() / (endTime - fromTime) * 100.0 val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_BASAL_DATA, progress.toInt(), null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_BASAL_DATA, progress.toInt(), null))
val profile = profileFunction.getProfile(time) val profile = profileFunction.getProfile(time)
if (profile == null) { if (profile == null) {

2
workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
View file

@ -158,7 +158,7 @@ class PrepareIobAutosensGraphDataWorker(
val adsData = data.iobCobCalculator.ads.clone() val adsData = data.iobCobCalculator.ads.clone()
while (time <= endTime) { while (time <= endTime) {
val progress = (time - endTime).toDouble() / (endTime - fromTime) * 100.0 val progress = (time - fromTime).toDouble() / (endTime - fromTime) * 100.0
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, progress.toInt(), null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, progress.toInt(), null))
val profile = profileFunction.getProfile(time) val profile = profileFunction.getProfile(time)
if (profile == null) { if (profile == null) {

4
workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
View file

@ -9,6 +9,7 @@ import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventUpdateOverviewGraph import info.nightscout.rx.events.EventUpdateOverviewGraph
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import java.security.spec.InvalidParameterSpecException
import javax.inject.Inject import javax.inject.Inject
class UpdateGraphWorker( class UpdateGraphWorker(
@ -20,11 +21,12 @@ class UpdateGraphWorker(
@Inject lateinit var activePlugin: ActivePlugin @Inject lateinit var activePlugin: ActivePlugin
override suspend fun doWorkAndLog(): Result { override suspend fun doWorkAndLog(): Result {
val pass = inputData.getInt(CalculationWorkflow.PASS, -1)
if (inputData.getString(CalculationWorkflow.JOB) == CalculationWorkflow.MAIN_CALCULATION) if (inputData.getString(CalculationWorkflow.JOB) == CalculationWorkflow.MAIN_CALCULATION)
activePlugin.activeOverview.overviewBus.send(EventUpdateOverviewGraph("UpdateGraphWorker")) activePlugin.activeOverview.overviewBus.send(EventUpdateOverviewGraph("UpdateGraphWorker"))
else else
rxBus.send(EventUpdateOverviewGraph("UpdateGraphWorker")) rxBus.send(EventUpdateOverviewGraph("UpdateGraphWorker"))
rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.DRAW, 100, null)) rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.values().find { it.pass == pass } ?: throw InvalidParameterSpecException(), 100, null))
return Result.success() return Result.success()
} }
} }