配置文件增强，更新内置配置版本为v29

Author: teble

app/src/main/assets/default_conf

@@ -15,7 +15,7 @@ import me.teble.xposed.autodaily.ui.errInfo
 import me.teble.xposed.autodaily.utils.LogUtil
 import me.teble.xposed.autodaily.utils.TimeUtil
 import java.net.SocketTimeoutException
-import java.util.*
+import java.util.Date
 
 class GroupTaskFilterChain(
     val taskGroup: TaskGroup
@@ -58,7 +58,7 @@ class GroupTaskFilterChain(
                 }
                 try {
                     XANotification.setContent("正在执行任务${task.id}")
-                    TaskUtil.execute(reqType, task, relayTaskMap, env.toMutableMap())
+                    TaskUtil.execute(reqType, task, relayTaskMap, env)
                 } catch (e: SocketTimeoutException) {
                     LogUtil.e(e, "执行任务${task.id}异常: ")
                 } catch (e: Throwable) {

app/src/main/java/me/teble/xposed/autodaily/task/filter/GroupTaskFilterChain.kt

@@ -142,8 +142,8 @@ fun TaskCondition.test(env: MutableMap<String, Any>): Boolean {
     if (v2 == null) v2 = "null"
     LogUtil.d("test: $v1 $operator $v2")
     return when (operator) {
-        "=" -> v1 == v2
-        "!=" -> v1 != v2
+        "=", "==" -> v1.toString() == v2.toString()
+        "!=" -> v1.toString() != v2.toString()
         ">" -> if (isNumber(v1 as String) and isNumber(v2 as String)) BigInteger(v1) > BigInteger(v2) else v1.toString() > v2.toString()
         "<" -> if (isNumber(v1 as String) and isNumber(v2 as String)) BigInteger(v1) < BigInteger(v2) else v1.toString() < v2.toString()
         ">=" -> if (isNumber(v1 as String) and isNumber(v2 as String)) BigInteger(v1) >= BigInteger(v2) else v1.toString() >= v2.toString()

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

@@ -49,7 +49,9 @@ object EnvFormatUtil {
                 val name = s.substring(start, end)
                 LogUtil.d("name -> $name")
                 this[index] = name
-                values.add(getFormatArgValue(name, qDomain, env))
+                val value = getFormatArgValue(name, qDomain, env)
+                LogUtil.d("value -> $value")
+                values.add(value)
             }
         }
         LogUtil.d("evalString -> $evalStr")
@@ -154,6 +156,7 @@ object EnvFormatUtil {
 
             argFunc.startsWith("taskEnable(") -> {
                 val taskName = argFunc.substring(11, argFunc.length - 1)
+                LogUtil.d("taskEnable($taskName) -> ${Task(taskName).enable}")
                 return Task(taskName).enable.toString()
             }
 
@@ -169,14 +172,18 @@ object EnvFormatUtil {
         if (ReUtil.contains(FUN_REG, argField)) {
             return getFormatArgFunction(argField, qDomain, env)
         }
-        val res = when (argField) {
+        val splitIdx = argField.indexOf(":")
+        val argName = if (splitIdx == -1) argField else argField.substring(0, splitIdx)
+        val defaultValue = if (splitIdx == -1) null else argField.substring(splitIdx + 1)
+        val res = when (argName) {
             "week_day_index" -> buildString { append((DateUtil.dayOfWeek(TimeUtil.getCNDate()) + 5) % 7) }
             "week_day" -> buildString { append((DateUtil.dayOfWeek(TimeUtil.getCNDate()) + 5) % 7 + 1) }
             "random" -> CalculationUtil.getRandom().toString()
             "microsecond" -> CalculationUtil.getMicrosecondTime().toString()
             "second" -> CalculationUtil.getSecondTime().toString()
             "uin" -> currentUin.toString()
             "qua" -> VersionUtil.qua
+            "qVer" -> VersionUtil.qqVersionName
             "csrf_token" -> CalculationUtil.getCSRFToken(ticketManager.getSkey() ?: "")
             "skey" -> ticketManager.getSkey() ?: ""
             "bkn" -> {
@@ -221,8 +228,15 @@ object EnvFormatUtil {
             "mini_login_code" -> miniLoginManager.syncGetLoginCode(env["mini_app_id"] as String)
                 ?: throw RuntimeException("获取mini_login_code失败")
 
-            else -> env[argField] ?: throw RuntimeException("不存在的变量 $argField")
+            else -> env[argName] ?: let {
+                LogUtil.w("没有找到对应的参数: $argName")
+                ""
+            }
+        }
+        return if (res is String && defaultValue != null) {
+            res.ifEmpty { defaultValue }
+        } else {
+            res
         }
-        return res
     }
 }

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

@@ -48,23 +48,6 @@ object TaskUtil {
             }
         } ?: emptyList()
         generateEnv(task, env)
-        if (task.conditions?.all { it.test(env) } == false) {
-            LogUtil.i("任务条件不满足，跳过：${task.id}")
-            if (task.cron != null && task.cron != "basic") {
-                val now = TimeUtil.getCNDate()
-                task.lastExecTime = now.format()
-                val realCron = format(task.cron, null, env)
-                val nextTime = CronPatternUtil.nextDateAfter(
-                    TimeZone.getTimeZone("GMT+8"),
-                    CronPattern(realCron),
-                    Date(TimeUtil.cnTimeMillis() + 1),
-                    true
-                )!!
-                task.nextShouldExecTime = Date(nextTime.time + TimeUtil.offsetTime).format()
-                task.lastExecMsg = "不满足任务执行条件，跳过执行"
-            }
-            return true
-        }
         val repeatNum = format(task.repeat, null, env).toInt()
         LogUtil.d("重复请求次数 -> $repeatNum")
         val currDateStr = TimeUtil.getCNDate().formatDate()
@@ -85,6 +68,23 @@ object TaskUtil {
                     return false
                 }
             }
+            if (task.conditions?.all { it.test(env) } == false) {
+                LogUtil.i("任务条件不满足，跳过：${task.id}")
+                if (task.cron != null && task.cron != "basic") {
+                    val now = TimeUtil.getCNDate()
+                    task.lastExecTime = now.format()
+                    val realCron = format(task.cron, null, env)
+                    val nextTime = CronPatternUtil.nextDateAfter(
+                        TimeZone.getTimeZone("GMT+8"),
+                        CronPattern(realCron),
+                        Date(TimeUtil.cnTimeMillis() + 1),
+                        true
+                    )!!
+                    task.nextShouldExecTime = Date(nextTime.time + TimeUtil.offsetTime).format()
+                    task.lastExecMsg = "不满足任务执行条件，跳过执行"
+                }
+                return true
+            }
             val taskReqUtil = ReqFactory.getReq(reqType)
             val requests = taskReqUtil.create(task, env)
             val startRepeatNum = status.reqCount / requests.size