diff --git a/app/src/main/java/com/fankes/miui/notify/ui/activity/ConfigureActivity.kt b/app/src/main/java/com/fankes/miui/notify/ui/activity/ConfigureActivity.kt index 6ff5bd4..2703fcc 100644 --- a/app/src/main/java/com/fankes/miui/notify/ui/activity/ConfigureActivity.kt +++ b/app/src/main/java/com/fankes/miui/notify/ui/activity/ConfigureActivity.kt @@ -27,6 +27,7 @@ package com.fankes.miui.notify.ui.activity import androidx.core.view.isVisible import com.fankes.miui.notify.R import com.fankes.miui.notify.bean.IconDataBean +import com.fankes.miui.notify.data.ConfigData import com.fankes.miui.notify.databinding.ActivityConfigBinding import com.fankes.miui.notify.databinding.AdapterConfigBinding import com.fankes.miui.notify.databinding.DiaIconFilterBinding @@ -56,11 +57,11 @@ class ConfigureActivity : BaseActivity() { private var iconAllDatas = ArrayList() 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/miui/notify/utils/tool/SystemUITool.kt b/app/src/main/java/com/fankes/miui/notify/utils/tool/SystemUITool.kt index 620266a..e8d505b 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/tool/SystemUITool.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/tool/SystemUITool.kt @@ -27,6 +27,7 @@ import android.content.Context import android.content.Intent import androidx.appcompat.app.AppCompatActivity import com.fankes.miui.notify.const.PackageName +import com.fankes.miui.notify.data.ConfigData import com.fankes.miui.notify.ui.activity.MainActivity import com.fankes.miui.notify.utils.factory.delayedRun import com.fankes.miui.notify.utils.factory.execShell @@ -111,11 +112,13 @@ object SystemUITool { * @param context 实例 */ fun restartSystemUI(context: Context) { + /** 动态刷新功能是否可用 */ + val isDynamicAvailable = ConfigData.isEnableModule && MainActivity.isModuleRegular && MainActivity.isModuleValied context.showDialog { title = "重启系统界面" msg = "你确定要立即重启系统界面吗?\n\n" + "部分 MIUI 内测和开发版中使用了状态栏主题可能会发生主题失效的情况,这种情况请再重启一次即可。\n\n" + - "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (MainActivity.isModuleRegular && MainActivity.isModuleValied) + "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (isDynamicAvailable) "\n\n你也可以选择“立即生效”来动态刷新系统界面并生效当前模块设置。" else "") confirmButton { execShell(cmd = "pgrep systemui").also { pid -> @@ -125,7 +128,7 @@ object SystemUITool { } } cancelButton() - if (MainActivity.isModuleRegular && MainActivity.isModuleValied) neutralButton(text = "立即生效") { refreshSystemUI(context) } + if (isDynamicAvailable) neutralButton(text = "立即生效") { refreshSystemUI(context) } } }