Update version to 3.9 | Support QQ 8.8.90

CONTRIBUTING.md

@@ -35,7 +35,7 @@ fun a(test: String) {
 val a = "" // 变量注释
 ```
 
-- ⚠️注意：只允许两个 // 后方要有空格
+- ⚠️ 注意：只允许两个 // 后方要有空格
 
 ## 项目要求
 

README.md

@@ -2,40 +2,46 @@
 
 [![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.7-green)](https://github.com/fankes/TSBattery/releases)
+[![Blank](https://img.shields.io/badge/version-v3.9-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)
+[![Telegram](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)
 <br/><br/>
 ![banner](https://github.com/fankes/TSBattery/blob/master/banner.png)<br/>
-A new way to save your battery avoid cancer apps hacker it.<br/>
+A new way to save your battery avoid cancer apps hacker it.
+
 TSBattery 是一个旨在使 QQ、TIM、微信 变得更省电的开源 Xposed 模块。
 
-# Developer
+## Developer
 
 [酷安 @星夜不荟](http://www.coolapk.com/u/876977)
 
-# 适配说明
+## 适配说明
 
 - 支持并建议使用 <b>LSPosed</b>(若作用域没有自动出现推荐请勾选 QQ、TIM、微信)
+
 - 可以使用 <b>~~EdXposed~~</b>，但随时停止支持
+
 - <b>太极无极 · 阴</b> 支持性不是很好，建议使用 <b>太极无极 · 阳</b>
+
 - 支持 <b>Pine</b>(梦境模块) 但是部分功能有限制
+
 - 请不要使用 <b>~~应用转生~~</b>，发生封号情况后果自负
 
-# 请勿用于非法用途
+## 请勿用于非法用途
 
 - 本模块完全开源免费，如果好用你可以打赏支持开发，但是请不要用于非法用途。
+
 - 本模块发布地址仅有 [Xposed-Modules-Repo](https://github.com/Xposed-Modules-Repo/com.fankes.tsbattery/releases)、
   [Release](https://github.com/fankes/TSBattery/releases) 及 [蓝奏云](https://fankes.lanzouy.com/b02zfz3sj)，从其他非正规渠道下载到的版本或对您造成任何影响均与我们无关。
 
-# 开始贡献
+## 开始贡献
 
 欢迎为此项目进行新版本的适配代码贡献！<br/>
 
 - [CONTRIBUTING](https://github.com/fankes/TSBattery/blob/master/CONTRIBUTING.md)
 
-# 许可证
+## 许可证
 
 - [AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.html)
 
@@ -56,5 +62,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ```
 
-Powered by [YukiHookAPI](https://github.com/fankes/YukiHookAPI)<br/><br/>
+Powered by [YukiHookAPI](https://github.com/fankes/YukiHookAPI)
+
 版权所有 © 2019-2022 Fankes Studio(qzmmcn@163.com)

app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.devtools.ksp' version '1.6.10-1.0.4'
+    id 'com.google.devtools.ksp' version '1.6.21-1.0.5'
 }
 
 android {
@@ -25,20 +25,12 @@ android {
         versionCode rootProject.ext.appVersionCode
         versionName rootProject.ext.appVersionName
 
-        kotlinOptions {
-            freeCompilerArgs = [
-                    '-Xno-param-assertions',
-                    '-Xno-call-assertions',
-                    '-Xno-receiver-assertions'
-            ]
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled rootProject.ext.enableR8
             signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -49,38 +41,31 @@ android {
     }
     kotlinOptions {
         jvmTarget = '11'
+        freeCompilerArgs = [
+                '-Xno-param-assertions',
+                '-Xno-call-assertions',
+                '-Xno-receiver-assertions'
+        ]
     }
     buildFeatures {
         viewBinding true
     }
-}
+    lintOptions {
-
+        checkReleaseBuilds false
-/** 移除无效耗时 lint Task */
+    }
-tasks.whenTaskAdded {
-    task -> if (task.name == "lintVitalRelease") task.enabled = false
-}
-
-/** 移除无效耗时 lint Task */
-tasks.whenTaskAdded {
-    task -> if (task.name == "lintVitalAnalyzeRelease") task.enabled = false
-}
-
-/** 移除无效耗时 lint Task */
-tasks.whenTaskAdded {
-    task -> if (task.name == "lintVitalReportRelease") task.enabled = false
 }
 
 dependencies {
     compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.70'
+    implementation 'com.highcapable.yukihookapi:api:1.0.91'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.70'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.91'
     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'
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

app/proguard-rules.pro

@@ -20,7 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--dontwarn
 -ignorewarnings
 -optimizationpasses 10
 -dontusemixedcaseclassnames
@@ -35,13 +34,6 @@
 -renamesourcefileattribute P
 -keepattributes SourceFile,LineNumberTable
 
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
-
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
     public static *** throwUninitializedProperty(...);
     public static *** throwUninitializedPropertyAccessException(...);

app/src/main/java/com/fankes/tsbattery/application/TSApplication.kt

@@ -19,31 +19,15 @@
  *
  * This file is Created by fankes on 2021/11/9.
  */
-@file:Suppress("unused")
-
 package com.fankes.tsbattery.application
 
-import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
+import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication
 
-class TSApplication : Application() {
+class TSApplication : ModuleApplication() {
-
-    companion object {
-
-        /** 全局静态实例 */
-        private var context: TSApplication? = null
-
-        /**
-         * 调用全局静态实例
-         * @return [TSApplication]
-         */
-        val appContext get() = context ?: error("App is death")
-    }
 
     override fun onCreate() {
         super.onCreate()
-        /** 设置静态实例 */
-        context = this
         /** 跟随系统夜间模式 */
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
     }

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

@@ -52,10 +52,10 @@ import com.highcapable.yukihookapi.hook.log.loggerE
 import com.highcapable.yukihookapi.hook.param.PackageParam
 import com.highcapable.yukihookapi.hook.type.android.*
 import com.highcapable.yukihookapi.hook.type.java.*
-import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy
+import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit
 
 @InjectYukiHookWithXposed
-class HookEntry : YukiHookXposedInitProxy {
+class HookEntry : IYukiHookXposedInit {
 
     companion object {
 
@@ -130,7 +130,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 interceptBaseChatPie(methodName = "bk")
                 interceptBaseChatPie(methodName = "bl")
             }
-            "8.8.83", "8.8.85" -> {
+            "8.8.83", "8.8.85", "8.8.88", "8.8.90" -> {
                 interceptBaseChatPie(methodName = "bl")
                 interceptBaseChatPie(methodName = "bm")
             }
@@ -175,11 +175,11 @@ class HookEntry : YukiHookXposedInitProxy {
                 }
                 beforeHook {
                     if (prefs.get(DataConst.ENABLE_NOTIFY_TIP))
-                        when (firstArgs<CharSequence>()) {
+                        when (args().first().cast<CharSequence>()) {
                             "QQ正在后台运行" ->
-                                args().set("QQ正在后台运行 - TSBattery 守护中")
+                                args().first().set("QQ正在后台运行 - TSBattery 守护中")
                             "TIM正在后台运行" ->
-                                args().set("TIM正在后台运行 - TSBattery 守护中")
+                                args().first().set("TIM正在后台运行 - TSBattery 守护中")
                         }
                 }
             }
@@ -400,6 +400,7 @@ class HookEntry : YukiHookXposedInitProxy {
         debugTag = "TSBattery"
         isDebug = false
         isEnableModulePrefsCache = false
+        isEnableDataChannel = false
     }
 
     override fun onHook() = encase {

app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt

@@ -37,10 +37,9 @@ import com.fankes.tsbattery.hook.HookConst.WECHAT_PACKAGE_NAME
 import com.fankes.tsbattery.ui.activity.base.BaseActivity
 import com.fankes.tsbattery.utils.factory.*
 import com.fankes.tsbattery.utils.tool.GithubReleaseTool
-import com.highcapable.yukihookapi.hook.factory.isModuleActive
+import com.fankes.tsbattery.utils.tool.YukiPromoteTool
-import com.highcapable.yukihookapi.hook.factory.isTaiChiModuleActive
+import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.hook.factory.modulePrefs
-import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
 
@@ -48,7 +47,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
         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.2.11、8.5.5~8.8.85)"
+            "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.2.11、8.5.5~8.8.90)"
         private const val timSupportVersion = "2+、3+ (并未完全测试每个版本)"
         private const val wechatSupportVersion = "全版本仅支持基础省电，更多功能依然画饼"
 
@@ -66,7 +65,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             }
         }
         /** 判断 Hook 状态 */
-        if (isModuleActive) {
+        if (YukiHookAPI.Status.isModuleActive) {
             binding.mainLinStatus.setBackgroundResource(R.drawable.bg_green_round)
             binding.mainImgStatus.setImageResource(R.mipmap.ic_success)
             binding.mainTextStatus.text = "模块已激活"
@@ -74,6 +73,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             refreshActivateExecutor()
             /** 写入激活的模块版本 */
             modulePrefs.put(DataConst.ENABLE_MODULE_VERSION, moduleVersion)
+            /** 推广、恰饭 */
+            YukiPromoteTool.promote(context = this)
         } else
             showDialog {
                 title = "模块没有激活"
@@ -89,7 +90,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 noCancelable()
             }
         /** 推荐使用 LSPosed */
-        if (isTaiChiModuleActive)
+        if (YukiHookAPI.Status.isTaiChiModuleActive)
             showDialog {
                 title = "兼容性提示"
                 msg = "若你的设备已 Root，推荐使用 LSPosed 激活模块，太极可能会出现模块设置无法保存的问题。"
@@ -201,10 +202,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     /** 刷新模块激活使用的方式 */
     private fun refreshActivateExecutor() {
         when {
-            YukiHookModuleStatus.executorVersion > 0 ->
+            YukiHookAPI.Status.executorVersion > 0 ->
                 binding.mainTextApiWay.text =
-                    "Activated by ${YukiHookModuleStatus.executorName} API ${YukiHookModuleStatus.executorVersion}"
+                    "Activated by ${YukiHookAPI.Status.executorName} API ${YukiHookAPI.Status.executorVersion}"
-            isTaiChiModuleActive -> binding.mainTextApiWay.text = "Activated by TaiChi"
+            YukiHookAPI.Status.isTaiChiModuleActive -> binding.mainTextApiWay.text = "Activated by TaiChi"
             else -> binding.mainTextApiWay.text = "Activated by anonymous"
         }
     }

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

@@ -35,8 +35,8 @@ import android.net.Uri
 import android.provider.Settings
 import android.widget.Toast
 import androidx.core.content.getSystemService
-import com.fankes.tsbattery.application.TSApplication.Companion.appContext
 import com.google.android.material.snackbar.Snackbar
+import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication.Companion.appContext
 
 /**
  * 系统深色模式是否开启

app/src/main/java/com/fankes/tsbattery/utils/tool/YukiPromoteTool.kt

@@ -0,0 +1,37 @@
+package com.fankes.tsbattery.utils.tool
+
+import android.content.Context
+import com.fankes.tsbattery.utils.factory.openBrowser
+import com.fankes.tsbattery.utils.factory.showDialog
+import com.highcapable.yukihookapi.YukiHookAPI
+import com.highcapable.yukihookapi.hook.factory.modulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
+
+/**
+ * [YukiHookAPI] 的自动推广工具类
+ */
+object YukiPromoteTool {
+
+    /** 推广已读存储键值 */
+    private val YUKI_PROMOTE_READED = PrefsData("yuki_promote_readed", false)
+
+    /**
+     * 显示推广对话框
+     * @param context 实例
+     */
+    fun promote(context: Context) {
+        fun saveReaded() = context.modulePrefs.put(YUKI_PROMOTE_READED, value = true)
+        if (context.modulePrefs.get(YUKI_PROMOTE_READED).not())
+            context.showDialog {
+                title = "面向开发者的推广"
+                msg = "你想快速拥有一个自己的 Xposed 模块吗，你只需要拥有基础的 Android 开发经验以及使用 Kotlin 编程语言即可。\n\n" +
+                        "快来体验 YukiHookAPI，这是一个使用 Kotlin 重新构建的高效 Xposed Hook API，助你的开发变得更轻松。"
+                confirmButton(text = "去看看") {
+                    context.openBrowser(url = "https://github.com/fankes/YukiHookAPI")
+                    saveReaded()
+                }
+                cancelButton(text = "我不是开发者") { saveReaded() }
+                noCancelable()
+            }
+    }
+}

build.gradle

@@ -1,12 +1,13 @@
 plugins {
-    id 'com.android.application' version '7.1.2' apply false
+    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.1.2' apply false
+    id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 
 ext {
-    appVersionName = "3.7"
+    appVersionName = "3.9"
-    appVersionCode = 15
+    appVersionCode = 17
+    enableR8 = true
 }
 
 task clean(type: Delete) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 14 23:27:58 CST 2022
+#Wed May 25 04:34:58 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME