Explorar el Código

fix trend in watch manager & notifications

polscm32 aka Marvout hace 1 año
padre
commit
4a09062532

+ 1 - 1
FreeAPS/Sources/Services/UserNotifications/UserNotificationsManager.swift

@@ -240,7 +240,7 @@ final class BaseUserNotificationsManager: NSObject, UserNotificationsManager, In
 
 
             guard let lastReading = glucoseObjects.first?.glucose,
             guard let lastReading = glucoseObjects.first?.glucose,
                   let secondLastReading = glucoseObjects.dropFirst().first?.glucose,
                   let secondLastReading = glucoseObjects.dropFirst().first?.glucose,
-                  let lastDirection = glucoseObjects.first?.direction else { return }
+                  let lastDirection = glucoseObjects.first?.directionEnum?.symbol else { return }
 
 
             addAppBadge(glucose: (glucoseObjects.first?.glucose).map { Int($0) })
             addAppBadge(glucose: (glucoseObjects.first?.glucose).map { Int($0) })
 
 

+ 1 - 1
FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -199,7 +199,7 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
                 let value = settingsManager.settings
                 let value = settingsManager.settings
                     .units == .mgdL ? Decimal(firstGlucoseValue.glucose) : Decimal(firstGlucoseValue.glucose).asMmolL
                     .units == .mgdL ? Decimal(firstGlucoseValue.glucose) : Decimal(firstGlucoseValue.glucose).asMmolL
                 state.glucose = glucoseFormatter.string(from: value as NSNumber)
                 state.glucose = glucoseFormatter.string(from: value as NSNumber)
-                state.trend = firstGlucoseValue.direction
+                state.trend = firstGlucoseValue.directionEnum?.symbol
                 let delta = glucoseValues
                 let delta = glucoseValues
                     .count >= 2 ? Decimal(firstGlucoseValue.glucose) - Decimal(glucoseValues.dropFirst().first?.glucose ?? 0) : 0
                     .count >= 2 ? Decimal(firstGlucoseValue.glucose) - Decimal(glucoseValues.dropFirst().first?.glucose ?? 0) : 0
                 let deltaConverted = settingsManager.settings.units == .mgdL ? delta : delta.asMmolL
                 let deltaConverted = settingsManager.settings.units == .mgdL ? delta : delta.asMmolL