优化代码

app/src/main/java/com/fankes/tsbattery/hook/HookMain.kt

@@ -239,20 +239,9 @@ class HookMain : IXposedHookLoadPackage {
                                 }
                             })
                     }
-                /** Hook CoreService 全部方法 */
-                if (lpparam.packageName == TIM_PACKAGE_NAME)
-                    runWithoutError("CoreServiceAllMethods") {
-                        if (XPrefUtils.getBoolean(HookMedium.ENABLE_QQTIM_CORESERVICE_BAN)) {
-                            lpparam.classLoader.loadClass("$QQ_PACKAGE_NAME.app.CoreService")
-                                .methods.forEach {
-                                    if (it.name != "onCreate" && it.name != "onDestroy" && it.name != "onBind")
-                                        XposedBridge.hookMethod(it, replaceToNull)
-                                }
-                            logD("hook CoreService OK!")
-                        }
-                    }
                 /** Hook CoreService 指定方法 */
-                else runWithoutError("CoreServiceKnownMethods") {
+                if (lpparam.packageName == QQ_PACKAGE_NAME)
+                    runWithoutError("CoreServiceKnownMethods") {
                         if (XPrefUtils.getBoolean(HookMedium.ENABLE_QQTIM_CORESERVICE_BAN)) {
                             XposedHelpers.findAndHookMethod(
                                 "$QQ_PACKAGE_NAME.app.CoreService",
@@ -287,11 +276,12 @@ class HookMain : IXposedHookLoadPackage {
                                         runWithoutError("StopCoreService") {
                                             stopForeground(true)
                                             stopService(Intent(applicationContext, javaClass))
+                                            logD("Shutdown CoreService OK!")
                                         }
                                     }
                                 }
                             })
-                        logD("Shutdown CoreService OK!")
+                        logD("hook CoreService [onCreate] OK!")
                     }
                 }
                 /** Hook CoreService$KernelService 启动方法 */
@@ -307,6 +297,7 @@ class HookMain : IXposedHookLoadPackage {
                                         runWithoutError("StopKernelService") {
                                             stopForeground(true)
                                             stopService(Intent(applicationContext, javaClass))
+                                            logD("Shutdown CoreService\$KernelService OK!")
                                         }
                                     }
                                 }
@@ -320,7 +311,7 @@ class HookMain : IXposedHookLoadPackage {
 
                                 override fun replaceHookedMethod(param: MethodHookParam?) = 2
                             })
-                        logD("Shutdown CoreService\$KernelService OK!")
+                        logD("hook CoreService\$KernelService [onCreate] OK!")
                     }
                 }
                 /** 关闭保守模式后不再仅仅作用于系统电源锁 */
@@ -351,6 +342,7 @@ class HookMain : IXposedHookLoadPackage {
                          * 一个不知道是什么作用的电源锁
                          * 同样直接干掉
                          */
+                        if (lpparam.packageName == QQ_PACKAGE_NAME)
                             XposedHelpers.findAndHookMethod(
                                 "com.tencent.mars.ilink.comm.WakerLock",
                                 lpparam.classLoader,
@@ -400,6 +392,7 @@ class HookMain : IXposedHookLoadPackage {
                          * 讯哥的程序员真的有你的
                          * 2022/1/25 后期查证：锁屏界面消息快速回复窗口
                          */
+                        if (lpparam.packageName == QQ_PACKAGE_NAME)
                             XposedHelpers.findAndHookMethod(
                                 "$QQ_PACKAGE_NAME.activity.QQLSActivity\$14",
                                 lpparam.classLoader,
@@ -416,6 +409,7 @@ class HookMain : IXposedHookLoadPackage {
                          * 里面有各种使用 Handler 和 Timer 的各种耗时常驻后台耗电办法持续接收消息
                          * 直接循环全部方法全部干掉
                          */
+                        if (lpparam.packageName == QQ_PACKAGE_NAME)
                             lpparam.classLoader.loadClass("com.tencent.qapmsdk.qqbattery.monitor.WakeLockMonitor")
                                 .apply {
                                     val lockClazz =
@@ -506,7 +500,7 @@ class HookMain : IXposedHookLoadPackage {
 
                                 override fun afterHookedMethod(param: MethodHookParam?) {
                                     (param?.thisObject as? Activity?)?.apply {
-                                        showDialog {
+                                        showDialog(isUseBlackTheme = true) {
                                             title = "TSBattery 已激活"
                                             msg = "[提示模块运行信息功能已打开]\n\n" +
                                                     "模块工作看起来一切正常，请自行测试是否能达到省电效果。\n\n" +

app/src/main/java/com/fankes/tsbattery/utils/DialogBuilder.kt

@@ -27,23 +27,28 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 
-
 /**
  * 构造对话框
+ * @param isUseBlackTheme 是否使用深色主题
  * @param it 对话框方法体
  */
-fun Context.showDialog(it: DialogBuilder.() -> Unit) = DialogBuilder(this).apply(it).show()
+fun Context.showDialog(isUseBlackTheme: Boolean = false, it: DialogBuilder.() -> Unit) =
+    DialogBuilder(this, isUseBlackTheme).apply(it).show()
 
 /**
  * 对话框构造器
  * @param context 实例
+ * @param isUseBlackTheme 是否使用深色主题
  */
-class DialogBuilder(private val context: Context) {
+class DialogBuilder(private val context: Context, private val isUseBlackTheme: Boolean) {
 
     private var instance: AlertDialog.Builder? = null // 实例对象
 
     init {
-        instance = AlertDialog.Builder(context, android.R.style.Theme_Material_Light_Dialog)
+        instance = AlertDialog.Builder(
+            context,
+            if (isUseBlackTheme) android.R.style.Theme_Material_Dialog else android.R.style.Theme_Material_Light_Dialog
+        )
     }
 
     /** 设置对话框不可关闭 */
@@ -91,7 +96,8 @@ class DialogBuilder(private val context: Context) {
     internal fun show() = instance?.create()?.apply {
         window?.setBackgroundDrawable(GradientDrawable(
             GradientDrawable.Orientation.TOP_BOTTOM,
-            intArrayOf(Color.WHITE, Color.WHITE)
+            if (isUseBlackTheme) intArrayOf(0xFF2D2D2D.toInt(), 0xFF2D2D2D.toInt())
+            else intArrayOf(Color.WHITE, Color.WHITE)
         ).apply {
             shape = GradientDrawable.RECTANGLE
             gradientType = GradientDrawable.LINEAR_GRADIENT