1.Add com.apple.private.security.storage.AppDataContainers permission.

DevelopLab · DevelopLab · commit b58554fa836d · 2024-11-17T23:37:23.000+02:00
2.Settings plist file can save in sandbox.
3.Settings item can sync with plist file.
diff --git a/AppDelegate.swift b/AppDelegate.swift
@@ -9,6 +9,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		window = UIWindow(frame: UIScreen.main.bounds)
 		window!.rootViewController = UINavigationController(rootViewController: RootViewController())
 		window!.makeKeyAndVisible()
+        // 加载配置文件
+        SettingsUtils.instance
 		return true
 	}
 
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ include $(THEOS)/makefiles/common.mk
 
 APPLICATION_NAME = RebootTools
 
-RebootTools_FILES = AppDelegate.swift RootViewController.swift SettingsViewController.swift DeviceController.m
+RebootTools_FILES = AppDelegate.swift RootViewController.swift SettingsViewController.swift DeviceController.m PlistManagerUtils.swift SettingsUtils.swift
 RebootTools_FRAMEWORKS = UIKit CoreGraphics
 RebootTools_RESOURCES = Resources/Assets.xcassets
 $(APPLICATION_NAME)_SWIFT_BRIDGING_HEADER += $(APPLICATION_NAME)-Bridging-Header.h
