Marc G. Fournier 3 лет назад
Родитель
Сommit
a3aaaebad4

+ 6 - 0
FreeAPS/Sources/Helpers/UIDevice+Extensions.swift

@@ -20,6 +20,8 @@ extension UIDevice {
 
             case "iPhone12,1":
                 return "iPhone 11"
+            case "iPhone12,5":
+                return "iPhone 11 Pro Max"
             case "iPhone12,8":
                 return "iPhone SE (2nd Gen)"
 
@@ -34,6 +36,8 @@ extension UIDevice {
 
             case "iPhone14,2":
                 return "iPhone 13 Pro"
+            case "iPhone14,3":
+                return "iPhone 13 Pro Max"
             case "iPhone14,4":
                 return "iPhone 13 mini"
             case "iPhone14,5":
@@ -45,6 +49,8 @@ extension UIDevice {
 
             case "iPhone15,2":
                 return "iPhone 14 Pro"
+            case "iPhone15,3":
+                return "iPhone 14 Pro Max"
 
             default:
                 return identifier

+ 1 - 0
FreeAPS/Sources/Models/NightscoutStatus.swift

@@ -6,6 +6,7 @@ struct NightscoutStatus: JSON {
     let pump: NSPumpStatus
     let preferences: Preferences
     let uploader: Uploader
+    let dailystats: DailyStats?
 }
 
 struct OpenAPSStatus: JSON {

+ 23 - 7
FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -212,13 +212,29 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
 
         let uploader = Uploader(batteryVoltage: nil, battery: Int(device.batteryLevel * 100))
 
-        let status = NightscoutStatus(
-            device: NigtscoutTreatment.local,
-            openaps: openapsStatus,
-            pump: pump,
-            preferences: preferences,
-            uploader: uploader
-        )
+        let dailyStats = storage.retrieve(OpenAPS.Monitor.dailyStats, as: [DailyStats].self) ?? []
+
+        let status: NightscoutStatus
+
+        if !dailyStats.isEmpty {
+            status = NightscoutStatus(
+                device: NigtscoutTreatment.local,
+                openaps: openapsStatus,
+                pump: pump,
+                preferences: preferences,
+                uploader: uploader,
+                dailystats: dailyStats[0]
+            )
+        } else {
+            status = NightscoutStatus(
+                device: NigtscoutTreatment.local,
+                openaps: openapsStatus,
+                pump: pump,
+                preferences: preferences,
+                uploader: uploader,
+                dailystats: nil
+            )
+        }
 
         storage.save(status, as: OpenAPS.Upload.nsStatus)