feat: render partial sensor readings

This commit is contained in:
2026-08-26 19:32:12 +08:00
parent a30ab9e376
commit 9ba17c7d72
5 changed files with 39 additions and 29 deletions
@@ -40,6 +40,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flagship.abox.manager.R import com.flagship.abox.manager.R
import com.flagship.abox.manager.designsystem.ABoxButton import com.flagship.abox.manager.designsystem.ABoxButton
import com.flagship.abox.manager.designsystem.ABoxLoadingIndicator import com.flagship.abox.manager.designsystem.ABoxLoadingIndicator
import com.flagship.abox.manager.designsystem.icon.ABoxIcon
import com.flagship.abox.manager.designsystem.icon.ABoxIconKey
import com.flagship.abox.manager.domain.DeviceName import com.flagship.abox.manager.domain.DeviceName
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
@@ -159,17 +161,17 @@ fun TemperatureHumidityScreen(
) { ) {
TelemetryMetricCard( TelemetryMetricCard(
title = stringResource(R.string.th_temperature_label), title = stringResource(R.string.th_temperature_label),
value = state.temperature ?: "--", value = state.temperature,
unit = stringResource(R.string.th_unit_celsius), unit = stringResource(R.string.th_unit_celsius),
icon = "🌡️", icon = ABoxIconKey.TEMPERATURE,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
TelemetryMetricCard( TelemetryMetricCard(
title = stringResource(R.string.th_humidity_label), title = stringResource(R.string.th_humidity_label),
value = state.humidity ?: "--", value = state.humidity,
unit = stringResource(R.string.th_unit_percent), unit = stringResource(R.string.th_unit_percent),
icon = "💧", icon = ABoxIconKey.HUMIDITY,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
} }
@@ -279,11 +281,12 @@ fun TemperatureHumidityScreen(
@Composable @Composable
private fun TelemetryMetricCard( private fun TelemetryMetricCard(
title: String, title: String,
value: String, value: String?,
unit: String, unit: String,
icon: String, icon: ABoxIconKey,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
if (value == null) return
Card( Card(
modifier = modifier, modifier = modifier,
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
@@ -298,10 +301,7 @@ private fun TelemetryMetricCard(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center, verticalArrangement = Arrangement.Center,
) { ) {
Text( ABoxIcon(icon, contentDescription = title, modifier = Modifier.size(28.dp))
text = icon,
style = MaterialTheme.typography.headlineMedium,
)
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
@@ -323,7 +323,6 @@ private fun TelemetryMetricCard(
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
) )
if (value != "--") {
Text( Text(
text = " $unit", text = " $unit",
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
@@ -334,7 +333,6 @@ private fun TelemetryMetricCard(
} }
} }
} }
}
@Composable @Composable
private fun NoDataCard( private fun NoDataCard(
@@ -16,11 +16,11 @@ data class TemperatureHumidityUiState(
val errorMessage: UiText? = null, val errorMessage: UiText? = null,
val lastUpdatedTimeMillis: Long? = null, val lastUpdatedTimeMillis: Long? = null,
) { ) {
val formattedTemperature: String val formattedTemperature: String?
get() = if (temperature.isNullOrBlank()) "--" else "$temperature °C" get() = temperature?.takeIf { it.isNotBlank() }?.let { "$it °C" }
val formattedHumidity: String val formattedHumidity: String?
get() = if (humidity.isNullOrBlank()) "--" else "$humidity %" get() = humidity?.takeIf { it.isNotBlank() }?.let { "$it %" }
val hasValidData: Boolean val hasValidData: Boolean
get() = !temperature.isNullOrBlank() || !humidity.isNullOrBlank() get() = !temperature.isNullOrBlank() || !humidity.isNullOrBlank()
@@ -101,11 +101,11 @@ class TemperatureHumidityViewModel @Inject constructor(
when (val result = thGateway.getReading(profileId, deviceName)) { when (val result = thGateway.getReading(profileId, deviceName)) {
is DomainResult.Success -> { is DomainResult.Success -> {
val reading = result.value val reading = result.value
val isBlankData = reading.temperature.isBlank() && reading.humidity.isBlank() val isBlankData = reading.temperature.isNullOrBlank() && reading.humidity.isNullOrBlank()
_state.update { _state.update {
it.copy( it.copy(
temperature = reading.temperature.takeIf { t -> t.isNotBlank() }, temperature = reading.temperature?.takeIf { t -> t.isNotBlank() },
humidity = reading.humidity.takeIf { h -> h.isNotBlank() }, humidity = reading.humidity?.takeIf { h -> h.isNotBlank() },
isLoading = false, isLoading = false,
isRefreshing = false, isRefreshing = false,
isOffline = false, isOffline = false,
@@ -129,8 +129,8 @@ class TemperatureHumidityViewModelTest {
assertTrue(state.hasNoData) assertTrue(state.hasNoData)
assertNull(state.temperature) assertNull(state.temperature)
assertNull(state.humidity) assertNull(state.humidity)
assertEquals("--", state.formattedTemperature) assertNull(state.formattedTemperature)
assertEquals("--", state.formattedHumidity) assertNull(state.formattedHumidity)
assertFalse(state.hasValidData) assertFalse(state.hasValidData)
} }
@@ -190,4 +190,16 @@ class TemperatureHumidityViewModelTest {
viewModel.onEvent(TemperatureHumidityUiEvent.ClearError) viewModel.onEvent(TemperatureHumidityUiEvent.ClearError)
assertNull(viewModel.state.value.errorMessage) assertNull(viewModel.state.value.errorMessage)
} }
@Test
fun partialReadingKeepsAvailableMetric() = runTest {
fakeGateway.setReading(
TemperatureHumidityReading(profileId, deviceName, temperature = "26.5", humidity = null),
)
val viewModel = TemperatureHumidityViewModel(fakeGateway, SavedStateHandle())
viewModel.onEvent(TemperatureHumidityUiEvent.Initialize(profileId, deviceName))
assertEquals("26.5", viewModel.state.value.temperature)
assertNull(viewModel.state.value.humidity)
}
} }
@@ -83,8 +83,8 @@ data class SocketStatus(
data class TemperatureHumidityReading( data class TemperatureHumidityReading(
val profileId: ProviderProfileId, val profileId: ProviderProfileId,
val deviceName: DeviceName, val deviceName: DeviceName,
val temperature: String, val temperature: String?,
val humidity: String, val humidity: String?,
) )
data class InfraredCode( data class InfraredCode(