Merge pull request #258 from GuoXiCheng/dev-c

update
GuoXiCheng · Sep 26, 2024 · 2cc3a5b · 2cc3a5b
2 parents ea53ac1 + 48824f2
commit 2cc3a5b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 30 deletions.
diff --git a/app/src/main/assets/skip_config_v3.yaml b/app/src/main/assets/skip_config_v3.yaml
@@ -161,6 +161,7 @@
     - id: cn.com.cmbc.newmbank:id/view_count_down
 
 - appName: 虎扑
+  packageName: com.hupu.games
   skipIds:
     - id: com.byted.pangle:id/tt_splash_skip_btn
     - id: com.hupu.games:id/tv_time

diff --git a/app/src/main/java/com/android/skip/data/config/ConfigReadRepository.kt b/app/src/main/java/com/android/skip/data/config/ConfigReadRepository.kt
@@ -13,6 +13,7 @@ import com.android.skip.dataclass.LoadSkipBound
 import com.android.skip.dataclass.LoadSkipId
 import com.android.skip.dataclass.LoadSkipText
 import com.android.skip.util.DataStoreUtils
+import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.StringUtils.getString
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@@ -80,43 +81,52 @@ class ConfigReadRepository @Inject constructor(
     }
 
     fun handleConfig(configPostSchema: ConfigPostSchema): Map<String, ConfigLoadSchema>? {
-        return configPostSchema.configReadSchemaList?.associate { config ->
-            val newSkipTexts = config.skipTexts?.map { skipText ->
-                val clickRect = skipText.click?.let { c ->
-                    convertClick(c)
+        return try {
+            configPostSchema.configReadSchemaList?.associate { config ->
+                val newSkipTexts = config.skipTexts?.map { skipText ->
+                    val clickRect = skipText.click?.let { c ->
+                        convertClick(c)
+                    }
+                    LoadSkipText(
+                        text = skipText.text,
+                        activityName = skipText.activityName,
+                        length = skipText.length,
+                        click = clickRect
+                    )
                 }
-                LoadSkipText(
-                    text = skipText.text,
-                    activityName = skipText.activityName,
-                    length = skipText.length,
-                    click = clickRect
-                )
-            }
 
-            val newSkipIds = config.skipIds?.map { skipId ->
-                val clickRect = skipId.click?.let { c ->
-                    convertClick(c)
+                val newSkipIds = config.skipIds?.map { skipId ->
+                    val clickRect = skipId.click?.let { c ->
+                        convertClick(c)
+                    }
+                    LoadSkipId(
+                        id = skipId.id,
+                        activityName = skipId.activityName,
+                        click = clickRect
+                    )
                 }
-                LoadSkipId(id = skipId.id, activityName = skipId.activityName, click = clickRect)
-            }
 
-            val newSkipBounds = config.skipBounds?.map { skipBound ->
-                val clickRect = skipBound.click?.let { c ->
-                    convertClick(c)
+                val newSkipBounds = config.skipBounds?.map { skipBound ->
+                    val clickRect = skipBound.click?.let { c ->
+                        convertClick(c)
+                    }
+                    LoadSkipBound(
+                        bound = convertBound(skipBound.bound),
+                        activityName = skipBound.activityName,
+                        click = clickRect
+                    )
                 }
-                LoadSkipBound(
-                    bound = convertBound(skipBound.bound),
-                    activityName = skipBound.activityName,
-                    click = clickRect
+
+                config.packageName to ConfigLoadSchema(
+                    config.packageName,
+                    skipTexts = newSkipTexts,
+                    skipIds = newSkipIds,
+                    skipBounds = newSkipBounds
                 )
             }
-
-            config.packageName to ConfigLoadSchema(
-                config.packageName,
-                skipTexts = newSkipTexts,
-                skipIds = newSkipIds,
-                skipBounds = newSkipBounds
-            )
+        } catch (e: Exception) {
+            LogUtils.e(e)
+            null
         }
     }
 

diff --git a/app/src/main/java/com/android/skip/data/config/ConfigViewModel.kt b/app/src/main/java/com/android/skip/data/config/ConfigViewModel.kt
@@ -3,8 +3,10 @@ package com.android.skip.data.config
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.android.skip.R
 import com.android.skip.dataclass.ConfigPostSchema
 import com.android.skip.dataclass.ConfigState
+import com.blankj.utilcode.util.StringUtils.getString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -28,6 +30,8 @@ class ConfigViewModel @Inject constructor(
             val configMap = configReadRepository.handleConfig(configPostSchema)
             if (configMap != null) {
                 configLoadRepository.loadConfig(configMap)
+            } else {
+                changeConfigPostState(ConfigPostSchema(ConfigState.FAIL, getString(R.string.invalid_config)))
             }
         }
     }

diff --git a/app/src/main/java/com/android/skip/ui/about/AboutActivity.kt b/app/src/main/java/com/android/skip/ui/about/AboutActivity.kt
@@ -107,6 +107,10 @@ class AboutActivity : AppCompatActivity() {
                 startActivity(intent)
             }
         }
+
+        configViewModel.configPostState.observe(this) {
+            configViewModel.loadConfig(it)
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,10 @@ class AboutActivity : AppCompatActivity() { @@
                     startActivity(intent)
                 }
             }
+            configViewModel.configPostState.observe(this) {
+                configViewModel.loadConfig(it)
+            }
         }
     }
@@ Expand Down @@