Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store health services updates and send them with worker updates #3076

Merged
merged 2 commits into from
Nov 17, 2022
Merged

Store health services updates and send them with worker updates #3076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92bd2d0
Store health services updates and send them with worker updates
dshokouhi Nov 16, 2022
fb0a597
Switch update type to worker
dshokouhi Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions wear/src/main/java/io/homeassistant/companion/android/sensors/HealthServicesSensorManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class HealthServicesSensorManager : SensorManager {
"mdi:stairs",
unitOfMeasurement = "floors",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.INTENT
updateType = SensorManager.BasicSensor.UpdateType.WORKER
)
private val dailyDistance = SensorManager.BasicSensor(
"daily_distance",
Expand All @@ -58,7 +58,7 @@ class HealthServicesSensorManager : SensorManager {
"mdi:map-marker-distance",
unitOfMeasurement = "m",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.INTENT
updateType = SensorManager.BasicSensor.UpdateType.WORKER
)
private val dailyCalories = SensorManager.BasicSensor(
"daily_calories",
Expand All @@ -68,7 +68,7 @@ class HealthServicesSensorManager : SensorManager {
"mdi:fire",
unitOfMeasurement = "kcal",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.INTENT
updateType = SensorManager.BasicSensor.UpdateType.WORKER
)
private val dailySteps = SensorManager.BasicSensor(
"daily_steps",
Expand All @@ -78,7 +78,7 @@ class HealthServicesSensorManager : SensorManager {
"mdi:shoe-print",
unitOfMeasurement = "steps",
entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
updateType = SensorManager.BasicSensor.UpdateType.INTENT
updateType = SensorManager.BasicSensor.UpdateType.WORKER
)
}

Expand Down Expand Up @@ -225,13 +225,10 @@ class HealthServicesSensorManager : SensorManager {
}
}

val hasFloorData = processDataPoint(floorsDaily, dailyFloors)
val hasDistanceData = processDataPoint(distanceDaily, dailyDistance)
val hasCalorieData = processDataPoint(caloriesDaily, dailyCalories)
val hasStepData = processDataPoint(stepsDaily, dailySteps)

if (hasFloorData || hasDistanceData || hasCalorieData || hasStepData)
SensorWorker.start(latestContext)
processDataPoint(floorsDaily, dailyFloors)
processDataPoint(distanceDaily, dailyDistance)
processDataPoint(caloriesDaily, dailyCalories)
processDataPoint(stepsDaily, dailySteps)
}

override fun onPermissionLost() {
Expand Down Expand Up @@ -319,8 +316,7 @@ class HealthServicesSensorManager : SensorManager {
private fun processDataPoint(
dataPoints: List<IntervalDataPoint<*>>,
basicSensor: SensorManager.BasicSensor
): Boolean {
var sendUpdate = false
) {
var latest = 0
var lastIndex = 0
val bootInstant =
Expand All @@ -333,7 +329,6 @@ class HealthServicesSensorManager : SensorManager {
if (endTime.toEpochMilli() > latest) {
latest = endTime.toEpochMilli().toInt()
lastIndex = index
sendUpdate = true
}
}
onSensorUpdated(
Expand All @@ -344,6 +339,5 @@ class HealthServicesSensorManager : SensorManager {
mapOf()
)
}
return sendUpdate
}
}