From 8f371c1a013cddc3902950004f5f672e560c028d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@mail.com>
Date: Wed, 25 Jun 2025 11:40:18 +0800
Subject: [PATCH] .

---
 .../java/com/example/studyapp/MainActivity.java |  8 +++++---
 .../studyapp/device/ChangeDeviceInfoUtil.java   | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java
index 5b8476b..5df80df 100644
--- a/app/src/main/java/com/example/studyapp/MainActivity.java
+++ b/app/src/main/java/com/example/studyapp/MainActivity.java
@@ -200,7 +200,7 @@ public class MainActivity extends AppCompatActivity {
     // 初始化 ChangeDeviceInfoUtil
     String androidId = getAndroidId(this);
     String taskId = UUID.randomUUID().toString();
-    ChangeDeviceInfoUtil.initialize("US", 2, this, androidId);
+//    ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2);
     // 获取输入框和按钮
     Button executeButton = findViewById(R.id.execute_button);
     Button stopExecuteButton = findViewById(R.id.stop_execute_button);
@@ -238,6 +238,8 @@ public class MainActivity extends AppCompatActivity {
 
     LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Submitting job to executor",null);
     initializeExecutorService();
+    ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2);
+    executeSingleLogic();
     executorService.submit(() -> {
       try {
         AutoJsUtil.registerScriptResultReceiver(this);
@@ -256,9 +258,9 @@ public class MainActivity extends AppCompatActivity {
 
           // 从队列中获取最新的 scriptResult
           LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null);
-          ChangeDeviceInfoUtil.getDeviceInfo(taskId, androidId);
-          executeSingleLogic();
           String currentScriptResult = scriptResultQueue.take();
+          ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2);
+          executeSingleLogic();
           TaskUtil.execSaveTask(this, androidId, taskId, currentScriptResult);
           LogFileUtil.logAndWrite(android.util.Log.DEBUG, "MainActivity", "----发送result------;" + currentScriptResult, null);
           if (currentScriptResult != null && !TextUtils.isEmpty(currentScriptResult)) {
diff --git a/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java b/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java
index 6983b84..9d456d8 100644
--- a/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java
+++ b/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java
@@ -75,6 +75,23 @@ public class ChangeDeviceInfoUtil {
     });
   }
 
+  public static void getAddDeviceInfo(String country, int tag){
+    LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Initializing device info...", null);
+    executorService.submit(() -> {
+      try {
+        LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Starting network requests...", null);
+        String bigoJson = fetchJsonSafely(buildBigoUrl(country, tag), "bigoJson");
+        String afJson = fetchJsonSafely(buildAfUrl(country, tag), "afJson");
+        fallBackToNetworkData(bigoJson, afJson);
+
+      } catch (IOException | JSONException e) {
+        LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG, "Error occurred during initialization", e);
+      } catch (Exception e) {
+        LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG, "Error occurred during initialization", e);
+      }
+    });
+  }
+
   public static void getDeviceInfo(String taskId, String androidId) {
     if (taskId == null || androidId == null || taskId.isBlank() || androidId.isBlank()) {
       LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG, "Invalid task",null);