Update version to 3.99 | Support QQ 8.9.0 and 8.9.1

Support QQ 8.9.0 and 8.9.1
Fix hook BaseChatPie failure bug
2025-09-04 17:55:30 +08:00 · 2022-07-19 22:11:34 +08:00 · 2022-07-19 22:02:04 +08:00 · 2022-07-19 21:57:06 +08:00 · 2022-07-17 01:04:11 +08:00 · 2022-07-16 20:53:33 +08:00
13 changed files with 85 additions and 82 deletions
--- a/README.md
+++ b/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.96-green)](https://github.com/fankes/TSBattery/releases)
+[![Blank](https://img.shields.io/badge/version-v3.99-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/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
    id 'com.android.application'
    id 'kotlin-android'
-    id 'com.google.devtools.ksp' version '1.6.21-1.0.5'
+    id 'com.google.devtools.ksp' version '1.7.0-1.0.6'
 }

 android {
@@ -15,8 +15,7 @@ android {
            v2SigningEnabled true
        }
    }
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 32

    defaultConfig {
        applicationId "com.fankes.tsbattery"
@@ -61,10 +60,10 @@ dependencies {
    compileOnly 'de.robv.android.xposed:api:82'
    implementation 'com.highcapable.yukihookapi:api:1.0.92'
    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.92'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.7'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
--- a/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt
@@ -84,6 +84,9 @@ class HookEntry : IYukiHookXposedInit {
        )
    }

+    /** 是否完全支持当前版本 */
+    private var isHookClientSupport = true
+
    /**
     * 这个类 QQ 的 BaseChatPie 是控制聊天界面的
     *
@@ -134,11 +137,23 @@ class HookEntry : IYukiHookXposedInit {
                interceptBaseChatPie(methodName = "bl")
                interceptBaseChatPie(methodName = "bm")
            }
-            "8.8.93" -> {
+            "8.8.93", "8.8.95" -> {
                interceptBaseChatPie(methodName = "J3")
                interceptBaseChatPie(methodName = "S")
            }
-            else -> loggerD(msg = "$version not supported!")
+            "8.8.98" -> {
+                interceptBaseChatPie(methodName = "M3")
+                interceptBaseChatPie(methodName = "S")
+            }
+            /** 8.9.0 贡献者：StarWishsama */
+            "8.9.0", "8.9.1" -> {
+                interceptBaseChatPie(methodName = "N3")
+                interceptBaseChatPie(methodName = "S")
+            }
+            else -> {
+                isHookClientSupport = false
+                loggerD(msg = "$version not supported!")
+            }
        }
    }

@@ -151,6 +166,7 @@ class HookEntry : IYukiHookXposedInit {
            injectMember {
                method {
                    name = methodName
+                    emptyParam()
                    returnType = UnitType
                }
                intercept()
@@ -163,7 +179,7 @@ class HookEntry : IYukiHookXposedInit {
            injectMember {
                method {
                    name = "acquireLocked"
-                    returnType = UnitType
+                    emptyParam()
                }
                intercept()
            }
@@ -191,11 +207,12 @@ class HookEntry : IYukiHookXposedInit {

    /**
     * 提示模块运行信息 QQ、TIM、微信
-     * @param isQQTIM 是否为 QQ、TIM
+     * @param isQQ 是否为 QQ
+     * @param isTIM 是否为 TIM
     */
-    private fun PackageParam.hookModuleRunningInfo(isQQTIM: Boolean) =
+    private fun PackageParam.hookModuleRunningInfo(isQQ: Boolean = false, isTIM: Boolean = false) =
        when {
-            isQQTIM -> SplashActivityClass.hook {
+            isQQ || isTIM -> SplashActivityClass.hook {
                /**
                 * Hook 启动界面的第一个 [Activity]
                 * QQ 和 TIM 都是一样的类
@@ -212,7 +229,9 @@ class HookEntry : IYukiHookXposedInit {
                                showDialog {
                                    title = "TSBattery 已激活"
                                    msg = "[提示模块运行信息功能已打开]\n\n" +
-                                            "模块工作看起来一切正常，请自行测试是否能达到省电效果。\n\n" +
+                                            (if (isQQ && isHookClientSupport.not())
+                                                "❎ 当前版本 $versionName($versionCode) 不在兼容列表，请自行测试是否生效~\n\n"
+                                            else "✅ 模块工作看起来一切正常，请自行测试是否能达到省电效果。\n\n") +
                                            "已生效模块版本：${prefs.get(DataConst.ENABLE_MODULE_VERSION)}\n" +
                                            "当前模式：${if (prefs.get(DataConst.ENABLE_QQTIM_WHITE_MODE)) "保守模式" else "完全模式"}" +
                                            "\n\n包名：${packageName}\n版本：$versionName($versionCode)" +
@@ -351,7 +370,7 @@ class HookEntry : IYukiHookXposedInit {
                            method {
                                name = "setRightText"
                                param(CharSequenceType)
-                            }.call(prefs.get(DataConst.ENABLE_MODULE_VERSION))
+                            }.call("${if (isQQ && isHookClientSupport.not()) "❎" else "✅"} ${prefs.get(DataConst.ENABLE_MODULE_VERSION)}")
                            method {
                                name = "setBgType"
                                param(IntType)
@@ -361,7 +380,9 @@ class HookEntry : IYukiHookXposedInit {
                                instance<Activity>().apply {
                                    showDialog {
                                        title = "TSBattery 守护中"
-                                        msg = "已生效模块版本：${prefs.get(DataConst.ENABLE_MODULE_VERSION)}\n" +
+                                        msg = (if (isQQ && isHookClientSupport.not())
+                                            "❎ 当前版本 $versionName($versionCode) 不在兼容列表，请自行测试是否生效~\n\n" else "") +
+                                                "已生效模块版本：${prefs.get(DataConst.ENABLE_MODULE_VERSION)}\n" +
                                                "当前模式：${if (prefs.get(DataConst.ENABLE_QQTIM_WHITE_MODE)) "保守模式" else "完全模式"}" +
                                                "\n\n包名：${packageName}\n版本：$versionName($versionCode)" +
                                                "\n\n模块只对挂后台锁屏情况下有省电效果，" +
@@ -412,19 +433,11 @@ class HookEntry : IYukiHookXposedInit {
            hookSystemWakeLock()
            hookNotification()
            hookCoreService(isQQ = true)
-            hookModuleRunningInfo(isQQTIM = true)
+            hookModuleRunningInfo(isQQ = true)
            hookQQSettingsSettingActivity(isQQ = true)
            if (prefs.get(DataConst.ENABLE_QQTIM_WHITE_MODE)) return@loadApp
-            /** 通过在 [SplashActivityClass] 里取到应用的版本号 */
-            SplashActivityClass.hook {
-                injectMember {
-                    method {
-                        name = "doOnCreate"
-                        param(BundleClass)
-                    }
-                    afterHook { hookQQBaseChatPie(instance<Activity>().versionName) }
-                }
-            }
+            /** 通过在生命周期里取到应用的版本号 */
+            onAppLifecycle { onCreate { hookQQBaseChatPie(versionName) } }
            /**
             * 干掉消息收发功能的电源锁
             * 每个版本的差异暂未做排查
@@ -633,14 +646,14 @@ class HookEntry : IYukiHookXposedInit {
            hookSystemWakeLock()
            hookNotification()
            hookCoreService(isQQ = false)
-            hookModuleRunningInfo(isQQTIM = true)
+            hookModuleRunningInfo(isTIM = true)
            hookQQSettingsSettingActivity(isQQ = false)
        }
        loadApp(WECHAT_PACKAGE_NAME) {
            if (prefs.get(DataConst.DISABLE_WECHAT_HOOK)) return@loadApp
            hookSystemWakeLock()
-            hookModuleRunningInfo(isQQTIM = false)
+            hookModuleRunningInfo()
            loggerD(msg = "ウイチャット：それが機能するかどうかはわかりませんでした")
        }
    }
-}
+}
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
@@ -46,8 +46,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
    companion object {

        private const val moduleVersion = BuildConfig.VERSION_NAME
-        private const val qqSupportVersion =
-            "8.2.11(Play)、8.8.17、8.8.23、8.8.35、8.8.38、8.8.50、8.8.55、8.8.68、8.8.80、8.8.83、8.8.85、8.8.88、8.8.90、8.8.93 (8.2.11、8.5.5~8.8.93)"
+        private val qqSupportVersions = arrayOf(
+            "8.2.11(Play)", "8.8.17", "8.8.23",
+            "8.8.35", "8.8.38", "8.8.50", "8.8.55",
+            "8.8.68", "8.8.80", "8.8.83", "8.8.85",
+            "8.8.88", "8.8.90", "8.8.93", "8.8.95",
+            "8.8.98", "8.9.0", "8.9.1"
+        )
+        private val qqSupportVersion by lazy {
+            if (qqSupportVersions.isNotEmpty()) {
+                var value = ""
+                qqSupportVersions.forEach { value += "$it、" }
+                "${value.trim().let { it.substring(0, it.lastIndex) }}\n\n其余版本请自行测试是否有效。"
+            } else "empty"
+        }
        private const val timSupportVersion = "2+、3+ (并未完全测试每个版本)"
        private const val wechatSupportVersion = "全版本仅支持基础省电，更多功能依然画饼"

@@ -96,8 +108,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                msg = "若你的设备已 Root，推荐使用 LSPosed 激活模块，太极可能会出现模块设置无法保存的问题。"
                confirmButton(text = "我知道了")
            }
-        /** 检测应用转生 */
-        if (("com.bug.xposed").isInstall)
+        /** 检测应用转生 - 如果模块已激活就不再检测 */
+        if (("com.bug.xposed").isInstall && YukiHookAPI.Status.isModuleActive.not())
            showDialog {
                title = "环境异常"
                msg = "检测到“应用转生”已被安装，为了保证模块的安全和稳定，请卸载更换其他 Hook 框架后才能继续使用。"
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/base/BaseActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/base/BaseActivity.kt
@@ -27,7 +27,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
-import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import com.fankes.tsbattery.R
 import com.fankes.tsbattery.utils.factory.isNotSystemInDarkMode
@@ -54,7 +54,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        /** 隐藏系统的标题栏 */
        supportActionBar?.hide()
        /** 初始化沉浸状态栏 */
-        ViewCompat.getWindowInsetsController(window.decorView)?.apply {
+        WindowCompat.getInsetsController(window, window.decorView).apply {
            isAppearanceLightStatusBars = isNotSystemInDarkMode
            isAppearanceLightNavigationBars = isNotSystemInDarkMode
        }
--- a/app/src/main/java/com/fankes/tsbattery/utils/drawable/drawabletoolbox/FlipDrawable.kt
+++ b/app/src/main/java/com/fankes/tsbattery/utils/drawable/drawabletoolbox/FlipDrawable.kt
@@ -19,7 +19,7 @@
 *
 * This file is Created by fankes on 2022/1/8.
 */
-@file:Suppress("DEPRECATION", "CanvasSize")
+@file:Suppress("DEPRECATION", "CanvasSize", "OVERRIDE_DEPRECATION")

 package com.fankes.tsbattery.utils.drawable.drawabletoolbox

--- a/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt
+++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt
@@ -28,18 +28,13 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.view.Gravity
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 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.CauseProblemsApi
-import com.highcapable.yukihookapi.hook.factory.method
-import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass

 /**
 * 构造对话框
@@ -60,9 +55,7 @@ class DialogBuilder(val context: Context, private val isUseBlackTheme: Boolean)
    private var instanceAndroid: android.app.AlertDialog.Builder? = null // 实例对象

    private var dialogInstance: Dialog? = null // 对话框实例
-
-    @CauseProblemsApi
-    var customLayoutView: View? = null // 自定义布局
+    private var customLayoutView: View? = null // 自定义布局

    /**
     * 是否需要使用 AndroidX 风格对话框
@@ -125,18 +118,6 @@ class DialogBuilder(val context: Context, private val isUseBlackTheme: Boolean)
            else customLayoutView?.findViewWithTag<TextView>("progressContent")?.text = value
        }

-    /**
-     * 设置对话框自定义布局
-     * @return [ViewBinding]
-     */
-    inline fun <reified T : ViewBinding> bind() =
-        T::class.java.method {
-            name = "inflate"
-            param(LayoutInflaterClass)
-        }.get().invoke<T>(LayoutInflater.from(context))?.apply {
-            customLayoutView = root
-        } ?: error("binding failed")
-
    /**
     * 设置对话框确定按钮
     * @param text 按钮文本内容
--- a/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt
+++ b/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt
@@ -62,7 +62,7 @@ object GithubReleaseTool {
            override fun onFailure(call: Call, e: IOException) {}

            override fun onResponse(call: Call, response: Response) = runInSafe {
-                JSONObject(response.body?.string() ?: "").apply {
+                JSONObject(response.body.string()).apply {
                    GithubReleaseBean(
                        name = getString("name"),
                        htmlUrl = getString("html_url"),
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,13 +2,13 @@
    <!-- Base application theme. -->
    <style name="Theme.TSBattery" parent="Theme.Material3.DayNight">
        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/colorPrimaryAccent</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryAccent</item>
        <item name="colorOnPrimary">@color/black</item>
        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/colorPrimaryAccent</item>
+        <item name="colorSecondaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnSecondary">@color/colorPrimaryAccent</item>
        <!-- Status bar color. -->
        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#656565</color>
-    <color name="purple_500">#656565</color>
-    <color name="purple_700">#656565</color>
-    <color name="teal_200">#656565</color>
-    <color name="teal_700">#656565</color>
+    <color name="colorPrimaryAccent">#656565</color>
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>
 </resources>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,13 +2,13 @@
    <!-- Base application theme. -->
    <style name="Theme.TSBattery" parent="Theme.Material3.DayNight">
        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/teal_700</item>
+        <item name="colorPrimary">@color/colorPrimaryAccent</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnPrimary">@color/colorPrimaryAccent</item>
        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/colorPrimaryAccent</item>
+        <item name="colorSecondaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnSecondary">@color/colorPrimaryAccent</item>
        <!-- Status bar color. -->
        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }

 ext {
-    appVersionName = "3.96"
-    appVersionCode = 19
+    appVersionName = "3.99"
+    appVersionCode = 22
    enableR8 = true
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-XX:+UseParallelGC
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+# Incremental
+kotlin.incremental.useClasspathSnapshot=true
Author	SHA1	Message	Date
fankesyooni	81331dfe81	Update version to 3.99 \| Support QQ 8.9.0 and 8.9.1	2022-07-19 22:11:34 +08:00
fankesyooni	20f1ceca4d	Support QQ 8.9.0 and 8.9.1	2022-07-19 22:02:04 +08:00
fankesyooni	fc8589f1ee	Fix hook BaseChatPie failure bug	2022-07-19 21:57:06 +08:00
Fankesyooni	67378b2ebf	Merge pull request #19 from StarWishsama/patch-1 适配 QQ 8.9.0	2022-07-17 01:04:11 +08:00
NoRainCity	bf4ecd8345	Update QQ 8.9.0	2022-07-16 20:53:33 +08:00
fankesyooni	6e8d900dc5	Update version to 3.98 \| Support QQ 8.8.98	2022-07-05 22:49:18 +08:00
fankesyooni	3d12d3f4a5	Added QQ version support situation	2022-07-05 22:45:17 +08:00
fankesyooni	4b36437dac	Modify BugHook luckily	2022-07-05 22:04:04 +08:00
fankesyooni	93789f163b	Support QQ 8.8.98	2022-07-05 22:01:49 +08:00
fankesyooni	32d8937ddb	Update version to 3.97 \| Support QQ 8.8.95	2022-06-16 02:25:01 +08:00
fankesyooni	38c9d78f1e	Update Gradle & Kotlin & PlatformSDK - Update Kotlin version to 1.7.0 - Update Gradle dependencies - Merge legacy code	2022-06-10 17:13:58 +08:00
fankesyooni	0ee03340da	Merge hook function	2022-06-10 17:10:51 +08:00
fankesyooni	54ee2358cf	Make UI to Primary Theme	2022-06-08 15:07:23 +08:00
fankesyooni	55708eb96a	Merge DialogBuilderFactory with new code style	2022-06-07 16:55:29 +08:00