1. Improve widget refresh data process

2. Improve data refresh

Author: DevelopLab

BatteryInfo/AppDelegate.swift

@@ -18,5 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window!.makeKeyAndVisible()
         return true
     }
+    
+    // app从后台返回的时候就自动刷新下数据
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        BatteryDataController.getInstance.refreshBatteryInfo()
+    }
 
 }

BatteryInfo/Controller/BatteryDataController.swift

@@ -25,20 +25,26 @@ class BatteryDataController {
         batteryInfo = provider.fetchBatteryInfo()
 
         // 顺便就记录电池的历史记录了
+        if recordBatteryData(manualRecord: false) {
+            NSLog("历史记录增加新的记录成功")
+        }
+        
+        // 刷新widget的数据
+        refreshWidgetData(forceReload: false)
+    }
+    
+    // 新增一个方法这样可以允许用户强制刷新widget
+    func refreshWidgetData(forceReload: Bool) {
+        
         if let cycleCount = batteryInfo?.cycleCount {
-
-            if recordBatteryData(manualRecord: false) {
-                print("历史记录增加新的记录成功")
-            }
-            
             // 提供给小组件的电池数据
             if #available(iOS 14.0, *) {
                 if settingsUtils.getEnableWidget() {
-                    WidgetController.instance.setWidgetBatteryData(batteryData: WidgetBatteryData(maximumCapacity: self.calculateMaximumCapacity() ?? "--%", cycleCount: cycleCount))
+                    WidgetController.instance.setWidgetBatteryData(forceReload: forceReload, batteryData: WidgetBatteryData(maximumCapacity: self.calculateMaximumCapacity() ?? "--%", cycleCount: cycleCount))
                 }
             }
-            
         }
+        
     }
 
     func getBatteryRAWInfo() -> [String: Any]? {

BatteryInfo/Controller/WidgetController.swift

@@ -79,7 +79,7 @@ class WidgetController {
     }
 
     // 给主程序保存电池数据
-    func setWidgetBatteryData(batteryData: WidgetBatteryData) {
+    func setWidgetBatteryData(forceReload: Bool, batteryData: WidgetBatteryData) {
 
         // 主程序设置的实例
         let settingsUtils = SettingsUtils.instance
@@ -136,6 +136,11 @@ class WidgetController {
                 shouldRefresh = true
             }
         }
+        
+        if forceReload { // 给强制刷新widget做的优化
+            shouldWrite = true
+            shouldRefresh = true
+        }
 
         if shouldWrite {
             dataManager.setString(key: "maximumCapacity", value: batteryData.maximumCapacity)

BatteryInfo/ViewController/WidgetSettingsViewController.swift

@@ -154,8 +154,8 @@ class WidgetSettingsViewController: UIViewController, UITableViewDelegate, UITab
             // 设置当前的cell选中状态
             tableView.cellForRow(at: indexPath)?.accessoryType = .checkmark
         } else if indexPath.section == 2 {
-            // 请求系统刷新Widget
-            widgetController.refreshWidget()
+            // 重新写入最新数据并且请求系统刷新widget
+            BatteryDataController.getInstance.refreshWidgetData(forceReload: true)
 
             let alert = UIAlertController(
                 title: NSLocalizedString("Alert", comment: ""),