Update version to 3.7

README.md

@@ -2,7 +2,7 @@
 
 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/TSBattery)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/TSBattery/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v3.6-green)](https://github.com/fankes/TSBattery/releases)
+[![Blank](https://img.shields.io/badge/version-v3.7-green)](https://github.com/fankes/TSBattery/releases)
 [![Blank](https://img.shields.io/github/downloads/fankes/TSBattery/total?label=Release)](https://github.com/fankes/TSBattery/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.tsbattery/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.tsbattery/releases)
 [![Telegram](https://img.shields.io/static/v1?label=Telegram&message=交流讨论&color=0088cc)](https://t.me/XiaofangInternet)

app/build.gradle

@@ -72,8 +72,8 @@ tasks.whenTaskAdded {
 
 dependencies {
     compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.69'
+    implementation 'com.highcapable.yukihookapi:api:1.0.70'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.69'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.70'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
     implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'

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

@@ -32,6 +32,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import com.fankes.tsbattery.BuildConfig
 import com.fankes.tsbattery.data.DataConst
@@ -39,6 +40,7 @@ import com.fankes.tsbattery.hook.HookConst.QQ_PACKAGE_NAME
 import com.fankes.tsbattery.hook.HookConst.TIM_PACKAGE_NAME
 import com.fankes.tsbattery.hook.HookConst.WECHAT_PACKAGE_NAME
 import com.fankes.tsbattery.ui.activity.MainActivity
+import com.fankes.tsbattery.utils.factory.dp
 import com.fankes.tsbattery.utils.factory.showDialog
 import com.fankes.tsbattery.utils.factory.versionCode
 import com.fankes.tsbattery.utils.factory.versionName
@@ -267,21 +269,21 @@ class HookEntry : YukiHookXposedInitProxy {
                 injectMember {
                     method { name = "startTempService" }
                     intercept()
-                }
+                }.ignoredNoSuchMemberFailure()
                 injectMember {
                     method {
                         name = "startCoreService"
                         param(BooleanType)
                     }
                     intercept()
-                }
+                }.ignoredNoSuchMemberFailure()
                 injectMember {
                     method {
                         name = "onStartCommand"
                         param(IntentClass, IntType, IntType)
                     }
                     replaceTo(any = 2)
-                }
+                }.ignoredNoSuchMemberFailure()
             }
             injectMember {
                 method { name = "onCreate" }
@@ -313,7 +315,7 @@ class HookEntry : YukiHookXposedInitProxy {
                     param(IntentClass, IntType, IntType)
                 }
                 replaceTo(any = 2)
-            }
+            }.ignoredNoSuchMemberFailure()
         }
     }
 
@@ -330,48 +332,28 @@ class HookEntry : YukiHookXposedInitProxy {
                     afterHook {
                         /** 是否启用 Hook */
                         if (prefs.get(DataConst.ENABLE_SETTING_TIP).not()) return@afterHook
-
                         /** 当前的顶级 Item 实例 */
-                        var formItemRefRoot: View? = null
+                        val formItemRefRoot = field {
-
+                            type(FormSimpleItemClass).index(num = 1)
-                        /**
+                        }.ignoredError().get(instance).cast() ?: field {
-                         * 使用循环筛选
+                            type(FormCommonSingleLineItemClass).index(num = 1)
-                         * @param target 目标变量名称
+                        }.ignoredError().get(instance).cast<View?>()
-                         * @return [View] or null
-                         */
-                        fun match(target: String) = runCatching {
-                            field {
-                                name = target
-                                type = FormSimpleItemClass.clazz
-                            }.ignoredError().get(instance).cast() ?: field {
-                                name = target
-                                type = FormCommonSingleLineItemClass.clazz
-                            }.ignoredError().get(instance).cast<View?>()
-                        }.getOrNull()
-                        /** 循环出当前设置界面存在的顶级 Item */
-                        arrayOf(
-                            "a", "b", "c", "d", "e", "f", "g",
-                            "h", "i", "j", "k", "l", "m", "n",
-                            "o", "p", "q", "r", "s", "t", "u",
-                            "v", "w", "x", "y", "z", "A", "B"
-                        ).forEach { match(it)?.also { e -> formItemRefRoot = e } }
                         /** 创建一个新的 Item */
-                        FormSimpleItemClass.clazz.constructor { param(ContextClass) }.get().newInstance<View>(instance)?.also {
+                        FormSimpleItemClass.clazz.buildOf<View>(instance) { param(ContextClass) }?.current {
-                            it.javaClass.apply {
+                            method {
-                                method {
+                                name = "setLeftText"
-                                    name = "setLeftText"
+                                param(CharSequenceType)
-                                    param(CharSequenceType)
+                            }.call("TSBattery")
-                                }.get(it).call("TSBattery")
+                            method {
-                                method {
+                                name = "setRightText"
-                                    name = "setRightText"
+                                param(CharSequenceType)
-                                    param(CharSequenceType)
+                            }.call(prefs.get(DataConst.ENABLE_MODULE_VERSION))
-                                }.get(it).call(prefs.get(DataConst.ENABLE_MODULE_VERSION))
+                            method {
-                                method {
+                                name = "setBgType"
-                                    name = "setBgType"
+                                param(IntType)
-                                    param(IntType)
+                            }.call(if (isQQ) 0 else 2)
-                                }.get(it).call(2)
+                        }?.apply {
-                            }
+                            setOnClickListener {
-                            it.setOnClickListener {
                                 instance<Activity>().apply {
                                     showDialog {
                                         title = "TSBattery 守护中"
@@ -398,14 +380,16 @@ class HookEntry : YukiHookXposedInitProxy {
                                     }
                                 }
                             }
-                        }.apply {
+                        }?.also { item ->
                             var listGroup = formItemRefRoot?.parent as? ViewGroup?
                             val lparam = (if (listGroup?.childCount == 1) {
                                 listGroup = listGroup.parent as? ViewGroup
                                 (formItemRefRoot?.parent as? View?)?.layoutParams
                             } else formItemRefRoot?.layoutParams) ?: ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+                            /** 设置圆角和间距 */
+                            if (isQQ) (lparam as? MarginLayoutParams?)?.setMargins(0, 15.dp(item.context), 0, 0)
                             /** 将 Item 添加到设置界面 */
-                            listGroup?.also { if (isQQ) it.addView(this, lparam) else it.addView(this, 0, lparam) }
+                            listGroup?.also { if (isQQ) it.addView(item, lparam) else it.addView(item, 0, lparam) }
                         }
                     }
                 }
@@ -518,21 +502,21 @@ class HookEntry : YukiHookXposedInitProxy {
                 injectMember {
                     method {
                         name = "doReport"
-                        param(("com.tencent.qapmsdk.qqbattery.monitor.WakeLockMonitor\$WakeLockEntity").clazz, IntType)
+                        param("com.tencent.qapmsdk.qqbattery.monitor.WakeLockMonitor\$WakeLockEntity", IntType)
                     }
                     intercept()
                 }
                 injectMember {
                     method {
                         name = "afterHookedMethod"
-                        param(("com.tencent.qapmsdk.qqbattery.monitor.MethodHookParam").clazz)
+                        param("com.tencent.qapmsdk.qqbattery.monitor.MethodHookParam")
                     }
                     intercept()
                 }
                 injectMember {
                     method {
                         name = "beforeHookedMethod"
-                        param(("com.tencent.qapmsdk.qqbattery.monitor.MethodHookParam").clazz)
+                        param("com.tencent.qapmsdk.qqbattery.monitor.MethodHookParam")
                     }
                     intercept()
                 }
@@ -566,6 +550,7 @@ class HookEntry : YukiHookXposedInitProxy {
             /**
              * 这个是毒瘤核心操作类
              * 功能同上、全部拦截
+             * 👮🏻 经过排查 Play 版本也没这个类...... Emmmm 不想说啥了
              */
             findClass(name = "com.tencent.qapmsdk.qqbattery.QQBatteryMonitor").hook {
                 injectMember {

app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt

@@ -37,7 +37,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.highcapable.yukihookapi.annotation.DoNotUseField
+import com.highcapable.yukihookapi.annotation.CauseProblemsApi
 import com.highcapable.yukihookapi.hook.factory.method
 import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass
 
@@ -61,7 +61,7 @@ class DialogBuilder(val context: Context, private val isUseBlackTheme: Boolean)
 
     private var dialogInstance: Dialog? = null // 对话框实例
 
-    @DoNotUseField
+    @CauseProblemsApi
     var customLayoutView: View? = null // 自定义布局
 
     /**

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "3.6"
+    appVersionName = "3.7"
-    appVersionCode = 14
+    appVersionCode = 15
 }
 
 task clean(type: Delete) {