优化绿色行动选项

MidNightBlackCat · Nov 30, 2024 · 6623da8 · 6623da8
1 parent ff6ad8c
commit 6623da8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CustomOption.java b/app/src/main/java/io/github/lazyimmortal/sesame/entity/CustomOption.java
@@ -10,6 +10,13 @@ public CustomOption(String i, String n) {
         name = n;
     }
 
+    public static List<CustomOption> getEcoLifeOptions() {
+        List<CustomOption> list = new ArrayList<>();
+        list.add(new CustomOption("tick", "绿色行动打卡"));
+        list.add(new CustomOption("dish", "光盘行动打卡"));
+        return list;
+    }
+
     public static List<CustomOption> getUseAccelerateToolOptions() {
         List<CustomOption> list = new ArrayList<>();
         list.add(new CustomOption("useAccelerateToolContinue", "连续使用"));

diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestV2.java b/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestV2.java
@@ -125,9 +125,8 @@ public class AntForestV2 extends ModelTask {
     private BooleanModelField combineAnimalPiece;
     private BooleanModelField consumeAnimalProp;
     private SelectModelField whoYouWantToGiveTo;
-    private BooleanModelField ecoLifeTick;
-    private BooleanModelField ecoLifeOpen;
-    private BooleanModelField photoGuangPan;
+    private BooleanModelField ecoLife;
+    private SelectModelField ecoLifeOptions;
     private BooleanModelField dress;
     private TextModelField dressDetailList;
 
@@ -191,9 +190,8 @@ public ModelFields getFields() {
         modelFields.addField(collectGiftBox = new BooleanModelField("collectGiftBox", "领取礼盒", false));
         modelFields.addField(medicalHealth = new BooleanModelField("medicalHealth", "医疗健康", false));
         modelFields.addField(greenLife = new BooleanModelField("greenLife", "森林集市", false));
-        modelFields.addField(ecoLifeTick = new BooleanModelField("ecoLifeTick", "绿色行动 | 行动打卡", false));
-        modelFields.addField(ecoLifeOpen = new BooleanModelField("ecoLifeOpen", "绿色行动 | 自动开通", false));
-        modelFields.addField(photoGuangPan = new BooleanModelField("photoGuangPan", "绿色行动 | 光盘打卡", false));
+        modelFields.addField(ecoLife = new BooleanModelField("ecoLife", "绿色行动 | 开启", false));
+        modelFields.addField(ecoLifeOptions = new SelectModelField("ecoLifeOptions", "绿色行动 | 选项", new LinkedHashSet<>(), CustomOption::getEcoLifeOptions));
         modelFields.addField(dress = new BooleanModelField("dress", "装扮保护 | 开启", false));
         modelFields.addField(dressDetailList = new TextModelField("dressDetailList", "装扮保护 | 装扮信息", ""));
         return modelFields;
@@ -427,7 +425,7 @@ public void run() {
                 if (receiveForestTaskAward.getValue()) {
                     queryTaskList();
                 }
-                if (ecoLifeTick.getValue() || photoGuangPan.getValue()) {
+                if (ecoLife.getValue()) {
                     ecoLife();
                 }
                 waterFriendEnergy();
@@ -1783,10 +1781,7 @@ private void ecoLife() {
             }
             JSONObject data = jo.getJSONObject("data");
             if (!data.getBoolean("openStatus")) {
-                if (!ecoLifeOpen.getValue()) {
-                    Log.forest("绿色任务☘未开通");
-                    return;
-                }
+                Log.forest("绿色任务☘未开通");
                 jo = new JSONObject(EcoLifeRpcCall.openEcolife());
                 if (!MessageUtil.checkResultCode(TAG, jo)) {
                     return;
@@ -1803,10 +1798,10 @@ private void ecoLife() {
             }
             String dayPoint = data.getString("dayPoint");
             JSONArray actionListVO = data.getJSONArray("actionListVO");
-            if (ecoLifeTick.getValue()) {
+            if (ecoLifeOptions.getValue().contains("tick")) {
                 ecoLifeTick(actionListVO, dayPoint);
             }
-            if (photoGuangPan.getValue()) {
+            if (ecoLifeOptions.getValue().contains("dish")) {
                 photoGuangPan(dayPoint);
             }
         } catch (Throwable th) {