Merge remote-tracking branch 'origin/Retention' into Retention

app/proguard-rules.pro

@@ -1,21 +1,27 @@
-# Add project specific ProGuard rules here.
+# 保留 ArmCloudApiClient 及其所有公共方法和构造函数
-# You can control the set of applied configuration files using the
+-keep class com.example.retention.device.ArmCloudApiClient {
-# proguardFiles setting in build.gradle.
+    public <init>();
-#
+    public *;
-# For more details, see
+}
-#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
+# 保留 PropertyItem 内部类及其字段、构造函数和 toJson 方法
-# and specify the fully qualified class name to the JavaScript interface
+-keep class com.example.retention.device.ArmCloudApiClient$PropertyItem {
-# class:
+    private java.lang.String propertiesName;
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+    private java.lang.String propertiesValue;
-#   public *;
+    public <init>(java.lang.String, java.lang.String);
-#}
+    public org.json.JSONObject toJson();
+}
 
-# Uncomment this to preserve the line number information for
+# 保留枚举类
-# debugging stack traces.
+-keepclassmembers enum * {
-#-keepattributes SourceFile,LineNumberTable
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
 
-# If you keep the line number information, uncomment this to
+# 保留使用 @SerializedName 注解的字段
-# hide the original source file name.
+-keepclassmembers class * {
-#-renamesourcefileattribute SourceFile
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 保留注解信息（根据需要启用）
+# -keepattributes *Annotation*

app/src/main/java/com/example/retention/MainActivity.java

@@ -186,7 +186,7 @@ public class MainActivity extends AppCompatActivity {
     WorkManager.getInstance(this).enqueue(workRequest);
   }
 
-  public static final LinkedBlockingQueue<String> scriptResultQueue = new LinkedBlockingQueue<>();
+  public static final LinkedBlockingQueue<String> scriptResultQueue = new LinkedBlockingQueue<>(1);
 
 
   private void startProxyVpn(Context context) {