Merge branch 'refs/heads/main' into release

TKaxv-7S · Jul 17, 2024 · f267af3 · f267af3
2 parents 7fff421 + 8eecc8c
commit f267af3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -29,8 +29,6 @@
 5. 添加 定时唤醒与定时执行逻辑，在基础设置中可配置多个定时执行或定时唤醒时间
 6. 修复 一些逻辑问题
 
-***目前没有大小号切换的计划***
-
 ## 使用说明
 
 1. 本APP是为了学习研究用，不得进行任何形式的转发，发布，传播。

diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/model/task/antForest/AntForestV2.java b/app/src/main/java/tkaxv7s/xposed/sesame/model/task/antForest/AntForestV2.java
@@ -2001,7 +2001,7 @@ private void queryAnimalPropList() {
                     jo = animalProps.getJSONObject(i);
                     if (animalProp == null
                             || jo.getJSONObject("main").getInt("holdsNum")
-                                    > animalProp.getJSONObject("main").getInt("holdsNum")) {
+                            > animalProp.getJSONObject("main").getInt("holdsNum")) {
                         animalProp = jo;
                     }
                 }
@@ -2047,7 +2047,7 @@ private void queryAnimalAndPiece(boolean canConsumeProp) {
                     if (animalConsumeProp.getValue() && canConsumeProp) {
                         if (animalProp == null
                                 || jo.getJSONObject("main").getInt("holdsNum")
-                                        > animalProp.getJSONObject("main").getInt("holdsNum")) {
+                                > animalProp.getJSONObject("main").getInt("holdsNum")) {
                             animalProp = jo;
                         }
                     }
@@ -2387,7 +2387,7 @@ public Runnable setRunnable() {
             return () -> {
                 String userName = UserIdMap.getMaskName(userId);
                 int averageInteger = offsetTimeMath.getAverageInteger();
-                long readyTime = produceTime + averageInteger - advanceTimeInt - delayTimeMath.getAverageInteger() - System.currentTimeMillis();
+                long readyTime = produceTime + averageInteger - advanceTimeInt - delayTimeMath.getAverageInteger() - System.currentTimeMillis() + 50;
                 if (readyTime > 0) {
                     try {
                         Thread.sleep(readyTime);

diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/model/task/greenFinance/GreenFinance.java b/app/src/main/java/tkaxv7s/xposed/sesame/model/task/greenFinance/GreenFinance.java
@@ -332,7 +332,7 @@ private void prizes() {
             }
             str = GreenFinanceRpcCall.campTrigger(campId);
             jsonObject = new JSONObject(str);
-            if (!jsonObject.getBoolean("success")) {
+            if (!jsonObject.optBoolean("success")) {
                 Log.i(TAG + ".prizes.campTrigger", jsonObject.optString("resultDesc"));
                 return;
             }