调整配置顺序

TKaxv-7S · Jun 20, 2024 · 5ea45f5 · 5ea45f5
1 parent bc30fff
commit 5ea45f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdk 31
         versionCode 80
-        versionName "1.2.5-test20-TK"
+        versionName "1.2.5-TK"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/task/model/antForest/AntForestV2.java b/app/src/main/java/tkaxv7s/xposed/sesame/task/model/antForest/AntForestV2.java
@@ -170,18 +170,18 @@ public ModelFields setFields() {
         List<String> doubleCardTimeList = new ArrayList<>();
         doubleCardTimeList.add("0700-0730");
         modelFields.addField(doubleCardTime = new ListModelField.ListJoinCommaToStringModelField("doubleCardTime", "使用双击卡时间(范围)", doubleCardTimeList));
-        modelFields.addField(collectProp = new BooleanModelField("collectProp", "收集道具", true));
-        modelFields.addField(collectWateringBubble = new BooleanModelField("collectWateringBubble", "收金球", true));
-        modelFields.addField(energyRain = new BooleanModelField("energyRain", "能量雨", true));
-        modelFields.addField(animalConsumeProp = new BooleanModelField("animalConsumeProp", "派遣动物", false));
-        modelFields.addField(userPatrol = new BooleanModelField("userPatrol", "巡护森林", false));
         modelFields.addField(giveEnergyRainList = new SelectModelField("giveEnergyRainList", "赠送能量雨列表", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
         modelFields.addField(waterFriendList = new SelectModelField("waterFriendList", "好友浇水列表", new KVNode<>(new LinkedHashMap<>(), true), AlipayUser.getList()));
         modelFields.addField(waterFriendCount = new IntegerModelField("waterFriendCount", "每次浇水克数(10 18 33 66)", 66));
         modelFields.addField(helpFriendCollect = new BooleanModelField("helpFriendCollect", "复活好友能量", true));
         modelFields.addField(dontHelpCollectList = new SelectModelField("dontHelpCollectList", "不复活好友能量名单", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
-        modelFields.addField(receiveForestTaskAward = new BooleanModelField("receiveForestTaskAward", "收取森林任务奖励", true));
         modelFields.addField(dontCollectList = new SelectModelField("dontCollectList", "不收取能量名单", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
+        modelFields.addField(collectProp = new BooleanModelField("collectProp", "收集道具", true));
+        modelFields.addField(collectWateringBubble = new BooleanModelField("collectWateringBubble", "收金球", true));
+        modelFields.addField(energyRain = new BooleanModelField("energyRain", "能量雨", true));
+        modelFields.addField(animalConsumeProp = new BooleanModelField("animalConsumeProp", "派遣动物", false));
+        modelFields.addField(userPatrol = new BooleanModelField("userPatrol", "巡护森林", false));
+        modelFields.addField(receiveForestTaskAward = new BooleanModelField("receiveForestTaskAward", "收取森林任务奖励", true));
         modelFields.addField(antdodoCollect = new BooleanModelField("antdodoCollect", "神奇物种开卡", false));
         modelFields.addField(totalCertCount = new BooleanModelField("totalCertCount", "记录证书总数", false));
         modelFields.addField(collectGiftBox = new BooleanModelField("collectGiftBox", "领取礼盒", false));

diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/task/model/antStall/AntStall.java b/app/src/main/java/tkaxv7s/xposed/sesame/task/model/antStall/AntStall.java
@@ -81,7 +81,7 @@ public ModelFields setFields() {
         modelFields.addField(stallAutoTask = new BooleanModelField("stallAutoTask", "新村自动任务", false));
         modelFields.addField(stallReceiveAward = new BooleanModelField("stallReceiveAward", "新村自动领奖", false));
         modelFields.addField(stallOpenType = new BooleanModelField("stallOpenType", "摊位类型(打开:摆摊列表/关闭:不摆列表)", false));
-        modelFields.addField(stallOpenList = new SelectModelField("stallOpenList", "摊位类型(打开:摆摊列表/关闭:不摆列表)", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
+        modelFields.addField(stallOpenList = new SelectModelField("stallOpenList", "摊位列表", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
         modelFields.addField(stallWhiteList = new SelectModelField("stallWhiteList", "不请走列表", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
         modelFields.addField(stallBlackList = new SelectModelField("stallBlackList", "禁摆摊列表", new KVNode<>(new LinkedHashMap<>(), false), AlipayUser.getList()));
         modelFields.addField(stallAllowOpenTime = new IntegerModelField("stallAllowOpenTime", "允许他人摆摊时长", 121));