From 7938477bb3a8090ba89a6abaeb3500ad3645f911 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sat, 4 Feb 2023 22:42:35 +0800
Subject: [PATCH] Modify change when module is disabled turn off some functions
 in ConfigureActivity, SystemUITool

---
 .../coloros/notify/ui/activity/ConfigureActivity.kt      | 9 +++++----
 .../com/fankes/coloros/notify/utils/tool/SystemUITool.kt | 8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt
index e1bb705..aa3c52f 100644
--- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt
@@ -27,6 +27,7 @@ package com.fankes.coloros.notify.ui.activity
 import androidx.core.view.isVisible
 import com.fankes.coloros.notify.R
 import com.fankes.coloros.notify.bean.IconDataBean
+import com.fankes.coloros.notify.data.ConfigData
 import com.fankes.coloros.notify.databinding.ActivityConfigBinding
 import com.fankes.coloros.notify.databinding.AdapterConfigBinding
 import com.fankes.coloros.notify.databinding.DiaIconFilterBinding
@@ -56,11 +57,11 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
     private var iconAllDatas = ArrayList<IconDataBean>()
 
     override fun onCreate() {
-        /** 检查激活状态 */
-        if (YukiHookAPI.Status.isXposedModuleActive.not()) {
+        /** 检查激活和启用状态 */
+        if (YukiHookAPI.Status.isXposedModuleActive.not() || ConfigData.isEnableModule.not()) {
             showDialog {
-                title = "模块没有激活"
-                msg = "模块没有激活，你无法使用这里的功能，请先激活模块。"
+                title = "模块不可用"
+                msg = "模块没有激活或已被停用，你无法使用这里的功能，请先激活或启用模块。"
                 confirmButton(text = "我知道了") { finish() }
                 noCancelable()
             }
diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
index 4a27675..893b8b9 100644
--- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt
@@ -25,6 +25,7 @@ package com.fankes.coloros.notify.utils.tool
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import com.fankes.coloros.notify.const.PackageName
+import com.fankes.coloros.notify.data.ConfigData
 import com.fankes.coloros.notify.ui.activity.MainActivity
 import com.fankes.coloros.notify.utils.factory.delayedRun
 import com.fankes.coloros.notify.utils.factory.execShell
@@ -72,6 +73,9 @@ object SystemUITool {
      * @param context 实例
      */
     fun restartSystemUI(context: Context) {
+        /** 动态刷新功能是否可用 */
+        val isDynamicAvailable = ConfigData.isEnableModule && MainActivity.isModuleRegular && MainActivity.isModuleValied
+
         /** 当 Root 权限获取失败时显示对话框 */
         fun showWhenAccessRootFail() =
             context.showDialog {
@@ -84,7 +88,7 @@ object SystemUITool {
         context.showDialog {
             title = "重启系统界面"
             msg = "你确定要立即重启系统界面吗？\n\n" +
-                    "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (MainActivity.isModuleRegular && MainActivity.isModuleValied)
+                    "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (isDynamicAvailable)
                 "\n\n你也可以选择“立即生效”来动态刷新系统界面并生效当前模块设置。" else "")
             confirmButton {
                 execShell(cmd = "pgrep systemui").also { pid ->
@@ -94,7 +98,7 @@ object SystemUITool {
                 }
             }
             cancelButton()
-            if (MainActivity.isModuleRegular && MainActivity.isModuleValied) neutralButton(text = "立即生效") { refreshSystemUI(context) }
+            if (isDynamicAvailable) neutralButton(text = "立即生效") { refreshSystemUI(context) }
         }
     }