Merge branch 'refs/heads/main' into release

Author: TKaxv-7S

app/src/main/java/tkaxv7s/xposed/sesame/data/task/ModelTask.java

@@ -187,7 +187,7 @@ public static void startAllTask(Boolean force) {
                 if (ModelType.TASK == model.getType()) {
                     if (((ModelTask) model).startTask(force)) {
                         try {
-                            Thread.sleep(1000);
+                            Thread.sleep(750);
                         } catch (InterruptedException e) {
                             Log.printStackTrace(e);
                         }

app/src/main/java/tkaxv7s/xposed/sesame/model/task/antFarm/AntFarm.java

@@ -10,6 +10,7 @@
 import tkaxv7s.xposed.sesame.entity.AlipayUser;
 import tkaxv7s.xposed.sesame.model.base.TaskCommon;
 import tkaxv7s.xposed.sesame.model.normal.answerAI.AnswerAI;
+import tkaxv7s.xposed.sesame.rpc.intervallimit.RpcIntervalLimit;
 import tkaxv7s.xposed.sesame.util.*;
 
 import java.util.*;
@@ -146,6 +147,12 @@ public ModelFields getFields() {
         return modelFields;
     }
 
+    @Override
+    public void boot(ClassLoader classLoader) {
+        super.boot(classLoader);
+        RpcIntervalLimit.addIntervalLimit("com.alipay.antfarm.enterFarm", 2000);
+    }
+
     @Override
     public Boolean check() {
         return !TaskCommon.IS_ENERGY_TIME;
@@ -1831,7 +1838,7 @@ private void chouchoule() {
                             if (chouchouleReceiveFarmTaskAward(taskId)) {
                                 doubleCheck = true;
                             }
-                        } else if ("TODO".equals(taskStatus)) {
+                        } else if ("TODO".equals(taskStatus) && !Objects.equals(jo.optString("innerAction"), "DONATION")) {
                             if (chouchouleDoFarmTask(taskId, title, rightsTimesLimit - rightsTimes)) {
                                 doubleCheck = true;
                             }

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

@@ -557,7 +557,7 @@ private JSONObject querySelfHome() {
             userHomeObject = new JSONObject(AntForestRpcCall.queryHomePage(!whackMole.getValue()));
             long end = System.currentTimeMillis();
             long serverTime = userHomeObject.getLong("now");
-            int offsetTime = offsetTimeMath.nextInteger((int) ((start + end) / 2 - serverTime));
+            int offsetTime = offsetTimeMath.nextInteger((int) (start + (end - start) * 2 / 3 - serverTime));
             Log.i("服务器时间：" + serverTime + "，本地与服务器时间差：" + offsetTime);
         } catch (Throwable t) {
             Log.printStackTrace(t);
@@ -572,7 +572,7 @@ private JSONObject queryFriendHome(String userId) {
             userHomeObject = new JSONObject(AntForestRpcCall.queryFriendHomePage(userId));
             long end = System.currentTimeMillis();
             long serverTime = userHomeObject.getLong("now");
-            int offsetTime = offsetTimeMath.nextInteger((int) ((start + end) / 2 - serverTime));
+            int offsetTime = offsetTimeMath.nextInteger((int) (start + (end - start) * 2 / 3 - serverTime));
             Log.i("服务器时间：" + serverTime + "，本地与服务器时间差：" + offsetTime);
         } catch (Throwable t) {
             Log.printStackTrace(t);
@@ -582,9 +582,14 @@ private JSONObject queryFriendHome(String userId) {
 
     private JSONObject collectSelfEnergy() {
         try {
-            JSONObject userHomeObject = querySelfHome();
-            if (userHomeObject != null) {
-                return collectUserEnergy(UserIdMap.getCurrentUid(), userHomeObject);
+            JSONObject selfHomeObject = querySelfHome();
+            if (selfHomeObject != null) {
+                String nextAction = selfHomeObject.optString("nextAction");
+                if ("WhackMole".equalsIgnoreCase(nextAction)) {
+                    Log.record("检测到6秒拼手速强制弹窗，先执行拼手速");
+                    whackMole();
+                }
+                return collectUserEnergy(UserIdMap.getCurrentUid(), selfHomeObject);
             }
         } catch (Throwable t) {
             Log.printStackTrace(t);
@@ -2397,7 +2402,7 @@ public Runnable setRunnable() {
                         return;
                     }
                 }
-                Log.record("执行蹲点收取[" + userName + "]" + "时差[" + averageInteger + "]ms");
+                Log.record("执行蹲点收取[" + userName + "]" + "时差[" + averageInteger + "]ms" + "提前[" + advanceTimeInt + "]ms");
                 collectEnergy(new CollectEnergyEntity(userId, null, AntForestRpcCall.getCollectEnergyRpcEntity(null, userId, bubbleId)), true);
             };
         }