From 6d084c92e4255a97ea2db340b0a6df5144e2a33e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@mail.com>
Date: Thu, 26 Jun 2025 14:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E4=BC=A0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=8E=8B=E7=BC=A9=E5=90=8E=E5=8D=B8=E8=BD=BD?=
 =?UTF-8?q?=E5=8E=9Fapk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/example/studyapp/MainActivity.java  | 7 ++++++-
 app/src/main/java/com/example/studyapp/task/TaskUtil.java | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java
index 09f8101..03fb054 100644
--- a/app/src/main/java/com/example/studyapp/MainActivity.java
+++ b/app/src/main/java/com/example/studyapp/MainActivity.java
@@ -39,6 +39,7 @@ import com.example.studyapp.utils.ShellUtils;
 import com.example.studyapp.worker.CheckAccessibilityWorker;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
@@ -274,7 +275,11 @@ public class MainActivity extends AppCompatActivity {
           LogFileUtil.logAndWrite(android.util.Log.DEBUG, "MainActivity", "----发送result------;" + currentScriptResult, null);
           if (currentScriptResult != null && !TextUtils.isEmpty(currentScriptResult)) {
             TaskUtil.execSaveTask(this, androidId, taskId, currentScriptResult);
-            infoUpload(this, androidId, currentScriptResult);
+              try {
+                  infoUpload(this, androidId, currentScriptResult);
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
           }
           Thread.sleep(5000);
         }
diff --git a/app/src/main/java/com/example/studyapp/task/TaskUtil.java b/app/src/main/java/com/example/studyapp/task/TaskUtil.java
index be10324..89e5067 100644
--- a/app/src/main/java/com/example/studyapp/task/TaskUtil.java
+++ b/app/src/main/java/com/example/studyapp/task/TaskUtil.java
@@ -247,6 +247,9 @@ public class TaskUtil {
       zipFile.delete();
       e.printStackTrace();
     }
+    //uninstall
+    String uninstall = "pm uninstall "+packAge;
+    String chmodResult = ShellUtils.execRootCmdAndGetResult(uninstall);
     Log.e("TAG", "infoUpload compress finish: ");
     // 上传压缩文件
     if (!zipFile.exists()) {
@@ -257,9 +260,6 @@ public class TaskUtil {
     String chmod = "chmod 777 \"" + safeNewPath + "\"";
     uploadFile(zipFile);
 
-    //uninstall
-    String uninstall = "pm uninstall "+packAge;
-    String chmodResult = ShellUtils.execRootCmdAndGetResult(uninstall);
     // 清理临时文件
     delFileSh(copiedAPKFile.getAbsolutePath());
     ShellUtils.execRootCmdAndGetResult(chmod);