From e05c8fce3032bcf880a3c12a4aab3099ceb19bae Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Thu, 31 Mar 2022 12:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20QQ=208.8.85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 30 +++++++++----------
 .../com/fankes/tsbattery/hook/HookEntry.kt    |  7 ++---
 .../tsbattery/ui/activity/MainActivity.kt     |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7b827e0..3564ec4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,21 @@ android {
     }
 }
 
+/** 移除无效耗时 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.69'
@@ -69,19 +84,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
-
-/** 移除无效耗时 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
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt b/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt
index 83f8f2f..f2997a0 100644
--- a/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/tsbattery/hook/HookEntry.kt
@@ -25,7 +25,6 @@ package com.fankes.tsbattery.hook
 
 import android.app.Activity
 import android.app.Service
-import android.content.Intent
 import android.os.Build
 import com.fankes.tsbattery.data.DataConst
 import com.fankes.tsbattery.hook.HookConst.QQ_PACKAGE_NAME
@@ -116,7 +115,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 interceptBaseChatPie(methodName = "bk")
                 interceptBaseChatPie(methodName = "bl")
             }
-            "8.8.83" -> {
+            "8.8.83", "8.8.85" -> {
                 interceptBaseChatPie(methodName = "bl")
                 interceptBaseChatPie(methodName = "bm")
             }
@@ -277,7 +276,7 @@ class HookEntry : YukiHookXposedInitProxy {
                     if (prefs.get(DataConst.ENABLE_QQTIM_CORESERVICE_BAN))
                         instance<Service>().apply {
                             stopForeground(true)
-                            stopService(Intent(applicationContext, javaClass))
+                            stopSelf()
                             loggerD(msg = "Shutdown CoreService OK!")
                         }
                 }
@@ -290,7 +289,7 @@ class HookEntry : YukiHookXposedInitProxy {
                     if (prefs.get(DataConst.ENABLE_QQTIM_CORESERVICE_CHILD_BAN))
                         instance<Service>().apply {
                             stopForeground(true)
-                            stopService(Intent(applicationContext, javaClass))
+                            stopSelf()
                             loggerD(msg = "Shutdown CoreService\$KernelService OK!")
                         }
                 }
diff --git a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
index 6327ada..ea82ab2 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
@@ -48,7 +48,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.2.11、8.5.5~8.8.83)"
+            "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)"
         private const val timSupportVersion = "2+、3+ (并未完全测试每个版本)"
         private const val wechatSupportVersion = "全版本仅支持基础省电，更多功能依然画饼"