1.Finished all settings and function

DevelopLab · DevelopLab · commit a3142d56e80f · 2024-11-19T11:13:15.000+02:00
2.Fix SettingsViewController.swift cell reuse bug.
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
@@ -26,7 +26,8 @@
 "Show_Alert_Before_Starting_text" = "Show alert before starting";
 "Countdown_Title_text" = "Countdown for %@";
 "Countdown_Message_text" = "%d seconds remaining";
-"Timer_Alert_text" = "TODO";
+"Automatic_Timer_Alert_text" = "The current selection will immediately automatically execute the operation you choose when the Application is opened next time, with no any alert.\nIf you want to disable it, you can long press the application icon to use %@ %@";
+"Automatically_Action_hint" = "'%@' and '%@' can not enable together.";
 "Version_text" = "Version";
 "Unknown_text" = "Unknown";
 "Special_Thanks_text" = "Special thanks to Xiaobovlog\nProvides core code for reboot";
diff --git a/Resources/zh-Hans.lproj/Localizable.strings b/Resources/zh-Hans.lproj/Localizable.strings
@@ -26,7 +26,8 @@
 "Show_Alert_Before_Starting_text" = "开始操作前显示提醒";
 "Countdown_Title_text" = "即将进行%@";
 "Countdown_Message_text" = "剩余%d秒";
-"Timer_Alert_text" = "TODO";
+"Automatic_Timer_Alert_text" = "当前的选择在下一次打开App时会立即自动执行您选择的操作，没有任何提示\n如果需要关闭可以长按图标使用%@%@";
+"Automatically_Action_hint" = "'%@'和'%@'无法同时开启";
 "Version_text" = "版本";
 "Unknown_text" = "未知";
 "Special_Thanks_text" = "特别感谢肖博vlog\n提供重启设备核心代码";
diff --git a/RootViewController.swift b/RootViewController.swift
@@ -39,13 +39,13 @@ class RootViewController: UIViewController {
         // 检查权限
         checkPermissionLabel.translatesAutoresizingMaskIntoConstraints = false
         checkPermissionLabel.textAlignment = .center  // 设置文本居中
-        checkPermissionLabel.isHidden = !settingsUtils.getShowRootText()
 
         let enable = settingsUtils.checkInstallPermission()
 
         if(enable) {
             checkPermissionLabel.text = NSLocalizedString("Install_With_TrollStore_text", comment: "")
             checkPermissionLabel.textColor = UIColor.green
+            checkPermissionLabel.isHidden = !settingsUtils.getShowRootText()
         } else {
             checkPermissionLabel.text = NSLocalizedString("Need_Install_With_TrollStore_text", comment: "")
             checkPermissionLabel.textColor = UIColor.red
@@ -63,6 +63,11 @@ class RootViewController: UIViewController {
             rebootButton.clipsToBounds = true
             rebootButton.setTitle(NSLocalizedString("Reboot_Device_text", comment: ""), for: .normal)
             rebootButton.setTitleColor(.white, for: .normal)
+            if !enable {
+                // 禁用状态按钮的样子 照顾一下iOS14 用户 但是又没权限的情况，貌似基本不存在
+                rebootButton.backgroundColor = UIColor.lightGray
+                rebootButton.setTitleColor(.darkGray, for: .normal)
+            }
 		}
 
         rebootButton.translatesAutoresizingMaskIntoConstraints = false
@@ -333,11 +338,11 @@ class RootViewController: UIViewController {
         settingsUtils.setEnableAction(value: false)
         // 显示一个弹窗 提示用户倒计时器已被禁用
         let alertController = UIAlertController(title: nil, message: NSLocalizedString("Timer_Closed_text", comment: ""), preferredStyle: .alert)
-        let doneAction = UIAlertAction(title: NSLocalizedString("Dismiss_text", comment: ""), style: .cancel) { _ in
+        let dismissAction = UIAlertAction(title: NSLocalizedString("Dismiss_text", comment: ""), style: .cancel) { _ in
             //
         }
         // 添加按钮到 UIAlertController
-        alertController.addAction(doneAction)
+        alertController.addAction(dismissAction)
         // 显示弹窗
         self.present(alertController, animated: true, completion: nil)
         settingsUtils.configQuickActions(application: UIApplication.shared)
diff --git a/SettingsViewController.swift b/SettingsViewController.swift
@@ -6,6 +6,7 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
     
     let tableView = UITableView(frame: .zero, style: .insetGrouped)
     private let settingsUtils = SettingsUtils.instance
+    private var hasRootPermission = false //用于存储是否是有Root权限
 
     // 每个分组的小标题
     let sectionTitles = [
@@ -38,6 +39,8 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
 
         // 设置视图标题
         self.title = NSLocalizedString("Settings_text", comment: "")
+        // 检查Root权限
+        hasRootPermission = settingsUtils.checkInstallPermission()
 
         // 设置表格视图的代理和数据源
         tableView.delegate = self
@@ -71,6 +74,16 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         var cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
+        
+        // 2. 重置 Cell 状态 解决经典列表复用bug
+        cell.textLabel?.text = nil
+        cell.detailTextLabel?.text = nil
+        cell.textLabel?.textColor = .label
+        cell.accessoryView = nil
+        cell.accessoryType = .none
+        cell.selectionStyle = .none
+        cell.isUserInteractionEnabled = true
+        
         // 设置单元格的文本
         cell.textLabel?.text = sections[indexPath.section][indexPath.row]
         cell.textLabel?.numberOfLines = 0 // 允许文本过长时换行
@@ -81,13 +94,20 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
 				// 创建 UISwitch 控件
                 let switchView = UISwitch(frame: .zero)
                 switchView.addTarget(self, action: #selector(self.switchChanged(_:)), for: .valueChanged)
+                switchView.isEnabled = true
                 // 根据不同的设置项初始化开关状态
                 if indexPath.section == 0 {
                     if indexPath.row == 0 {
                         switchView.tag = SwitchTag.ShowAlertBeforeAction.rawValue
                         switchView.isOn = settingsUtils.getShowAlertBeforeAction()
                     } else if indexPath.row == 1 {
                         switchView.tag = SwitchTag.ShowRootText.rawValue
+                        if !hasRootPermission { // 没有Root权限的用户，不允许关闭无权限的提示
+                            settingsUtils.setShowRootText(value: true) // 强制显示 防止某些用户(可能只有我会这样测试)从有Root权限变成没有权限
+                            cell.textLabel?.textColor = .lightGray //文本变成灰色
+                            switchView.isEnabled = false // 禁用开关
+                            cell.isUserInteractionEnabled = false
+                        }
                         switchView.isOn = settingsUtils.getShowRootText()
                     }
                 } else if indexPath.section == 1 {
@@ -96,7 +116,25 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
                         switchView.isOn = settingsUtils.getEnableRespringFunction()
                     } else if indexPath.row == 1 {
                         switchView.tag = SwitchTag.HomeQuickAction.rawValue
+                        if !hasRootPermission { // 检查用户是否有Root权限
+                            settingsUtils.setHomeQuickAction(value: false) // 无Root 强制关闭桌面快捷方式
+                            settingsUtils.configQuickActions(application: UIApplication.shared) // 强制移除掉快捷方式 防止某些用户(可能只有我会这样测试)从有Root权限变成没有权限
+                            cell.textLabel?.textColor = .lightGray //文本变成灰色
+                            switchView.isEnabled = false // 禁用开关
+                            cell.isUserInteractionEnabled = false
+                        }
+                        if settingsUtils.getEnableAction() && settingsUtils.getOpenApplicationAction() { // 检查是否与其他功能冲突
+                            cell.textLabel?.textColor = .lightGray //文本变成灰色
+                            switchView.isEnabled = false //Switch开关禁用
+                            cell.isUserInteractionEnabled = false
+                        } else {
+                            cell.textLabel?.textColor = .label //文本正常
+                            switchView.isEnabled = true
+                            cell.isUserInteractionEnabled = true
+                        }
+                        
                         switchView.isOn = settingsUtils.getHomeQuickAction()
+
                     }
                 }
 
@@ -123,22 +161,50 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
 
                     // 设置 UIStepper 为 cell 的 accessoryView
                     cell.accessoryView = stepper
+                    cell.selectionStyle = .none //没有点击cell的效果
 				} else if indexPath.row == 2 {
                     let switchView = UISwitch(frame: .zero)
                     switchView.tag = SwitchTag.OpenApplicationAction.rawValue
                     switchView.addTarget(self, action: #selector(self.switchChanged(_:)), for: .valueChanged)
-                    switchView.isOn = settingsUtils.getOpenApplicationAction()
+                    if !hasRootPermission {
+                        settingsUtils.setOpenApplicationAction(value: false) // 无Root权限 禁止打开app就执行操作
+                        cell.textLabel?.textColor = .lightGray //文本变成灰色
+                        switchView.isEnabled = false // 禁用开关
+                        cell.isUserInteractionEnabled = false
+                    } else {
+                        switchView.isOn = settingsUtils.getOpenApplicationAction()
+                    }
+                    if !settingsUtils.getEnableAction() { // 判断是否打开了 启用 开关
+                        cell.textLabel?.textColor = .lightGray //文本变成灰色
+                        switchView.isEnabled = false // 禁用开关
+                        cell.isUserInteractionEnabled = false
+                    } else {
+                        cell.textLabel?.textColor = .label //文本变成灰色
+                        switchView.isEnabled = true // 禁用开关
+                        cell.isUserInteractionEnabled = true
+                    }
+
                     cell.accessoryView = switchView
                 } else if indexPath.row == 3 {
                     cell = UITableViewCell(style: .value1, reuseIdentifier: "cell")
                     if settingsUtils.getEnableRespringFunction() { // 判断是否开启了注销功能
                         cell.accessoryType = .disclosureIndicator // 添加右侧箭头
+                        cell.detailTextLabel?.textColor = .secondaryLabel // 默认浅灰色
                     } else {
                         cell.selectionStyle = .none
                         cell.accessoryType = .none
+                        cell.textLabel?.textColor = .lightGray //文本变成灰色
+                    }
+                    if !settingsUtils.getEnableAction() { // 判断是否打开了 启用 开关
+                        cell.textLabel?.textColor = .lightGray //文本变成灰色
+                        cell.isUserInteractionEnabled = false
+                        cell.detailTextLabel?.textColor = .tertiaryLabel // 更浅的灰色
+                    } else {
+                        cell.textLabel?.textColor = .label //文本变成灰色
+                        cell.isUserInteractionEnabled = true
                     }
                     cell.textLabel?.text = sections[indexPath.section][indexPath.row]
-                    cell.isUserInteractionEnabled = settingsUtils.getOpenApplicationAction()
+//                    cell.isUserInteractionEnabled = settingsUtils.getOpenApplicationAction()
                     // 设置当前选择的item
                     let action = settingsUtils.getAction()
                     switch action {
@@ -167,6 +233,8 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
 
         return cell
     }
+    
+    
 
     // MARK: - UISwitch 事件处理
     @objc func switchChanged(_ sender: UISwitch) {
@@ -178,6 +246,7 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
         switch switchTag {
         case SwitchTag.ShowAlertBeforeAction:
             settingsUtils.setShowAlertBeforeAction(value: sender.isOn)
+            checkAutomaticaEnableAlert()
         case SwitchTag.ShowRootText:
             settingsUtils.setShowRootText(value: sender.isOn)
         case SwitchTag.RespringFunction:
@@ -196,9 +265,16 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
         case SwitchTag.EnableAction:
             settingsUtils.setEnableAction(value: sender.isOn)
             settingsUtils.configQuickActions(application: UIApplication.shared)
+            checkFunctionConflict()
+            checkAutomaticaEnableAlert()
+            // 刷新子项目
+            tableView.reloadRows(at: [IndexPath(row: 2, section: 2)], with: .none)
+            tableView.reloadRows(at: [IndexPath(row: 3, section: 2)], with: .none)
         case SwitchTag.OpenApplicationAction:
             settingsUtils.setOpenApplicationAction(value: sender.isOn)
             settingsUtils.configQuickActions(application: UIApplication.shared)
+            checkFunctionConflict()
+            checkAutomaticaEnableAlert()
         }
     }
 
@@ -207,14 +283,15 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
         if let cell = sender.superview as? UITableViewCell {
             // 更新 detailTextLabel 显示当前值
             settingsUtils.setTime(value: Int(sender.value))
+            checkAutomaticaEnableAlert() //检查是否是全自动化
             cell.detailTextLabel?.text = String.localizedStringWithFormat(NSLocalizedString("Seconds_text", comment: ""), Int(sender.value))
         }
     }
 
     // MARK: - UITableViewDelegate 点击item的事件
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 2 && indexPath.row == 3 {
-            if settingsUtils.getEnableRespringFunction() {
+            if settingsUtils.getEnableRespringFunction() && settingsUtils.getEnableAction() {
                 let actionSheet = UIAlertController(title: NSLocalizedString("Choose_An_Action_text", comment: ""), message: nil, preferredStyle: .actionSheet)
                 let options = [NSLocalizedString("Reboot_Device_text", comment: ""), NSLocalizedString("Respring_text", comment: "")]
                 
@@ -232,7 +309,9 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
                 }
 
                 // 添加取消按钮
-                let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel_text", comment: ""), style: .cancel, handler: nil)
+                let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel_text", comment: ""), style: .cancel) { _ in
+                    tableView.reloadRows(at: [indexPath], with: .none) // 取消时刷新单元格 取消动画
+                }
                 actionSheet.addAction(cancelAction)
 
                 // 显示弹窗
@@ -265,12 +344,40 @@ class SettingsViewController: UIViewController, UITableViewDelegate, UITableView
     }
 
     func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        return nil  // 可以为分组设置尾部文本，如果没有尾部可以返回 nil
+        // 可以为分组设置尾部文本，如果没有尾部可以返回 nil
+        if section == 2 {
+            return String.localizedStringWithFormat(NSLocalizedString("Automatically_Action_hint", comment: ""), NSLocalizedString("When_Open_Application_To_Action_text", comment: ""),NSLocalizedString("Home_Screen_Quick_Actions_text", comment: ""))
+        }
+        return nil
     }
     
-    // 界面关闭的时候让主界面知道设置改变了
+    // 界面关闭的时候让主界面知道设置改变了 然后更新一下对应的功能是否开启
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         onSettingsChanged?()
     }
+    
+    private func checkFunctionConflict() {
+        if settingsUtils.getEnableAction() && settingsUtils.getOpenApplicationAction() {
+            settingsUtils.setHomeQuickAction(value: false)
+            settingsUtils.configQuickActions(application: UIApplication.shared)
+        }
+        tableView.reloadRows(at: [IndexPath(row: 1, section: 1)], with: .none)
+    }
+    
+    private func checkAutomaticaEnableAlert() {
+        if !settingsUtils.getShowAlertBeforeAction() && settingsUtils.getEnableAction() &&
+            settingsUtils.getOpenApplicationAction() && settingsUtils.getTime() == 0 {
+            // 显示一个弹窗 提示用户当前操作的取消方法
+            let alertController = UIAlertController(title: nil, message: String.localizedStringWithFormat(NSLocalizedString("Automatic_Timer_Alert_text", comment: ""), NSLocalizedString("Home_Screen_Quick_Actions_text", comment: ""),NSLocalizedString("Cancel_Timer_text", comment: "")), preferredStyle: .alert)
+            let dismissAction = UIAlertAction(title: NSLocalizedString("Dismiss_text", comment: ""), style: .cancel) { _ in
+                //
+            }
+            // 添加按钮到 UIAlertController
+            alertController.addAction(dismissAction)
+            // 显示弹窗
+            self.present(alertController, animated: true, completion: nil)
+            settingsUtils.configQuickActions(application: UIApplication.shared)
+        }
+    }
 }
