From b8973fa15aeac9b4b4755471374239da2b9537e5 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 3 Feb 2023 04:50:35 +0800 Subject: [PATCH] Added dynamic refreshing option in restart system ui dialog in SystemUITool --- .../coloros/notify/ui/activity/MainActivity.kt | 12 ++++++------ .../fankes/coloros/notify/utils/tool/SystemUITool.kt | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt index 21f7c20..dd2b29f 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt @@ -47,6 +47,12 @@ class MainActivity : BaseActivity() { /** 窗口是否启动 */ internal var isActivityLive = false + /** 模块是否可用 */ + internal var isModuleRegular = false + + /** 模块是否有效 */ + internal var isModuleValied = false + /** 模块版本 */ private const val moduleVersion = BuildConfig.VERSION_NAME @@ -54,12 +60,6 @@ class MainActivity : BaseActivity() { private const val pendingFlag = "" } - /** 模块是否可用 */ - private var isModuleRegular = false - - /** 模块是否有效 */ - private var isModuleValied = false - override fun onCreate() { /** 设置可用性 */ isActivityLive = true 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 2002b4d..4a27675 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.ui.activity.MainActivity import com.fankes.coloros.notify.utils.factory.delayedRun import com.fankes.coloros.notify.utils.factory.execShell import com.fankes.coloros.notify.utils.factory.showDialog @@ -83,7 +84,8 @@ object SystemUITool { context.showDialog { title = "重启系统界面" msg = "你确定要立即重启系统界面吗?\n\n" + - "重启过程会黑屏并等待进入锁屏重新解锁。" + "重启过程会黑屏并等待进入锁屏重新解锁。" + (if (MainActivity.isModuleRegular && MainActivity.isModuleValied) + "\n\n你也可以选择“立即生效”来动态刷新系统界面并生效当前模块设置。" else "") confirmButton { execShell(cmd = "pgrep systemui").also { pid -> if (pid.isNotBlank()) @@ -92,6 +94,7 @@ object SystemUITool { } } cancelButton() + if (MainActivity.isModuleRegular && MainActivity.isModuleValied) neutralButton(text = "立即生效") { refreshSystemUI(context) } } }