修改 6秒拼手速配置 替换为 自动关闭6秒拼手速配置

Author: TKaxv-7S

app/src/main/java/tkaxv7s/xposed/sesame/model/normal/answerAI/GenAI.java

@@ -25,7 +25,7 @@ public GenAI(String token) {
         if (token != null && !token.isEmpty()) {
             this.token = token;
         } else {
-            this.token = "AIzaSyA8e1SjuCbZBfx8nDRjmoMHZsWdd3y4-bQ";
+            this.token = "";
         }
         /*if (cUrl != null && !cUrl.isEmpty()) {
             url = cUrl.trim().replaceAll("/$", "");

app/src/main/java/tkaxv7s/xposed/sesame/model/task/antForest/AntForestRpcCall.java

@@ -39,9 +39,9 @@ public static String fillUserRobFlag(String userIdList) {
                 "[{\"userIdList\":" + userIdList + "}]", "{\"pathList\":[\"friendRanking\"]}");
     }
 
-    public static String queryHomePage(Boolean skipWhackMole) {
+    public static String queryHomePage() {
         return ApplicationHook.requestString("alipay.antforest.forest.h5.queryHomePage",
-                "[{\"configVersionMap\":{\"wateringBubbleConfig\":\"10\"},\"skipWhackMole\":" + (skipWhackMole ? "true" : "false") + ",\"source\":\"chInfo_ch_appcenter__chsub_9patch\",\"version\":\""
+                "[{\"configVersionMap\":{\"wateringBubbleConfig\":\"10\"},\"skipWhackMole\":true,\"source\":\"chInfo_ch_appcenter__chsub_9patch\",\"version\":\""
                         + VERSION + "\"}]", 3, 1000);
     }
 
@@ -331,6 +331,10 @@ public static String settlementWhackMole(String token, List<String> moleIdList)
                         + "],\"settlementScene\":\"NORMAL\",\"source\":\"chInfo_ch_appcenter__chsub_9patch\",\"token\":\"" + token + "\",\"version\":\"" + VERSION + "\"}]");
     }
 
+    public static String closeWhackMole() {
+        return ApplicationHook.requestString("alipay.antforest.forest.h5.updateUserConfig", "[{\"configMap\":{\"whackMole\":\"N\"},\"source\":\"chInfo_ch_appcenter__chsub_9patch\"}]");
+    }
+
     /* 森林集市 */
     public static String consultForSendEnergyByAction(String sourceType) {
         return ApplicationHook.requestString("alipay.bizfmcg.greenlife.consultForSendEnergyByAction",

app/src/main/java/tkaxv7s/xposed/sesame/model/task/antForest/AntForestV2.java

@@ -88,7 +88,7 @@ public class AntForestV2 extends ModelTask {
     private BooleanModelField collectWateringBubble;
     private BooleanModelField batchRobEnergy;
     private BooleanModelField balanceNetworkDelay;
-    private BooleanModelField whackMole;
+    private BooleanModelField closeWhackMole;
     private BooleanModelField collectProp;
     private StringModelField queryInterval;
     private StringModelField collectInterval;
@@ -181,7 +181,7 @@ public ModelFields getFields() {
         modelFields.addField(exchangeEnergyShield = new BooleanModelField("exchangeEnergyShield", "活力值 | 兑换能量保护罩", false));
         modelFields.addField(exchangeCollectHistoryAnimal7Days = new BooleanModelField("exchangeCollectHistoryAnimal7Days", "活力值 | 兑换物种历史卡", false));
         modelFields.addField(exchangeCollectToFriendTimes7Days = new BooleanModelField("exchangeCollectToFriendTimes7Days", "活力值 | 兑换物种好友卡", false));
-        modelFields.addField(whackMole = new BooleanModelField("whackMole", "6秒拼手速", true));
+        modelFields.addField(closeWhackMole = new BooleanModelField("closeWhackMole", "自动关闭6秒拼手速", true));
         modelFields.addField(collectProp = new BooleanModelField("collectProp", "收集道具", false));
         modelFields.addField(collectWateringBubble = new BooleanModelField("collectWateringBubble", "收金球", false));
         modelFields.addField(energyRain = new BooleanModelField("energyRain", "能量雨", false));
@@ -277,11 +277,9 @@ public void run() {
             }
 
             if (!TaskCommon.IS_ENERGY_TIME && selfHomeObject != null) {
-                if (whackMole.getValue()) {
-                    String whackMoleStatus = selfHomeObject.optString("whackMoleStatus");
-                    if ("CAN_PLAY".equals(whackMoleStatus) || "CAN_INITIATIVE_PLAY".equals(whackMoleStatus) || "NEED_MORE_FRIENDS".equals(whackMoleStatus)) {
-                        whackMole();
-                    }
+                String whackMoleStatus = selfHomeObject.optString("whackMoleStatus");
+                if ("CAN_PLAY".equals(whackMoleStatus) || "CAN_INITIATIVE_PLAY".equals(whackMoleStatus) || "NEED_MORE_FRIENDS".equals(whackMoleStatus)) {
+                    whackMole();
                 }
                 boolean hasMore = false;
                 do {
@@ -557,7 +555,7 @@ private JSONObject querySelfHome() {
         JSONObject userHomeObject = null;
         try {
             long start = System.currentTimeMillis();
-            userHomeObject = new JSONObject(AntForestRpcCall.queryHomePage(!whackMole.getValue()));
+            userHomeObject = new JSONObject(AntForestRpcCall.queryHomePage());
             long end = System.currentTimeMillis();
             long serverTime = userHomeObject.getLong("now");
             int offsetTime = offsetTimeMath.nextInteger((int) (start + (end - start) * 2 / 3 - serverTime));
@@ -587,6 +585,18 @@ private JSONObject collectSelfEnergy() {
         try {
             JSONObject selfHomeObject = querySelfHome();
             if (selfHomeObject != null) {
+                if (closeWhackMole.getValue()) {
+                    JSONObject propertiesObject = selfHomeObject.optJSONObject("properties");
+                    if (propertiesObject != null) {
+                        if (Objects.equals("Y", propertiesObject.optString("whackMole"))) {
+                            if (closeWhackMole()) {
+                                Log.record("6秒拼手速关闭成功");
+                            } else {
+                                Log.record("6秒拼手速关闭失败");
+                            }
+                        }
+                    }
+                }
                 String nextAction = selfHomeObject.optString("nextAction");
                 if ("WhackMole".equalsIgnoreCase(nextAction)) {
                     Log.record("检测到6秒拼手速强制弹窗，先执行拼手速");
@@ -1010,7 +1020,7 @@ private void collectEnergy(CollectEnergyEntity collectEnergyEntity, Boolean join
     }
 
     private void updateDoubleTime() throws JSONException {
-        String s = AntForestRpcCall.queryHomePage(!whackMole.getValue());
+        String s = AntForestRpcCall.queryHomePage();
         TimeUtil.sleep(100);
         JSONObject joHomePage = new JSONObject(s);
         updateDoubleTime(joHomePage);
@@ -1165,6 +1175,20 @@ private void whackMole() {
         }
     }
 
+    private Boolean closeWhackMole() {
+        try {
+            JSONObject jo = new JSONObject(AntForestRpcCall.closeWhackMole());
+            if (jo.optBoolean("success")) {
+                return true;
+            } else {
+                Log.i(TAG, jo.getString("resultDesc"));
+            }
+        } catch (Throwable t) {
+            Log.printStackTrace(t);
+        }
+        return false;
+    }
+
     /* 森林集市 */
     private void sendEnergyByAction(String sourceType) {
         try {