取消混淆，解决点赞Servlet初始化错误的问题

Author: teble

app/build.gradle

@@ -21,7 +21,7 @@ android {
         //noinspection OldTargetApi
         targetSdkVersion 31
         versionCode mVersionCode
-        versionName "3.0.6"
+        versionName "3.0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -61,8 +61,8 @@ android {
 
     buildTypes {
         release {
-            shrinkResources true
-            minifyEnabled true
+            shrinkResources false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             if (performSigning) {
                 signingConfig signingConfigs.release
@@ -80,7 +80,7 @@ android {
         alpha {
             initWith release
             shrinkResources false
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             if (performSigning) {
                 signingConfig signingConfigs.release

app/proguard-rules.pro

@@ -104,6 +104,10 @@
 -keep class me.teble.xposed.autodaily.shizuku.UserService {
     *;
 }
+# servlet混淆
+-keep class me.teble.xposed.autodaily.hook.servlets.** {
+    *;
+}
 
 
 ##########################################################################################################

app/src/main/java/me/teble/xposed/autodaily/hook/MainHook.kt

@@ -31,7 +31,11 @@ import me.teble.xposed.autodaily.hook.proxy.ProxyManager
 import me.teble.xposed.autodaily.hook.proxy.activity.injectRes
 import me.teble.xposed.autodaily.hook.servlets.ServletPool
 import me.teble.xposed.autodaily.hook.utils.ToastUtil
+import me.teble.xposed.autodaily.task.model.Task
 import me.teble.xposed.autodaily.task.util.ConfigUtil
+import me.teble.xposed.autodaily.ui.ConfUnit
+import me.teble.xposed.autodaily.ui.errCount
+import me.teble.xposed.autodaily.ui.reset
 import me.teble.xposed.autodaily.utils.LogUtil
 import me.teble.xposed.autodaily.utils.TaskExecutor
 import me.teble.xposed.autodaily.utils.TaskExecutor.CORE_SERVICE_FLAG
@@ -180,13 +184,29 @@ class MainHook : IXposedHookLoadPackage, IXposedHookZygoteInit {
         }
     }
 
+    private fun onStart() {
+        if (ConfUnit.lastModuleVersion < 22082510) {
+            if (Task("好友点赞").errCount > 2) {
+                LogUtil.i("版本更新，自动重置好友点赞任务")
+                Task("好友点赞").reset()
+            }
+            if (Task("资料卡回赞").errCount > 2) {
+                LogUtil.i("版本更新，自动重置资料卡回赞任务")
+                Task("资料卡回赞").reset()
+            }
+        }
+        ConfUnit.lastModuleVersion = BuildConfig.VERSION_CODE
+    }
+
     private fun doInit() {
         val mNewRuntime = findMethod(NewRuntime) { returnType == Boolean::class.java && emptyParam }
         mNewRuntime.hookAfter {
             runCatching {
                 if (hookIsInit) {
                     return@hookAfter
                 }
+                // 启动前数据迁移/初始化
+                onStart()
                 hookIsInit = true
                 // 等待hook执行完毕
                 while (!moduleLoadInit) {

app/src/main/java/me/teble/xposed/autodaily/task/model/TaskModels.kt

@@ -63,6 +63,8 @@ data class Task(
     // 请求回调
     val callback: TaskCallback
 ) {
+    constructor(id: String): this(id, "", null, null, null, "1", 0, "", "", null, null, null,
+        TaskCallback(null, null, null, null, null, null))
     val isRelayTask = cron == null
     val isBasic = cron == "basic"
     val isCronTask = !isRelayTask && !isBasic

app/src/main/java/me/teble/xposed/autodaily/task/util/Const.kt

@@ -4,6 +4,7 @@ object Const {
     const val CONFIG_VERSION = "config_version"
     const val NEED_SHOW_LOG = "need_show_log"
     const val VERSION_INFO_CACHE = "version_info_cache"
+    const val LastModuleVersion = "last_module_version"
     const val LAST_FETCH_TIME = "last_fetch_time"
     const val BLOCK_UPDATE_ONE_DAY = "block_update_one_day"
     const val BLOCK_UPDATE_VERSION = "block_update_version"

app/src/main/java/me/teble/xposed/autodaily/ui/ConfUnit.kt

@@ -1,6 +1,7 @@
 package me.teble.xposed.autodaily.ui
 
 import kotlinx.serialization.Serializable
+import me.teble.xposed.autodaily.BuildConfig
 import me.teble.xposed.autodaily.hook.config.Config.accountConfig
 import me.teble.xposed.autodaily.hook.config.Config.xaConfig
 import me.teble.xposed.autodaily.task.model.Task
@@ -17,6 +18,7 @@ import me.teble.xposed.autodaily.task.util.Const.LAST_EXEC_MSG
 import me.teble.xposed.autodaily.task.util.Const.LAST_EXEC_TIME
 import me.teble.xposed.autodaily.task.util.Const.LAST_FETCH_TIME
 import me.teble.xposed.autodaily.task.util.Const.LOG_TO_XPOSED
+import me.teble.xposed.autodaily.task.util.Const.LastModuleVersion
 import me.teble.xposed.autodaily.task.util.Const.NEED_SHOW_LOG
 import me.teble.xposed.autodaily.task.util.Const.NEXT_SHOULD_EXEC_TIME
 import me.teble.xposed.autodaily.task.util.Const.SHOW_TASK_TOAST
@@ -51,6 +53,9 @@ object ConfUnit {
         set(value) {
             xaConfig.putString(VERSION_INFO_CACHE, value.toJsonString())
         }
+    var lastModuleVersion: Int
+        get() = xaConfig.getInt(LastModuleVersion, 0)
+        set(value) = xaConfig.putInt(LastModuleVersion, value)
     var lastFetchTime: Long
         get() = xaConfig.getLong(LAST_FETCH_TIME, 0)
         set(value) = xaConfig.putLong(LAST_FETCH_TIME, value)