Modify change when module is disabled turn off some functions in ConfigureActivity, SystemUITool

This commit is contained in:
2023-02-04 22:42:35 +08:00
parent 1253b8c371
commit 7938477bb3
2 changed files with 11 additions and 6 deletions

View File

@@ -27,6 +27,7 @@ package com.fankes.coloros.notify.ui.activity
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.fankes.coloros.notify.R import com.fankes.coloros.notify.R
import com.fankes.coloros.notify.bean.IconDataBean 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.ActivityConfigBinding
import com.fankes.coloros.notify.databinding.AdapterConfigBinding import com.fankes.coloros.notify.databinding.AdapterConfigBinding
import com.fankes.coloros.notify.databinding.DiaIconFilterBinding import com.fankes.coloros.notify.databinding.DiaIconFilterBinding
@@ -56,11 +57,11 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
private var iconAllDatas = ArrayList<IconDataBean>() private var iconAllDatas = ArrayList<IconDataBean>()
override fun onCreate() { override fun onCreate() {
/** 检查激活状态 */ /** 检查激活和启用状态 */
if (YukiHookAPI.Status.isXposedModuleActive.not()) { if (YukiHookAPI.Status.isXposedModuleActive.not() || ConfigData.isEnableModule.not()) {
showDialog { showDialog {
title = "模块没有激活" title = "模块不可用"
msg = "模块没有激活,你无法使用这里的功能,请先激活模块。" msg = "模块没有激活或已被停用,你无法使用这里的功能,请先激活或启用模块。"
confirmButton(text = "我知道了") { finish() } confirmButton(text = "我知道了") { finish() }
noCancelable() noCancelable()
} }

View File

@@ -25,6 +25,7 @@ package com.fankes.coloros.notify.utils.tool
import android.content.Context import android.content.Context
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.fankes.coloros.notify.const.PackageName 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.ui.activity.MainActivity
import com.fankes.coloros.notify.utils.factory.delayedRun import com.fankes.coloros.notify.utils.factory.delayedRun
import com.fankes.coloros.notify.utils.factory.execShell import com.fankes.coloros.notify.utils.factory.execShell
@@ -72,6 +73,9 @@ object SystemUITool {
* @param context 实例 * @param context 实例
*/ */
fun restartSystemUI(context: Context) { fun restartSystemUI(context: Context) {
/** 动态刷新功能是否可用 */
val isDynamicAvailable = ConfigData.isEnableModule && MainActivity.isModuleRegular && MainActivity.isModuleValied
/** 当 Root 权限获取失败时显示对话框 */ /** 当 Root 权限获取失败时显示对话框 */
fun showWhenAccessRootFail() = fun showWhenAccessRootFail() =
context.showDialog { context.showDialog {
@@ -84,7 +88,7 @@ object SystemUITool {
context.showDialog { context.showDialog {
title = "重启系统界面" title = "重启系统界面"
msg = "你确定要立即重启系统界面吗?\n\n" + msg = "你确定要立即重启系统界面吗?\n\n" +
"重启过程会黑屏并等待进入锁屏重新解锁。" + (if (MainActivity.isModuleRegular && MainActivity.isModuleValied) "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (isDynamicAvailable)
"\n\n你也可以选择“立即生效”来动态刷新系统界面并生效当前模块设置。" else "") "\n\n你也可以选择“立即生效”来动态刷新系统界面并生效当前模块设置。" else "")
confirmButton { confirmButton {
execShell(cmd = "pgrep systemui").also { pid -> execShell(cmd = "pgrep systemui").also { pid ->
@@ -94,7 +98,7 @@ object SystemUITool {
} }
} }
cancelButton() cancelButton()
if (MainActivity.isModuleRegular && MainActivity.isModuleValied) neutralButton(text = "立即生效") { refreshSystemUI(context) } if (isDynamicAvailable) neutralButton(text = "立即生效") { refreshSystemUI(context) }
} }
} }