1. Improve History Statistics

2. Improve some UI

Author: DevelopLab

BatteryInfo/Localizable.xcstrings

@@ -260,18 +260,17 @@
       }
     },
     "BatteryHistorySummaryContent" : {
-      "comment" : "Battery statistics summary with total records, health delta, capacity delta, cycle delta, and avg cycles per day.",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Total Records: %@ items\nRecorded over %@ days\nBattery Health Change: %@%%\nCapacity Change: %@ mAh\nCycle Count Increase: %@ time(s)\nAvg. Cycles per Day: %@ time(s)"
+            "value" : "Total Records: %@ items\nRecorded over %@ days\nBattery Health Change: %@%%\nCapacity Change: %@ mAh\nRecorded maximum capacity: %@ mAh\nRecorded minimum capacity: %@ mAh\nCycle Count Increase: %@ time(s)\nAvg. Cycles per Day: %@ time(s)"
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "总记录数: %@条\n累计记录%@天\n电池健康度变化: %@%%\n电池容量变化: %@ mAh\n循环次数增加: %@次\n平均每日循环次数: %@次"
+            "value" : "总记录数: %@条\n累计记录%@天\n电池健康度变化: %@%%\n电池容量变化: %@ mAh\n记录中最高容量: %@ mAh\n记录中最低容量: %@ mAh\n循环次数增加: %@次\n平均每日循环次数: %@次"
           }
         }
       }

BatteryInfo/ViewController/DisplaySettingsViewController.swift

@@ -119,6 +119,9 @@ class DisplaySettingsViewController: UIViewController, UITableViewDelegate, UITa
             } else if indexPath.row == 3 {
                 switchView.isOn = SettingsUtils.instance.getUseHistoryRecordToCalculateSettingsBatteryInfoRefreshDate()
                 switchView.isEnabled = SettingsUtils.instance.getEnableRecordBatteryData()
+                if !SettingsUtils.instance.getEnableRecordBatteryData() {
+                    cell.textLabel?.textColor = .lightGray // 文本设置成灰色
+                }
                 cell.isUserInteractionEnabled = SettingsUtils.instance.getEnableRecordBatteryData()
             }else if indexPath.row == 4 {
                 switchView.isOn = SettingsUtils.instance.getDoubleClickTabBarButtonToScrollToTop()

BatteryInfo/ViewController/HistoryStatisticsViewController.swift

@@ -53,37 +53,48 @@ class HistoryStatisticsViewController: UIViewController, UITableViewDelegate, UI
         let cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
         cell.textLabel?.numberOfLines = 0
 
-        let records = BatteryRecordDatabaseManager.shared.fetchAllRecords()
-        guard records.count >= 2 else {
-            cell.textLabel?.text = NSLocalizedString("NotEnoughData", comment: "")
-            return cell
-        }
-
-        let first = records.last!
-        let last = records.first!
+        do {
+            let records = BatteryRecordDatabaseManager.shared.fetchAllRecords()
+            guard records.count >= 2 else {
+                throw NSError(domain: "BatteryStats", code: 1, userInfo: nil)
+            }
 
-        let totalRecords = records.count
-        let timeInterval = max(1, last.createDate - first.createDate)
-        let days = Double(timeInterval) / 86400.0
-        let totalDays = String(Int(days))
+            guard let first = records.last, let last = records.first else {
+                throw NSError(domain: "BatteryStats", code: 3, userInfo: nil)
+            }
 
-        let firstHealth = (Double(first.nominalChargeCapacity ?? 0) / Double(first.designCapacity ?? 1)) * 100
-        let lastHealth = (Double(last.nominalChargeCapacity ?? 0) / Double(last.designCapacity ?? 1)) * 100
-        let deltaHealth = lastHealth - firstHealth
+            let totalRecords = records.count
+            let timeInterval = max(1, last.createDate - first.createDate)
+            let days = Double(timeInterval) / 86400.0
+            let totalDays = String(Int(days))
 
-        let deltaCapacity = (last.nominalChargeCapacity ?? 0) - (first.nominalChargeCapacity ?? 0)
-        let deltaCycles = last.cycleCount - first.cycleCount
+            let healthValues = records.map { $0.nominalChargeCapacity ?? 0 }
+            guard let minHealth = healthValues.min(), let maxHealth = healthValues.max(), let designCapacity = last.designCapacity else {
+                throw NSError(domain: "BatteryStats", code: 2, userInfo: nil)
+            }
+            
+            guard designCapacity != 0 else {
+                throw NSError(domain: "BatteryStats", code: 4, userInfo: nil)
+            }
 
-        let avgCyclePerDay = Double(deltaCycles) / days
+            let deltaHealth = Double(minHealth - maxHealth) / Double(designCapacity) * 100
+            let deltaCapacity = minHealth - maxHealth
+            let deltaCycles = last.cycleCount - first.cycleCount
+            let avgCyclePerDay = Double(deltaCycles) / days
 
-        cell.textLabel?.text = String(format: NSLocalizedString("BatteryHistorySummaryContent", comment: ""),
-            String(totalRecords),
-            String(totalDays),
-            String(format: "%.1f", deltaHealth),
-            String(deltaCapacity),
-            String(deltaCycles),
-            String(format: "%.2f", avgCyclePerDay)
-        )
+            cell.textLabel?.text = String(format: NSLocalizedString("BatteryHistorySummaryContent", comment: ""),
+                                          String(totalRecords),
+                                          String(totalDays),
+                                          String(format: "%.2f", deltaHealth),
+                                          String(deltaCapacity),
+                                          String(maxHealth),
+                                          String(minHealth),
+                                          String(deltaCycles),
+                                          String(format: "%.2f", avgCyclePerDay)
+            )
+        } catch {
+            cell.textLabel?.text = NSLocalizedString("NotEnoughData", comment: "")
+        }
 
         return cell
     }