From 3aff10fed55c440ade8c297855f5b24bffad0452 Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Sun, 20 Mar 2022 03:33:55 +0800 Subject: [PATCH] Update YukiHookAPI --- app/build.gradle | 4 ++-- .../miui/notify/ui/activity/ConfigureActivity.kt | 4 ++-- .../miui/notify/ui/activity/MainActivity.kt | 16 ++++++++-------- .../miui/notify/utils/tool/SystemUITool.kt | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f48462c..0d42206 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,8 +72,8 @@ tasks.whenTaskAdded { dependencies { compileOnly 'de.robv.android.xposed:api:82' - implementation 'com.highcapable.yukihookapi:api:1.0.55' - ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.55' + implementation 'com.highcapable.yukihookapi:api:1.0.6' + ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.6' implementation "com.github.topjohnwu.libsu:core:3.1.2" implementation 'androidx.annotation:annotation:1.3.0' implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0' 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 ea41cb1..cad86f8 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 @@ -43,7 +43,7 @@ import com.fankes.miui.notify.ui.activity.base.BaseActivity import com.fankes.miui.notify.utils.factory.* import com.fankes.miui.notify.utils.tool.IconRuleManagerTool import com.fankes.miui.notify.utils.tool.SystemUITool -import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus +import com.highcapable.yukihookapi.hook.factory.isXposedModuleActive class ConfigureActivity : BaseActivity() { @@ -61,7 +61,7 @@ class ConfigureActivity : BaseActivity() { override fun onCreate() { /** 检查激活状态 */ - if (!YukiHookModuleStatus.isActive()) { + if (!isXposedModuleActive) { showDialog { title = "模块没有激活" msg = "模块没有激活，你无法使用这里的功能，请先激活模块。" diff --git a/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt index edee110..12d5d49 100644 --- a/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt @@ -47,8 +47,8 @@ import com.fankes.miui.notify.params.IconPackParams import com.fankes.miui.notify.ui.activity.base.BaseActivity import com.fankes.miui.notify.utils.factory.* import com.fankes.miui.notify.utils.tool.SystemUITool +import com.highcapable.yukihookapi.hook.factory.isXposedModuleActive import com.highcapable.yukihookapi.hook.factory.modulePrefs -import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus class MainActivity : BaseActivity() { @@ -94,7 +94,7 @@ class MainActivity : BaseActivity() { noCancelable() } /** 判断是否 Hook */ - YukiHookModuleStatus.isActive() -> { + isXposedModuleActive -> { if (IconPackParams(context = this).iconDatas.isEmpty() && modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) ) showDialog { @@ -246,21 +246,21 @@ class MainActivity : BaseActivity() { private fun refreshModuleStatus() { binding.mainLinStatus.setBackgroundResource( when { - YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> R.drawable.bg_yellow_round - YukiHookModuleStatus.isActive() -> R.drawable.bg_green_round + isXposedModuleActive && isMiuiNotifyStyle -> R.drawable.bg_yellow_round + isXposedModuleActive -> R.drawable.bg_green_round else -> R.drawable.bg_dark_round } ) binding.mainImgStatus.setImageResource( when { - YukiHookModuleStatus.isActive() && !isMiuiNotifyStyle -> R.mipmap.ic_success + isXposedModuleActive && !isMiuiNotifyStyle -> R.mipmap.ic_success else -> R.mipmap.ic_warn } ) binding.mainTextStatus.text = when { - YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> "模块已激活，但未在工作" - YukiHookModuleStatus.isActive() -> "模块已激活" + isXposedModuleActive && isMiuiNotifyStyle -> "模块已激活，但未在工作" + isXposedModuleActive -> "模块已激活" else -> "模块未激活" } } @@ -270,7 +270,7 @@ class MainActivity : BaseActivity() { /** 刷新模块状态 */ refreshModuleStatus() /** 经典样式启用后给出警告 */ - if (!isWarnDialogShowing && YukiHookModuleStatus.isActive() && isMiuiNotifyStyle) + if (!isWarnDialogShowing && isXposedModuleActive && isMiuiNotifyStyle) showDialog { isWarnDialogShowing = true title = "经典通知栏样式已启用" 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 fd2d130..23bb31e 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 @@ -28,7 +28,7 @@ import com.fankes.miui.notify.utils.factory.showDialog import com.fankes.miui.notify.utils.factory.snake import com.fankes.miui.notify.utils.factory.toast import com.google.android.material.snackbar.Snackbar -import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus +import com.highcapable.yukihookapi.hook.factory.isXposedModuleActive /** * 系统界面工具 @@ -59,7 +59,7 @@ object SystemUITool { * @param context 实例 */ fun showNeedRestartSnake(context: Context) = - if (YukiHookModuleStatus.isActive()) + if (isXposedModuleActive) context.snake(msg = "设置需要重启系统界面才能生效", actionText = "立即重启") { restartSystemUI(context) } else context.snake(msg = "模块没有激活，更改不会生效") @@ -68,7 +68,7 @@ object SystemUITool { * @param context 实例 */ fun showNeedUpdateApplySnake(context: Context) = - if (YukiHookModuleStatus.isActive()) + if (isXposedModuleActive) context.snake(msg = "数据已更新，请重启系统界面使更改生效", actionText = "立即重启") { restartSystemUI(context) } else context.snake(msg = "模块没有激活，更改不会生效") } \ No newline at end of file