From 530e2d6af24f3e97ad4c681610b0d36978b10b9d Mon Sep 17 00:00:00 2001
From: yjj38 <yjj.hustler@gmail.com>
Date: Mon, 7 Jul 2025 16:09:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(MainActivity):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=98=E9=87=8F=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 `scriptResult` 变量
- 调整了 `REQUEST_CODE_PERMISSIONS`, `TAG`, `PACKAGE_SCHEME`, `DEVICE_TYPE`, `CountryCode`, 和 `currentCountry` 变量的声明位置，以避免重复声明。
---
 .../com/example/studyapp/MainActivity.java    | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java
index 96ec6c9..1c01c1a 100644
--- a/app/src/main/java/com/example/studyapp/MainActivity.java
+++ b/app/src/main/java/com/example/studyapp/MainActivity.java
@@ -79,7 +79,23 @@ public class MainActivity extends AppCompatActivity {
       "ge", "ps"
   };
 
-  public static volatile String scriptResult;
+  private static final int REQUEST_CODE_PERMISSIONS = 100;
+
+  private static final String TAG = "MainActivity";
+  private static final String PACKAGE_SCHEME = "package:";
+  private static final int DEVICE_TYPE = 2;
+
+  // 定义支持的国家代码常量
+  private static final class CountryCode {
+
+    static final String US = "us";
+    static final String RU = "ru";
+    // 默认使用美国
+    static final String DEFAULT = US;
+  }
+
+  // 当前使用的国家代码
+  private String currentCountry = CountryCode.DEFAULT;
 
   // 初始化 ExecutorService
   private void initializeExecutorService() {
@@ -104,27 +120,6 @@ public class MainActivity extends AppCompatActivity {
     return "FyZqWrStUvOpKlMn";
   }
 
-
-  private static final int REQUEST_CODE_PERMISSIONS = 100;
-
-  private static final String TAG = "MainActivity";
-  private static final String PACKAGE_SCHEME = "package:";
-  private static final String COUNTRY_CODE = "US";
-  private static final int DEVICE_TYPE = 2;
-
-  // 定义支持的国家代码常量
-  private static final class CountryCode {
-
-    static final String US = "us";
-    static final String RU = "ru";
-    // 默认使用美国
-    static final String DEFAULT = US;
-  }
-
-  // 当前使用的国家代码
-  private String currentCountry = CountryCode.DEFAULT;
-
-
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);