feat: compat higher version wechat

Author: lisonge

app/src/main/AndroidManifest.xml

@@ -117,7 +117,7 @@
         </provider>
 
         <service
-            android:name=".service.A11yService"
+            android:name="com.google.android.accessibility.selecttospeak.SelectToSpeakService"
             android:exported="false"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">

app/src/main/kotlin/com/google/android/accessibility/selecttospeak/SelectToSpeakService.kt

@@ -0,0 +1,7 @@
+package com.google.android.accessibility.selecttospeak
+
+import li.songe.gkd.service.A11yService
+
+// https://github.com/ven-coder/Assists
+// https://github.com/ven-coder/Assists/issues/12#issuecomment-2684469065
+class SelectToSpeakService : A11yService()

app/src/main/kotlin/li/songe/gkd/App.kt

@@ -25,7 +25,6 @@ import li.songe.gkd.permission.shizukuOkState
 import li.songe.gkd.service.A11yService
 import li.songe.gkd.shizuku.initShizuku
 import li.songe.gkd.util.SafeR
-import li.songe.gkd.util.componentName
 import li.songe.gkd.util.initAppState
 import li.songe.gkd.util.initFolder
 import li.songe.gkd.util.initStore
@@ -144,9 +143,8 @@ private fun getA11yServiceEnabled(): Boolean {
     if (value.isNullOrEmpty()) return false
     val colonSplitter = TextUtils.SimpleStringSplitter(':')
     colonSplitter.setString(value)
-    val name = A11yService::class.componentName
     while (colonSplitter.hasNext()) {
-        if (ComponentName.unflattenFromString(colonSplitter.next()) == name) {
+        if (ComponentName.unflattenFromString(colonSplitter.next()) == A11yService.a11yComponentName) {
             return true
         }
     }

app/src/main/kotlin/li/songe/gkd/MainActivity.kt

@@ -170,6 +170,7 @@ fun Activity.navToMainActivity() {
 
 @Suppress("DEPRECATION")
 private fun updateServiceRunning() {
+    A11yService.isRunning.value = A11yService.instance != null
     val list = try {
         val manager = app.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
         manager.getRunningServices(Int.MAX_VALUE) ?: emptyList()
@@ -181,7 +182,6 @@ private fun updateServiceRunning() {
         return list.any { it.service.className == cls.jvmName }
     }
     ManageService.isRunning.value = checkRunning(ManageService::class)
-    A11yService.isRunning.value = checkRunning(A11yService::class)
     FloatingService.isRunning.value = checkRunning(FloatingService::class)
     ScreenshotService.isRunning.value = checkRunning(ScreenshotService::class)
     HttpService.isRunning.value = checkRunning(HttpService::class)

app/src/main/kotlin/li/songe/gkd/service/A11yService.kt

@@ -18,6 +18,7 @@ import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ScreenUtils
+import com.google.android.accessibility.selecttospeak.SelectToSpeakService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -51,6 +52,7 @@ import li.songe.gkd.util.OnCreate
 import li.songe.gkd.util.OnDestroy
 import li.songe.gkd.util.UpdateTimeOption
 import li.songe.gkd.util.checkSubsUpdate
+import li.songe.gkd.util.componentName
 import li.songe.gkd.util.launchTry
 import li.songe.gkd.util.map
 import li.songe.gkd.util.showActionToast
@@ -64,7 +66,7 @@ import java.util.concurrent.Executors
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class A11yService : AccessibilityService(), OnCreate, OnA11yConnected, OnA11yEvent, OnDestroy {
+open class A11yService : AccessibilityService(), OnCreate, OnA11yConnected, OnA11yEvent, OnDestroy {
     override fun onCreate() {
         super.onCreate()
         onCreated()
@@ -103,6 +105,10 @@ class A11yService : AccessibilityService(), OnCreate, OnA11yConnected, OnA11yEve
     }
 
     companion object {
+
+        val a11yComponentName by lazy { SelectToSpeakService::class.componentName }
+        val a11yClsName by lazy { a11yComponentName.flattenToShortString() }
+
         internal var weakInstance = WeakReference<A11yService>(null)
         val instance: A11yService?
             get() = weakInstance.get()

app/src/main/kotlin/li/songe/gkd/service/GkdTileService.kt

@@ -20,7 +20,6 @@ import li.songe.gkd.permission.writeSecureSettingsState
 import li.songe.gkd.util.OnChangeListen
 import li.songe.gkd.util.OnDestroy
 import li.songe.gkd.util.OnTileClick
-import li.songe.gkd.util.componentName
 import li.songe.gkd.util.launchTry
 import li.songe.gkd.util.storeFlow
 import li.songe.gkd.util.toast
@@ -122,12 +121,12 @@ fun switchA11yService() = appScope.launchTry(Dispatchers.IO) {
             }
             val names = getServiceNames()
             enableA11yService()
-            if (names.contains(a11yClsName)) { // 当前无障碍异常, 重启服务
-                names.remove(a11yClsName)
+            if (names.contains(A11yService.a11yClsName)) { // 当前无障碍异常, 重启服务
+                names.remove(A11yService.a11yClsName)
                 updateServiceNames(names)
                 delay(500)
             }
-            names.add(a11yClsName)
+            names.add(A11yService.a11yClsName)
             updateServiceNames(names)
             delay(500)
             // https://github.com/orgs/gkd-kit/discussions/799
@@ -150,15 +149,15 @@ fun fixRestartService() = appScope.launchTry(Dispatchers.IO) {
         // 3. 有写入系统设置权限
         if (!A11yService.isRunning.value && storeFlow.value.enableService && writeSecureSettingsState.updateAndGet()) {
             val names = getServiceNames()
-            val a11yBroken = names.contains(a11yClsName)
+            val a11yBroken = names.contains(A11yService.a11yClsName)
             if (a11yBroken) {
                 // 无障碍出现故障, 重启服务
-                names.remove(a11yClsName)
+                names.remove(A11yService.a11yClsName)
                 updateServiceNames(names)
                 // 必须等待一段时间, 否则概率不会触发系统重启无障碍服务
                 delay(500)
             }
-            names.add(a11yClsName)
+            names.add(A11yService.a11yClsName)
             updateServiceNames(names)
             delay(500)
             if (!A11yService.isRunning.value) {
@@ -171,4 +170,3 @@ fun fixRestartService() = appScope.launchTry(Dispatchers.IO) {
     }
 }
 
-val a11yClsName by lazy { A11yService::class.componentName.flattenToShortString() }