Merge pull request #15 from LuckyPray/fix-3.0.0-bug

Fix 3.0.0 bug

Author: teble

app/build.gradle

@@ -21,7 +21,7 @@ android {
         //noinspection OldTargetApi
         targetSdkVersion 31
         versionCode mVersionCode
-        versionName "3.0.0"
+        versionName "3.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -97,7 +97,7 @@ android {
                 signingConfig signingConfigs.release
             }
             matchingFallbacks = ['release']
-            versionNameSuffix "-rc10"
+            versionNameSuffix "-rc"
         }
     }
 

app/src/main/java/me/teble/xposed/autodaily/hook/function/impl/FriendsManager.kt

@@ -5,7 +5,6 @@ import me.teble.xposed.autodaily.hook.function.BaseFunction
 import me.teble.xposed.autodaily.hook.function.FunctionInitException
 import me.teble.xposed.autodaily.hook.utils.QApplicationUtil
 import me.teble.xposed.autodaily.task.model.Friend
-import me.teble.xposed.autodaily.utils.LogUtil
 import me.teble.xposed.autodaily.utils.field
 import me.teble.xposed.autodaily.utils.fieldValue
 import me.teble.xposed.autodaily.utils.getMethods
@@ -87,12 +86,10 @@ open class FriendsManager : BaseFunction(
     // 高版本qq判断方式
     // Map<分组名, List<好友>>
     private fun getFriendsMap(manager: Any): ConcurrentHashMap<*, *> {
-        LogUtil.log(manager.toString())
         manager.getMethods().forEach {
             if (Modifier.isPrivate(it.modifiers)
                 && it.returnType == ConcurrentHashMap::class.java
             ) {
-                LogUtil.d("${it.parameterTypes}")
                 it.isAccessible = true
                 return it.invoke(manager, true) as ConcurrentHashMap<*, *>
             }

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

@@ -80,15 +80,15 @@ fun AppUpdateLayout(dialog: CustomDialog) {
             TextButton(onClick = {
                 context.startActivity(Intent().apply {
                     action = Intent.ACTION_VIEW
-                    data = Uri.parse(Constants.GITHUB_RELEASE_URL)
+                    data = Uri.parse(Constants.PAN_URL)
                 })
             }) {
                 Text(text = "蓝奏云")
             }
             TextButton(onClick = {
                 context.startActivity(Intent().apply {
                     action = Intent.ACTION_VIEW
-                    data = Uri.parse(Constants.PAN_URL)
+                    data = Uri.parse(Constants.GITHUB_RELEASE_URL)
                 })
             }) {
                 Text(text = "Github")

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

@@ -34,6 +34,7 @@ import me.teble.xposed.autodaily.task.model.Task
 import me.teble.xposed.autodaily.task.model.TaskEnv
 import me.teble.xposed.autodaily.task.model.TroopInfo
 import me.teble.xposed.autodaily.task.util.ConfigUtil
+import me.teble.xposed.autodaily.utils.LogUtil
 import kotlin.concurrent.thread
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -44,8 +45,8 @@ fun EditEnvLayout(
     taskId: String?
 ) {
     var envList by remember { mutableStateOf(emptyList<TaskEnv>()) }
-    lateinit var task: Task
-    LaunchedEffect(envList) {
+    var task by remember { mutableStateOf<Task?>(null) }
+    LaunchedEffect(task) {
         val conf = ConfigUtil.loadSaveConf()
         conf.taskGroups.forEach { taskGroup ->
             if (taskGroup.id == groupId) {
@@ -70,7 +71,7 @@ fun EditEnvLayout(
     LaunchedEffect(envMap) {
         envList.forEach { env ->
             envMap[env.name] = mutableStateOf(
-                task.getVariable(env.name, env.default)
+                task!!.getVariable(env.name, env.default)
             )
             if (env.type == "friend") {
                 friendFlag.value = true
@@ -246,14 +247,19 @@ fun EditEnvLayout(
                 .clip(CircleShape)
                 .background(Color(0xFF409EFF))
                 .combinedClickable {
-                    envMap.entries.forEach {
-                        if (it.value.value.isNotEmpty()) {
-                            task.setVariable(it.key, it.value.value)
-                        } else {
-                            task.setVariable(it.key, null)
+                    try {
+                        envMap.entries.forEach {
+                            if (it.value.value.isNotEmpty()) {
+                                task?.setVariable(it.key, it.value.value)
+                            } else {
+                                task?.setVariable(it.key, null)
+                            }
                         }
+                        ToastUtil.send("保存成功")
+                    } catch (e: Throwable) {
+                        ToastUtil.send("保存失败，详情查看日志")
+                        LogUtil.e(e, "保存变量失败：")
                     }
-                    ToastUtil.send("保存成功")
                 }
             ) {
                 Image(