diff --git a/PlistManagerUtils.swift b/PlistManagerUtils.swift
@@ -3,31 +3,50 @@ import Foundation
 class PlistManagerUtils {
 
     // 单例实例
-    static let shared = PlistManager(plistName: "userSettings")
+    private static var instances: [String: PlistManagerUtils] = [:]
 
     private var plistFileURL: URL
+    private var plistExist: Bool = false
     private var preferences: [String: Any]
     private var cachedChanges: [String: Any] = [:]
     private var isDirty = false
 
+	// 获取实例方法（支持多实例）
+    static func instance(for plistName: String) -> PlistManagerUtils {
+        // 如果实例已存在，则返回现有实例
+        if let instance = instances[plistName] {
+            return instance
+        }
+
+        // 否则创建新的实例并存储
+        let instance = PlistManagerUtils(plistName: plistName)
+        instances[plistName] = instance
+        return instance
+    }
+
     // 初始化 PlistManager，指定 plist 文件名
     private init(plistName: String) {
         // 获取沙盒中的 Preferences 目录路径
         let preferencesDirectory = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!
-        self.plistFileURL = preferencesDirectory.appendingPathComponent("Preferences/\(plistName).plist")
+        let preferencesPath = preferencesDirectory.appendingPathComponent("Preferences")
+        self.plistFileURL = preferencesPath.appendingPathComponent("\(plistName).plist")
 
         // 如果 plist 文件不存在，则创建一个空的文件
         if !FileManager.default.fileExists(atPath: plistFileURL.path) {
             preferences = [:]
             save()
+            NSLog("Reboot Tools----> 创建配置文件")
+            plistExist = false //增加一个标识，让外界知道这个配置文件是新创建的
         } else {
-            preferences = loadPreferences()
+            self.preferences = PlistManagerUtils.loadPreferences(from: plistFileURL)
+            NSLog("Reboot Tools----> 加载已有创建文件")
+            plistExist = true
         }
     }
 
     // 加载 plist 文件中的数据
-    private func loadPreferences() -> [String: Any] {
-        guard let data = try? Data(contentsOf: plistFileURL),
+    private static func loadPreferences(from url: URL) -> [String: Any] {
+        guard let data = try? Data(contentsOf: url),
               let preferences = try? PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] else {
             return [:]
         }
@@ -39,53 +58,60 @@ class PlistManagerUtils {
         do {
             let data = try PropertyListSerialization.data(fromPropertyList: preferences, format: .xml, options: 0)
             try data.write(to: plistFileURL)
+            NSLog("Reboot Tools----> Save successful Plist file path: \(plistFileURL.path)")
         } catch {
-            print("Error saving preferences to plist: \(error.localizedDescription)")
+            print("Reboot Tools----> Error saving preferences to plist: \(error.localizedDescription)")
         }
     }
+    
+
+    // 获取 plist 文件是否存在
+    func isPlistExist() -> Bool {
+		return plistExist
+	}
 
     // 获取指定 key 对应的 Int 值
-    func getInt(forKey key: String, defaultValue: Int) -> Int {
+    func getInt(key: String, defaultValue: Int) -> Int {
         return preferences[key] as? Int ?? defaultValue
     }
 
     // 获取指定 key 对应的 Bool 值
-    func getBool(forKey key: String, defaultValue: Bool) -> Bool {
+    func getBool(key: String, defaultValue: Bool) -> Bool {
         return preferences[key] as? Bool ?? defaultValue
     }
 
     // 获取指定 key 对应的 String 值
-    func getString(forKey key: String, defaultValue: String) -> String {
+    func getString(key: String, defaultValue: String) -> String {
         return preferences[key] as? String ?? defaultValue
     }
 
     // 获取指定 key 对应的 Float 值
-    func getFloat(forKey key: String, defaultValue: Float) -> Float {
+    func getFloat(key: String, defaultValue: Float) -> Float {
         return preferences[key] as? Float ?? defaultValue
     }
 
     // 获取指定 key 对应的 Double 值
-    func getDouble(forKey key: String, defaultValue: Double) -> Double {
+    func getDouble(key: String, defaultValue: Double) -> Double {
         return preferences[key] as? Double ?? defaultValue
     }
 
     // 获取指定 key 对应的 Data 值
-    func getData(forKey key: String, defaultValue: Data) -> Data {
+    func getData(key: String, defaultValue: Data) -> Data {
         return preferences[key] as? Data ?? defaultValue
     }
 
     // 获取指定 key 对应的 URL 值
-    func getURL(forKey key: String, defaultValue: URL) -> URL {
+    func getURL(key: String, defaultValue: URL) -> URL {
         return preferences[key] as? URL ?? defaultValue
     }
 
     // 获取指定 key 对应的 Array 值
-    func getArray(forKey key: String, defaultValue: [Any]) -> [Any] {
+    func getArray(key: String, defaultValue: [Any]) -> [Any] {
         return preferences[key] as? [Any] ?? defaultValue
     }
 
     // 获取指定 key 对应的 Dictionary 值
-    func getDictionary(forKey key: String, defaultValue: [String: Any]) -> [String: Any] {
+    func getDictionary(key: String, defaultValue: [String: Any]) -> [String: Any] {
         return preferences[key] as? [String: Any] ?? defaultValue
     }
 
@@ -144,7 +170,7 @@ class PlistManagerUtils {
     }
 
     // 删除指定 key 的数据
-    func remove(forKey key: String) {
+    func remove(key: String) {
         cachedChanges[key] = nil
         isDirty = true
     }
@@ -155,10 +181,14 @@ class PlistManagerUtils {
             try FileManager.default.removeItem(at: plistFileURL)
             preferences = [:]
         } catch {
-            print("Error clearing plist file: \(error.localizedDescription)")
+            print("Reboot Tools----> Error clearing plist file: \(error.localizedDescription)")
         }
     }
 
+    func commit() {
+        self.apply()
+    }
+
     // 将更改保存到 plist
     func apply() {
         // 只有在有修改的情况下才进行保存
@@ -176,4 +206,5 @@ class PlistManagerUtils {
             isDirty = false
         }
     }
+
 }
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
@@ -5,6 +5,8 @@
 "Respring_text" = "Respring";
 "Settings_text" = "Settings";
 "Done_text" = "Done";
+"Action_Alert" = "Are you sure you want to %@?";
+"Confirm_text" = "Confirm";
 "Cancel_text" = "Cancel";
 "General_text" = "General";
 "Timer_text" = "Timer";
diff --git a/Resources/zh-Hans.lproj/Localizable.strings b/Resources/zh-Hans.lproj/Localizable.strings
@@ -5,6 +5,8 @@
 "Respring_text" = "注销";
 "Settings_text" = "设置";
 "Done_text" = "完成";
+"Action_Alert" = "确定%@?";
+"Confirm_text" = "确定";
 "Cancel_text" = "取消";
 "General_text" = "通用";
 "Timer_text" = "倒计时器";
diff --git a/RootViewController.swift b/RootViewController.swift
@@ -2,6 +2,10 @@ import UIKit
 
 class RootViewController: UIViewController {
 
+	private let settingsUtils = SettingsUtils.instance
+    private let checkPermissionLabel = UILabel()
+    private let respringButton = UIButton(type: .system)
+
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -30,9 +34,9 @@ class RootViewController: UIViewController {
         iconImageView.contentMode = .scaleAspectFit
 
         // 检查权限
-        let checkPermissionLabel = UILabel()
         checkPermissionLabel.translatesAutoresizingMaskIntoConstraints = false
         checkPermissionLabel.textAlignment = .center  // 设置文本居中
+        checkPermissionLabel.isHidden = !settingsUtils.getShowRootText()
 
         let enable = self.checkInstallPermission()
 
@@ -64,11 +68,11 @@ class RootViewController: UIViewController {
         rebootButton.isEnabled = enable // 无权限的时候不允许点击
 
         // Respring
-        let respringButton = UIButton(type: .system)
         respringButton.setTitle(NSLocalizedString("Respring_text", comment: ""), for: .normal)
         respringButton.translatesAutoresizingMaskIntoConstraints = false
         respringButton.addTarget(self, action: #selector(onClickRespringButton), for: .touchUpInside)
         respringButton.isEnabled = enable // 无权限的时候不允许点击
+        respringButton.isHidden = !settingsUtils.getEnableRespringFunction()
         
         // 添加设置项
         let settingsButton = UIButton(type: .system)
@@ -118,6 +122,7 @@ class RootViewController: UIViewController {
             settingsButton.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 50), // 左侧边距
             settingsButton.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -50) // 右侧边距
         ])
+
     }
 
     func checkInstallPermission() -> Bool {
@@ -127,17 +132,71 @@ class RootViewController: UIViewController {
     }
 
     @objc func onClickRebootButton() {
-        let deviceController = DeviceController()
-        deviceController.rebootDevice()
+        
+        if settingsUtils.getShowAlertBeforeAction() {
+            // 创建 UIAlertController
+            let alertController = UIAlertController(title: nil, message: String.localizedStringWithFormat(NSLocalizedString("Action_Alert", comment: ""), NSLocalizedString("Reboot_Device_text", comment: "")), preferredStyle: .alert)
+            
+            // 创建 "确定" 按钮（红色）
+            let confirmAction = UIAlertAction(title: NSLocalizedString("Confirm_text", comment: ""), style: .destructive) { _ in
+                let deviceController = DeviceController()
+                deviceController.rebootDevice()
+            }
+            
+            // 创建 "取消" 按钮
+            let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel_text", comment: ""), style: .cancel) { _ in
+                //
+            }
+            
+            // 添加按钮到 UIAlertController
+            alertController.addAction(confirmAction)
+            alertController.addAction(cancelAction)
+            
+            // 显示弹窗
+            self.present(alertController, animated: true, completion: nil)
+        } else {
+            let deviceController = DeviceController()
+            deviceController.rebootDevice()
+        }
+        
     }
     
     @objc func onClickRespringButton() {
-        let deviceController = DeviceController()
-        deviceController.respring()
+        
+        if settingsUtils.getShowAlertBeforeAction() {
+            // 创建 UIAlertController
+            let alertController = UIAlertController(title: nil, message: String.localizedStringWithFormat(NSLocalizedString("Action_Alert", comment: ""), NSLocalizedString("Respring_text", comment: "")), preferredStyle: .alert)
+            
+            // 创建 "确定" 按钮（红色）
+            let confirmAction = UIAlertAction(title: NSLocalizedString("Confirm_text", comment: ""), style: .destructive) { _ in
+                let deviceController = DeviceController()
+                deviceController.respring()
+            }
+            
+            // 创建 "取消" 按钮
+            let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel_text", comment: ""), style: .cancel) { _ in
+                //
+            }
+            
+            // 添加按钮到 UIAlertController
+            alertController.addAction(confirmAction)
+            alertController.addAction(cancelAction)
+            
+            // 显示弹窗
+            self.present(alertController, animated: true, completion: nil)
+        } else {
+            let deviceController = DeviceController()
+            deviceController.respring()
+        }
+        
     }
 
     @objc func onClickSettingsButton() {
 		let settingsViewController = SettingsViewController()
+        // 注册监听器
+        settingsViewController.onSettingsChanged = { [weak self] in
+            self?.updateUI()
+        }
         // 嵌入到导航控制器
         let navController = UINavigationController(rootViewController: settingsViewController)
         // 设置导航栏完成按钮
@@ -156,6 +215,11 @@ class RootViewController: UIViewController {
         // 关闭模态视图
         dismiss(animated: true, completion: nil)
     }
+    
+    private func updateUI() { // 因为设置更改 更新界面
+        checkPermissionLabel.isHidden = !settingsUtils.getShowRootText()
+        respringButton.isHidden = !settingsUtils.getEnableRespringFunction()
+    }
 }
 
 extension UIColor {
diff --git a/SettingsUtils.swift b/SettingsUtils.swift
diff --git a/SettingsViewController.swift b/SettingsViewController.swift
diff --git a/entitlements.plist b/entitlements.plist

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`9`	`9`	`window = UIWindow(frame: UIScreen.main.bounds)`
`10`	`10`	`window!.rootViewController = UINavigationController(rootViewController: RootViewController())`
`11`	`11`	`window!.makeKeyAndVisible()`
	`12`	`+ // 加载配置文件`
	`13`	`+ SettingsUtils.instance`
`12`	`14`	`return true`
`13`	`15`	`}`
`14`	`16`