优化进程中断控制

Author: VeiZhang

AndroidExecLibrary/src/main/java/com/excellence/exec/CommandTask.java

@@ -171,7 +171,7 @@ public void accept(Long aLong) throws Exception {
                 BufferedReader stdin = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
                 StringBuilder result = new StringBuilder();
                 String line = null;
-                while ((line = stdin.readLine()) != null) {
+                while (mStatus == STATUS_RUNNING && (line = stdin.readLine()) != null) {
                     if (mStatus == STATUS_RUNNING) {
                         restartTimer();
                         mIListener.onProgress(line);
@@ -217,7 +217,7 @@ private void killProcess() {
         resetTimer();
         if (mProcess != null) {
             // close stream
-            ProcessUtils.processDestroy(mProcess);
+            ProcessUtils.destroyProcess(mProcess);
         }
     }
 

AndroidExecLibrary/src/main/java/com/excellence/exec/ProcessUtils.java

@@ -21,10 +21,9 @@ public class ProcessUtils {
 
     public static void killProcess(@NonNull Process process) {
         int pid = getProcessId(process);
-        if (pid <= 0) {
-            return;
+        if (pid > 0) {
+            android.os.Process.killProcess(pid);
         }
-        android.os.Process.killProcess(pid);
         process.destroy();
     }
 
@@ -69,15 +68,8 @@ public static void closeStream(@NonNull Process process) {
         }
     }
 
-    public static void processDestroy(@NonNull Process process) {
-        try {
-            if (process.exitValue() != 0) {
-                closeStream(process);
-                killProcess(process);
-            }
-        } catch (Exception e) {
-            closeStream(process);
-            killProcess(process);
-        }
+    public static void destroyProcess(@NonNull Process process) {
+        closeStream(process);
+        killProcess(process);
     }
 }