Merge pull request #46 from GuoXiCheng/dev

Dev

app/build.gradle

@@ -50,6 +50,8 @@ android {
 }
 
 dependencies {
+    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'

app/src/main/AndroidManifest.xml

@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.skip">
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+<!--    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />-->
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"

app/src/main/java/com/android/skip/MainActivity.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.Image
@@ -29,24 +30,35 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.android.skip.dataclass.PackageInfo
 import com.android.skip.manager.RectManager
 import com.android.skip.manager.SkipConfigManager
+import com.android.skip.service.SkipConfigService
 import com.android.skip.ui.theme.OneClickTheme
 import com.android.skip.ui.theme.green
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import java.util.*
+import kotlin.concurrent.thread
 
 var accessibilityState by mutableStateOf(false)
 
 var alertDialogPositiveButtonClickState by mutableStateOf(false)
 
 // 无障碍服务启用停用按钮
 var isAccessibilityBtnClicked by mutableStateOf(false)
+
 // 后台任务管理
 var isBackendTaskBtnClicked by mutableStateOf(false)
+
 // 自启动管理
 var isAutoStartBtnClicked by mutableStateOf(false)
+
 // 省电策略按钮
 var isPowerSavingBtnClicked by mutableStateOf(false)
 
@@ -69,19 +81,34 @@ class MainActivity : ComponentActivity() {
             val manufacturer = Build.MANUFACTURER.lowercase(Locale.ENGLISH)
             when {
                 manufacturer.contains("xiaomi") -> {
-                    intent.component = ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")
+                    intent.component = ComponentName(
+                        "com.miui.securitycenter",
+                        "com.miui.permcenter.autostart.AutoStartManagementActivity"
+                    )
                 }
                 manufacturer.contains("oppo") -> {
-                    intent.component = ComponentName("com.coloros.safecenter", "com.coloros.safecenter.permission.startup.StartupAppListActivity")
+                    intent.component = ComponentName(
+                        "com.coloros.safecenter",
+                        "com.coloros.safecenter.permission.startup.StartupAppListActivity"
+                    )
                 }
                 manufacturer.contains("vivo") -> {
-                    intent.component = ComponentName("com.vivo.permissionmanager", "com.vivo.permissionmanager.activity.BgStartUpManagerActivity")
+                    intent.component = ComponentName(
+                        "com.vivo.permissionmanager",
+                        "com.vivo.permissionmanager.activity.BgStartUpManagerActivity"
+                    )
                 }
                 manufacturer.contains("oneplus") -> {
-                    intent.component = ComponentName("com.oneplus.security", "com.oneplus.security.chainlaunch.view.ChainLaunchAppListAct‌​ivity")
+                    intent.component = ComponentName(
+                        "com.oneplus.security",
+                        "com.oneplus.security.chainlaunch.view.ChainLaunchAppListAct‌​ivity"
+                    )
                 }
                 manufacturer.contains("huawei") -> {
-                    intent.component = ComponentName("com.huawei.systemmanager", "com.huawei.systemmanager.startupmgr.ui.StartupNormalAppListActivity")
+                    intent.component = ComponentName(
+                        "com.huawei.systemmanager",
+                        "com.huawei.systemmanager.startupmgr.ui.StartupNormalAppListActivity"
+                    )
                 }
                 else -> {
                     openAppInfo()
@@ -169,13 +196,35 @@ class MainActivity : ComponentActivity() {
         }
 
         RectManager.setMaxRect(this)
-        val skipConfig = resources.openRawResource(R.raw.skip_config_v1).bufferedReader().use{it.readText()}
+        val skipConfig =
+            resources.openRawResource(R.raw.skip_config_v1).bufferedReader().use { it.readText() }
         SkipConfigManager.setConfig(skipConfig)
     }
 
     override fun onResume() {
         super.onResume()
         accessibilityState = MyUtils.isAccessibilitySettingsOn(this)
+
+        thread {
+            val retrofit = Retrofit.Builder()
+                .baseUrl("https://raw.githubusercontent.com/GuoXiCheng/SKIP/main/app/src/main/res/raw/")
+                .addConverterFactory(GsonConverterFactory.create()).build()
+            val skipConfigService = retrofit.create(SkipConfigService::class.java)
+            skipConfigService.getPackageInfo().enqueue(object : Callback<List<PackageInfo>> {
+                override fun onResponse(
+                    call: Call<List<PackageInfo>>,
+                    response: Response<List<PackageInfo>>
+                ) {
+                    response.body()?.let { SkipConfigManager.setConfig(it) }
+                    Toast.makeText(applicationContext, "更新配置成功", Toast.LENGTH_SHORT).show()
+                }
+
+                override fun onFailure(call: Call<List<PackageInfo>>, t: Throwable) {
+                    Toast.makeText(applicationContext, "更新配置失败", Toast.LENGTH_SHORT).show()
+                }
+
+            })
+        }
     }
 }
 
@@ -194,7 +243,7 @@ fun MainSurface() {
             modifier = Modifier.fillMaxSize(),
             contentAlignment = Alignment.Center
         ) {
-            Box (modifier = Modifier.offset(y=(-50).dp)) {
+            Box(modifier = Modifier.offset(y = (-50).dp)) {
                 AccessibilityControlBtn()
             }
         }
@@ -203,7 +252,7 @@ fun MainSurface() {
             modifier = Modifier.fillMaxSize(),
             contentAlignment = Alignment.Center
         ) {
-            Box (modifier = Modifier.offset(y=(90).dp)) {
+            Box(modifier = Modifier.offset(y = (90).dp)) {
                 AccessibilityTextBox()
             }
         }
@@ -243,8 +292,8 @@ fun PageHeader(title: String, subtitle: String) {
 
 @Composable
 fun AccessibilityTextBox() {
-    Row  {
-        if(accessibilityState) {
+    Row {
+        if (accessibilityState) {
             Text(text = "无障碍服务功能: 启用中", color = Color.White)
         } else {
             Text(text = "无障碍服务功能: 未启用", color = Color.White)
@@ -436,7 +485,7 @@ fun AlertDialog(
 @Composable
 fun ImageDialog() {
     AlertDialog(
-        onDismissRequest = {isBackendTaskBtnClicked= false },
+        onDismissRequest = { isBackendTaskBtnClicked = false },
         containerColor = Color.White,
         text = {
             Box(modifier = Modifier.fillMaxWidth()) {
@@ -448,10 +497,10 @@ fun ImageDialog() {
             }
         },
         confirmButton = {
-            Row (
+            Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.Center
-                    ) {
+            ) {
                 TextButton(
                     onClick = { isBackendTaskBtnClicked = false },
                     colors = ButtonDefaults.textButtonColors(contentColor = green)

app/src/main/java/com/android/skip/dataclass/PackageInfo.kt

@@ -1,7 +1,9 @@
 package com.android.skip.dataclass
 
+import android.graphics.Rect
+
 data class PackageInfo(
     val package_name: String, val skip_text: String?,
     val skip_id: String?, val start_page_node: Int?,
-    val skip_point: String?
+    val skip_points: List<String>?, var skip_rect_list: MutableList<Rect>
 )

app/src/main/java/com/android/skip/handler/PointHandler.kt

@@ -6,11 +6,11 @@ import com.android.skip.manager.SkipConfigManager
 
 class PointHandler: AbstractHandler() {
     override fun handle(node: AccessibilityNodeInfo): List<Rect> {
-        val skipPoint = SkipConfigManager.getSkipPoint(node.packageName.toString())
-        return if (skipPoint != null) {
-            listOf(skipPoint)
-        } else {
+        val skipRectList = SkipConfigManager.getSkipRectList(node.packageName.toString())
+        return if (skipRectList.isEmpty()) {
             super.handle(node)
+        } else {
+            skipRectList
         }
     }
 }

app/src/main/java/com/android/skip/manager/RectManager.kt

@@ -17,7 +17,7 @@ object RectManager {
         val rect = Rect()
         val actualX = (percentX * maxRectX).toInt()
         val actualY = (percentY * maxRectY).toInt()
-        rect.set(actualX - 10, actualY - 10, actualX + 10, actualY + 10)
+        rect.set(actualX - 1, actualY - 1, actualX + 1, actualY + 1)
         return rect
     }
 }

app/src/main/java/com/android/skip/manager/SkipConfigManager.kt

@@ -1,4 +1,5 @@
 package com.android.skip.manager
+
 import android.graphics.Rect
 import com.android.skip.dataclass.PackageInfo
 import com.google.gson.Gson
@@ -8,8 +9,36 @@ object SkipConfigManager {
     private lateinit var appInfoMap: Map<String, PackageInfo>
     fun setConfig(config: String) {
         val gson = Gson()
-        val appInfoList: List<PackageInfo> = gson.fromJson(config, object : TypeToken<List<PackageInfo>>() {}.type)
+        val appInfoList: List<PackageInfo> =
+            gson.fromJson(config, object : TypeToken<List<PackageInfo>>() {}.type)
         appInfoMap = appInfoList.associateBy { it.package_name }
+        handleConfig(appInfoList)
+    }
+
+    fun setConfig(appInfoList: List<PackageInfo>) {
+        handleConfig(appInfoList)
+    }
+
+    private fun handleConfig(appInfoList: List<PackageInfo>) {
+        val newAppInfoList = appInfoList.map { it->
+            if (it.skip_points is List && it.skip_points.isNotEmpty()) {
+                it.skip_rect_list = mutableListOf()
+                for (point in it.skip_points) {
+                    val pointParts = point.split(",").map { it.toFloatOrNull() }
+                    if (pointParts.size == 2 && isBetweenZeroAndOne(pointParts[0]) && isBetweenZeroAndOne(
+                            pointParts[1]
+                        )
+                    ) {
+                        val (x, y) = pointParts
+                        if (x is Float && y is Float) {
+                            it.skip_rect_list.add(RectManager.getPointRect(x, y))
+                        }
+                    }
+                }
+            }
+            it
+        }
+        appInfoMap = newAppInfoList.associateBy { it.package_name }
     }
 
     fun getSkipText(packageName: String): String {
@@ -24,16 +53,8 @@ object SkipConfigManager {
         return appInfoMap[packageName]?.start_page_node ?: 10
     }
 
-    fun getSkipPoint(packageName: String): Rect? {
-        val skipPoint = appInfoMap[packageName]?.skip_point
-        val pointParts = skipPoint?.split(",")?.map { it.toFloatOrNull() }
-        if (pointParts?.size == 2 && isBetweenZeroAndOne(pointParts[0]) && isBetweenZeroAndOne(pointParts[1])) {
-            val (x, y) = pointParts
-            if (x is Float && y is Float) {
-                return RectManager.getPointRect(x, y)
-            }
-        }
-        return null
+    fun getSkipRectList(packageName: String): MutableList<Rect> {
+        return appInfoMap[packageName]?.skip_rect_list ?: mutableListOf()
     }
 
     private fun isBetweenZeroAndOne(value: Float?): Boolean {

app/src/main/java/com/android/skip/service/MyAccessibilityService.kt

@@ -49,6 +49,7 @@ class MyAccessibilityService : AccessibilityService() {
         countCallBack.cleanCount()
         val currentNode = getCurrentRootNode()
         recursionNodes(currentNode, countCallBack)
+//        Log.i("SKIPS", currentNode.packageName.toString() + " 节点数: " + countCallBack.getCount())
         return countCallBack.getCount() < SkipConfigManager.getStartPageNodeCount(currentNode.packageName.toString())
     }
 

app/src/main/java/com/android/skip/service/SkipConfigService.kt

@@ -0,0 +1,11 @@
+package com.android.skip.service
+
+import com.android.skip.dataclass.PackageInfo
+import retrofit2.Call
+import retrofit2.http.GET
+
+interface SkipConfigService {
+
+    @GET("skip_config_v1.json")
+    fun getPackageInfo(): Call<List<PackageInfo>>
+}

app/src/main/res/raw/skip_config_v1.json

@@ -19,16 +19,30 @@
     "package_name": "com.github.android",
     "start_page_node": 0
   },
+  {
+    "package_name": "com.eg.android.AlipayGphone",
+    "start_page_node": 0
+  },
   {
     "package_name": "com.qq.qcloud",
-    "skip_id": "com.qq.qcloud:id/gdt_ad_text"
+    "skip_id": "com.qq.qcloud:id/gdt_ad_text",
+    "skip_points": ["0.91,0.086"]
   },
   {
     "package_name": "com.coolapk.market",
-    "skip_point": "0.9,0.07"
+    "skip_points": ["0.9,0.07"]
   },
   {
     "package_name": "com.example.pptv",
     "start_page_node": 25
+  },
+  {
+    "package_name": "com.miui.systemAdSolution",
+    "start_page_node": 20,
+    "skip_points": ["0.92,0.047"]
+  },
+  {
+    "package_name": "tv.danmaku.bili",
+    "start_page_node": 70
   }
 ]