Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

mpmaster/src/main/java/com/xypower/mpmaster/sms/AdbUtil.java

@@ -24,44 +24,46 @@ public class AdbUtil {
     }
 
     public static void ShellList(ArrayList<String> shellList) {
-        try {
-            for (String cmd : shellList) {
-                Process process = Runtime.getRuntime().exec(cmd);
-                // 处理输出和错误流
-                process.waitFor();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
 //        try {
-//            // 使用 su 获取 root 权限
-//            Process process = Runtime.getRuntime().exec();
-//
-//            // 获取输出流，用于发送命令
-//            DataOutputStream outputStream = new DataOutputStream(process.getOutputStream());
-//
-//            for (int i = 0; i < shellList.size()-1; i++) {
-//                outputStream.writeBytes(shellList.get(i)+"\n");
+//            for (String cmd : shellList) {
+//                Process process = Runtime.getRuntime().exec(cmd);
+//                // 处理输出和错误流
+//                int i = process.waitFor();
+//                System.out.println(""+i);
 //            }
-//            // 执行命令（例如：列出 /data 目录）
-//
-//            outputStream.writeBytes("exit\n"); // 退出 su
-//            outputStream.flush();
-//
-//            // 读取命令输出
-//            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-//            String line;
-//            while ((line = reader.readLine()) != null) {
-//                Log.d("Output", line); // 打印输出
-//            }
-//
-//            // 等待命令执行完成
-//            int i = process.waitFor();
-//        } catch (IOException | InterruptedException e) {
+//        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
+
+
+        try {
+            // 使用 su 获取 root 权限
+            Process process = Runtime.getRuntime().exec("su");
+
+            // 获取输出流，用于发送命令
+            DataOutputStream outputStream = new DataOutputStream(process.getOutputStream());
+
+            for (int i = 0; i < shellList.size(); i++) {
+                outputStream.writeBytes(shellList.get(i)+"\n");
+            }
+            // 执行命令（例如：列出 /data 目录）
+
+            outputStream.writeBytes("exit\n"); // 退出 su
+            outputStream.flush();
+            outputStream.close();
+
+            // 读取命令输出
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                Log.d("Output", line); // 打印输出
+            }
+
+            // 等待命令执行完成
+            int i = process.waitFor();
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+        }
     }
 
 }