From 9dbd0bc7a88335ab6c020176f2595f62380cc4ed Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Fri, 25 Mar 2022 11:38:45 +0800 Subject: [PATCH] Merge code --- app/src/main/java/com/fankes/coloros/notify/const/Const.kt | 4 ++-- .../com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt | 4 ++-- .../com/fankes/coloros/notify/ui/activity/MainActivity.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/fankes/coloros/notify/const/Const.kt b/app/src/main/java/com/fankes/coloros/notify/const/Const.kt index 8ce48b9..14ff63d 100644 --- a/app/src/main/java/com/fankes/coloros/notify/const/Const.kt +++ b/app/src/main/java/com/fankes/coloros/notify/const/Const.kt @@ -47,8 +47,8 @@ object Const { const val MODULE_VERSION_VERIFY_TAG = "module_version_verify" /** 发送通讯广播号标签 */ - const val MODULE_CHECKING_RECEIVER_TAG = "cnn_checking_action" + const val ACTION_MODULE_CHECKING_RECEIVER = "cnn_checking_action" /** 接收通讯广播号标签 */ - const val MODULE_HANDLER_RECEIVER_TAG = "cnn_handler_action" + const val ACTION_MODULE_HANDLER_RECEIVER = "cnn_handler_action" } \ No newline at end of file diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt index 5421607..a5e7c66 100644 --- a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt +++ b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt @@ -192,7 +192,7 @@ class SystemUIHooker : YukiBaseHooker() { object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { context?.sendBroadcast(Intent().apply { - action = Const.MODULE_HANDLER_RECEIVER_TAG + action = Const.ACTION_MODULE_HANDLER_RECEIVER putExtra("isAction", true) putExtra("isValied", intent?.getStringExtra(Const.MODULE_VERSION_VERIFY_TAG) == Const.MODULE_VERSION_VERIFY) }) @@ -207,7 +207,7 @@ class SystemUIHooker : YukiBaseHooker() { private fun registerReceiver(context: Context) { if (isRegisterReceiver) return context.registerReceiver(userPresentReceiver, IntentFilter().apply { addAction(Intent.ACTION_USER_PRESENT) }) - context.registerReceiver(moduleReceiver, IntentFilter().apply { addAction(Const.MODULE_CHECKING_RECEIVER_TAG) }) + context.registerReceiver(moduleReceiver, IntentFilter().apply { addAction(Const.ACTION_MODULE_CHECKING_RECEIVER) }) isRegisterReceiver = true } 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 b86065c..eee534b 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 @@ -201,7 +201,7 @@ class MainActivity : BaseActivity() { openBrowser(url = "https://www.coolapk.com/u/876977", packageName = "com.coolapk.market") } /** 注册广播检查模块激活状态 */ - registerReceiver(hostReceiver, IntentFilter().apply { addAction(Const.MODULE_HANDLER_RECEIVER_TAG) }) + registerReceiver(hostReceiver, IntentFilter().apply { addAction(Const.ACTION_MODULE_HANDLER_RECEIVER) }) } /** 刷新模块状态 */ @@ -238,7 +238,7 @@ class MainActivity : BaseActivity() { refreshModuleStatus() /** 发送广播检查模块激活状态 */ sendBroadcast(Intent().apply { - action = Const.MODULE_CHECKING_RECEIVER_TAG + action = Const.ACTION_MODULE_CHECKING_RECEIVER putExtra(Const.MODULE_VERSION_VERIFY_TAG, Const.MODULE_VERSION_VERIFY) }) }