diff --git a/app/build.gradle b/app/build.gradle index d3c4fea..859b318 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,8 +57,8 @@ android { dependencies { compileOnly 'de.robv.android.xposed:api:82' - implementation 'com.highcapable.yukihookapi:api:1.0.90' - ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.90' + implementation 'com.highcapable.yukihookapi:api:1.0.91' + ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.91' 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 cc81e0b..2e923ad 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.factory.isXposedModuleActive +import com.highcapable.yukihookapi.YukiHookAPI class ConfigureActivity : BaseActivity() { @@ -61,7 +61,7 @@ class ConfigureActivity : BaseActivity() { override fun onCreate() { /** 检查激活状态 */ - if (isXposedModuleActive.not()) { + if (YukiHookAPI.Status.isXposedModuleActive.not()) { 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 ca13d56..af3b5bf 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 @@ -38,9 +38,8 @@ import com.fankes.miui.notify.ui.activity.base.BaseActivity import com.fankes.miui.notify.utils.factory.* import com.fankes.miui.notify.utils.tool.GithubReleaseTool import com.fankes.miui.notify.utils.tool.SystemUITool -import com.highcapable.yukihookapi.hook.factory.isXposedModuleActive +import com.highcapable.yukihookapi.YukiHookAPI import com.highcapable.yukihookapi.hook.factory.modulePrefs -import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus class MainActivity : BaseActivity() { @@ -105,7 +104,7 @@ class MainActivity : BaseActivity() { noCancelable() } /** 判断是否 Hook */ - isXposedModuleActive -> { + YukiHookAPI.Status.isXposedModuleActive -> { if (IconPackParams(context = this).iconDatas.isEmpty() && modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)) showDialog { title = "配置通知图标优化名单" @@ -274,27 +273,27 @@ class MainActivity : BaseActivity() { private fun refreshModuleStatus() { binding.mainLinStatus.setBackgroundResource( when { - isXposedModuleActive && (isModuleRegular.not() || isModuleValied.not()) -> R.drawable.bg_yellow_round - isXposedModuleActive -> R.drawable.bg_green_round + YukiHookAPI.Status.isXposedModuleActive && (isModuleRegular.not() || isModuleValied.not()) -> R.drawable.bg_yellow_round + YukiHookAPI.Status.isXposedModuleActive -> R.drawable.bg_green_round else -> R.drawable.bg_dark_round } ) binding.mainImgStatus.setImageResource( when { - isXposedModuleActive -> R.mipmap.ic_success + YukiHookAPI.Status.isXposedModuleActive -> R.mipmap.ic_success else -> R.mipmap.ic_warn } ) binding.mainTextStatus.text = when { - isXposedModuleActive && isModuleRegular.not() && modulePrefs.get(DataConst.ENABLE_MODULE).not() -> "模块已停用" - isXposedModuleActive && isModuleRegular.not() -> "模块已激活,请重启系统界面" - isXposedModuleActive && isModuleValied.not() -> "模块已更新,请重启系统界面" - isXposedModuleActive -> "模块已激活" + YukiHookAPI.Status.isXposedModuleActive && isModuleRegular.not() && modulePrefs.get(DataConst.ENABLE_MODULE).not() -> "模块已停用" + YukiHookAPI.Status.isXposedModuleActive && isModuleRegular.not() -> "模块已激活,请重启系统界面" + YukiHookAPI.Status.isXposedModuleActive && isModuleValied.not() -> "模块已更新,请重启系统界面" + YukiHookAPI.Status.isXposedModuleActive -> "模块已激活" else -> "模块未激活" } - binding.mainTextApiWay.isVisible = isXposedModuleActive - binding.mainTextApiWay.text = "Activated by ${YukiHookModuleStatus.executorName} API ${YukiHookModuleStatus.executorVersion}" + binding.mainTextApiWay.isVisible = YukiHookAPI.Status.isXposedModuleActive + binding.mainTextApiWay.text = "Activated by ${YukiHookAPI.Status.executorName} API ${YukiHookAPI.Status.executorVersion}" } override fun onResume() { 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 51748a9..d715db4 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 @@ -29,7 +29,7 @@ import android.content.IntentFilter import com.fankes.miui.notify.const.Const import com.fankes.miui.notify.utils.factory.* import com.google.android.material.snackbar.Snackbar -import com.highcapable.yukihookapi.hook.factory.isXposedModuleActive +import com.highcapable.yukihookapi.YukiHookAPI import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication.Companion.appContext /** @@ -110,7 +110,7 @@ object SystemUITool { putExtra(Const.MODULE_VERSION_VERIFY_TAG, Const.MODULE_VERSION_VERIFY) }) } - if (isXposedModuleActive) + if (YukiHookAPI.Status.isXposedModuleActive) context?.showDialog { title = "请稍后" progressContent = "正在等待系统界面刷新" @@ -144,7 +144,7 @@ object SystemUITool { * @param context 实例 */ fun showNeedRestartSnake(context: Context) = - if (isXposedModuleActive) + if (YukiHookAPI.Status.isXposedModuleActive) context.snake(msg = "设置需要重启系统界面才能生效", actionText = "立即重启") { restartSystemUI(context) } else context.snake(msg = "模块没有激活,更改不会生效")