tim/karoo-powerbar
1
0
Fork 0
Code Issues Actions Releases 5 Activity

fix #5: Show empty bar if sensor becomes unavailable

Browse Source
This commit is contained in:
Tim Kluge 2024-12-10 20:18:39 +01:00
parent b3547f6051
commit 2cf5ce70d6
1 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt
View File

@ -94,7 +94,7 @@ class Window(
private val karooSystem: KarooSystemService = KarooSystemService(context) private val karooSystem: KarooSystemService = KarooSystemService(context)
data class StreamData(val userProfile: UserProfile, val value: Double) data class StreamData(val userProfile: UserProfile, val value: Double?)
private var serviceJob: Job? = null private var serviceJob: Job? = null
@ -134,7 +134,7 @@ class Window(
private suspend fun streamHeartrate() { private suspend fun streamHeartrate() {
val powerFlow = karooSystem.streamDataFlow(DataType.Type.HEART_RATE) val powerFlow = karooSystem.streamDataFlow(DataType.Type.HEART_RATE)
.mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.singleValue } .map { (it as? StreamState.Streaming)?.dataPoint?.singleValue }
.distinctUntilChanged() .distinctUntilChanged()
karooSystem.streamUserProfile() karooSystem.streamUserProfile()
@ -143,22 +143,31 @@ class Window(
.map { (userProfile, hr) -> StreamData(userProfile, hr) } .map { (userProfile, hr) -> StreamData(userProfile, hr) }
.distinctUntilChanged() .distinctUntilChanged()
.collect { streamData -> .collect { streamData ->
val value = streamData.value.roundToInt() val value = streamData.value?.roundToInt()
val color = context.getColor(
getZone(streamData.userProfile.heartRateZones, value)?.colorResource
?: R.color.zone7
)
val minHr = streamData.userProfile.restingHr
val maxHr = streamData.userProfile.maxHr
val progress =
remap(value.toDouble(), minHr.toDouble(), maxHr.toDouble(), 0.0, 1.0)
powerbar.progressColor = color if (value != null) {
powerbar.progress = progress val color = context.getColor(
powerbar.label = "$value" getZone(streamData.userProfile.heartRateZones, value)?.colorResource
?: R.color.zone7
)
val minHr = streamData.userProfile.restingHr
val maxHr = streamData.userProfile.maxHr
val progress =
remap(value.toDouble(), minHr.toDouble(), maxHr.toDouble(), 0.0, 1.0)
powerbar.progressColor = color
powerbar.progress = progress
powerbar.label = "$value"
Log.d(TAG, "Hr: $value min: $minHr max: $maxHr")
} else {
powerbar.progressColor = context.getColor(R.color.zone0)
powerbar.progress = 0.0
powerbar.label = "?"
Log.d(TAG, "Hr: Unavailable")
}
powerbar.invalidate() powerbar.invalidate()
Log.d(TAG, "Hr: $value min: $minHr max: $maxHr")
} }
} }
@ -170,7 +179,7 @@ class Window(
private suspend fun streamPower(smoothed: PowerStreamSmoothing) { private suspend fun streamPower(smoothed: PowerStreamSmoothing) {
val powerFlow = karooSystem.streamDataFlow(smoothed.dataTypeId) val powerFlow = karooSystem.streamDataFlow(smoothed.dataTypeId)
.mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.singleValue } .map { (it as? StreamState.Streaming)?.dataPoint?.singleValue }
.distinctUntilChanged() .distinctUntilChanged()
karooSystem.streamUserProfile() karooSystem.streamUserProfile()
@ -179,22 +188,31 @@ class Window(
.map { (userProfile, power) -> StreamData(userProfile, power) } .map { (userProfile, power) -> StreamData(userProfile, power) }
.distinctUntilChanged() .distinctUntilChanged()
.collect { streamData -> .collect { streamData ->
val value = streamData.value.roundToInt() val value = streamData.value?.roundToInt()
val color = context.getColor(
getZone(streamData.userProfile.powerZones, value)?.colorResource
?: R.color.zone7
)
val minPower = streamData.userProfile.powerZones.first().min
val maxPower = streamData.userProfile.powerZones.last().min + 50
val progress =
remap(value.toDouble(), minPower.toDouble(), maxPower.toDouble(), 0.0, 1.0)
powerbar.progressColor = color if (value != null) {
powerbar.progress = progress val color = context.getColor(
powerbar.label = "${value}W" getZone(streamData.userProfile.powerZones, value)?.colorResource
?: R.color.zone7
)
val minPower = streamData.userProfile.powerZones.first().min
val maxPower = streamData.userProfile.powerZones.last().min + 50
val progress =
remap(value.toDouble(), minPower.toDouble(), maxPower.toDouble(), 0.0, 1.0)
powerbar.progressColor = color
powerbar.progress = progress
powerbar.label = "${value}W"
Log.d(TAG, "Power: $value min: $minPower max: $maxPower")
} else {
powerbar.progressColor = context.getColor(R.color.zone0)
powerbar.progress = 0.0
powerbar.label = "?"
Log.d(TAG, "Power: Unavailable")
}
powerbar.invalidate() powerbar.invalidate()
Log.d(TAG, "Power: $value min: $minPower max: $maxPower")
} }
} }