Merge pull request #273 from TKaxv-7S/dev

dev合并至release
TKaxv-7S · Jul 24, 2024 · c9b763b · c9b763b
2 parents b416270 + 52887ff
commit c9b763b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/src/main/assets/web/js/index.js b/app/src/main/assets/web/js/index.js
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
@@ -566,7 +566,7 @@ private JSONObject querySelfHome() {
             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));
+            int offsetTime = offsetTimeMath.nextInteger((int) ((start + end) / 2 - serverTime));
             Log.i("服务器时间：" + serverTime + "，本地与服务器时间差：" + offsetTime);
         } catch (Throwable t) {
             Log.printStackTrace(t);
@@ -581,7 +581,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 - start) * 2 / 3 - serverTime));
+            int offsetTime = offsetTimeMath.nextInteger((int) ((start + end) / 2 - serverTime));
             Log.i("服务器时间：" + serverTime + "，本地与服务器时间差：" + offsetTime);
         } catch (Throwable t) {
             Log.printStackTrace(t);

diff --git a/app/src/main/java/tkaxv7s/xposed/sesame/ui/HtmlViewerActivity.java b/app/src/main/java/tkaxv7s/xposed/sesame/ui/HtmlViewerActivity.java
@@ -61,13 +61,10 @@ protected void onResume() {
         WebSettings settings = mWebView.getSettings();
         if (intent != null) {
             if (intent.getBooleanExtra("nextLine", true)) {
-                settings.setTextZoom(90);
-                settings.setSupportZoom(false);
-                settings.setLoadWithOverviewMode(false);
-                settings.setUseWideViewPort(true);
+                settings.setTextZoom(85);
+                settings.setUseWideViewPort(false);
             } else {
                 settings.setTextZoom(100);
-                settings.setSupportZoom(true);
                 settings.setUseWideViewPort(true);
             }
             uri = intent.getData();
@@ -78,7 +75,6 @@ protected void onResume() {
             return;
         }
         settings.setTextZoom(100);
-        settings.setSupportZoom(true);
         settings.setUseWideViewPort(true);
     }