优化销毁进程

Author: VeiZhang

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

@@ -146,54 +146,50 @@ public void deploy(final IListener listener) {
      * 执行命令，由{@link Command#schedule()}控制
      */
     void deploy() {
-        try {
-            // only wait task can deploy
-            if (mStatus != STATUS_WAITING) {
-                return;
-            }
-            mStatus = STATUS_RUNNING;
-            mCommandTask = Observable.timer(mTimeDelay, mTimeUnit).subscribeOn(Schedulers.io()).subscribe(new Consumer<Long>() {
-                @Override
-                public void accept(Long aLong) throws Exception {
-                    if (mStatus == STATUS_INTERRUPT) {
-                        return;
-                    }
+        // only wait task can deploy
+        if (mStatus != STATUS_WAITING) {
+            return;
+        }
+        mStatus = STATUS_RUNNING;
+        mCommandTask = Observable.timer(mTimeDelay, mTimeUnit).subscribeOn(Schedulers.io()).subscribe(new Consumer<Long>() {
+            @Override
+            public void accept(Long aLong) throws Exception {
+                if (mStatus == STATUS_INTERRUPT) {
+                    return;
+                }
 
-                    StringBuilder cmd = new StringBuilder();
-                    for (String item : mCommand) {
-                        cmd.append(item).append(" ");
-                    }
-                    mCmd = cmd.toString();
-                    mIListener.onPre(mCmd);
-
-                    restartTimer();
-                    mProcess = new ProcessBuilder(mCommand).redirectErrorStream(true).start();
-
-                    BufferedReader stdin = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
-                    StringBuilder result = new StringBuilder();
-                    String line = null;
-                    while ((line = stdin.readLine()) != null) {
-                        if (mStatus == STATUS_RUNNING) {
-                            restartTimer();
-                            mIListener.onProgress(line);
-                            result.append(line);
-                        }
-                    }
-                    stdin.close();
-                    resetTimer();
+                StringBuilder cmd = new StringBuilder();
+                for (String item : mCommand) {
+                    cmd.append(item).append(" ");
+                }
+                mCmd = cmd.toString();
+                mIListener.onPre(mCmd);
+
+                restartTimer();
+                mProcess = new ProcessBuilder(mCommand).redirectErrorStream(true).start();
+
+                BufferedReader stdin = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
+                StringBuilder result = new StringBuilder();
+                String line = null;
+                while ((line = stdin.readLine()) != null) {
                     if (mStatus == STATUS_RUNNING) {
-                        mIListener.onSuccess(result.toString());
+                        restartTimer();
+                        mIListener.onProgress(line);
+                        result.append(line);
                     }
                 }
-            }, new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable throwable) throws Exception {
-                    mIListener.onError(throwable);
+                stdin.close();
+                resetTimer();
+                if (mStatus == STATUS_RUNNING) {
+                    mIListener.onSuccess(result.toString());
                 }
-            });
-        } catch (Exception e) {
-            mIListener.onError(e);
-        }
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                mIListener.onError(throwable);
+            }
+        });
     }
 
     private void resetTimer() {
@@ -218,9 +214,10 @@ protected boolean isRunning() {
     }
 
     private void killProcess() {
+        resetTimer();
         if (mProcess != null) {
             // close stream
-            mProcess.destroy();
+            ProcessUtils.processDestroy(mProcess);
         }
     }
 

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

@@ -0,0 +1,83 @@
+package com.excellence.exec;
+
+import android.support.annotation.NonNull;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <pre>
+ *     author : VeiZhang
+ *     blog   : http://tiimor.cn
+ *     time   : 2018/9/3
+ *     desc   : {@link Process} 进程工具
+ * </pre> 
+ */
+public class ProcessUtils {
+
+    public static final String REG_NUMBER = "[^0-9]";
+
+    public static void killProcess(@NonNull Process process) {
+        int pid = getProcessId(process);
+        if (pid <= 0) {
+            return;
+        }
+        android.os.Process.killProcess(pid);
+        process.destroy();
+    }
+
+    public static int getProcessId(@NonNull Process process) {
+        try {
+            Pattern pattern = Pattern.compile(REG_NUMBER);
+            Matcher matcher = pattern.matcher(process.toString());
+            String pid = matcher.replaceAll("").trim();
+            return Integer.parseInt(pid);
+        } catch (Exception e) {
+
+        }
+        return 0;
+    }
+
+    public static void closeStream(@NonNull Process process) {
+        try {
+            InputStream in = process.getInputStream();
+            if (in != null) {
+                in.close();
+            }
+        } catch (Exception e) {
+
+        }
+
+        try {
+            InputStream in = process.getErrorStream();
+            if (in != null) {
+                in.close();
+            }
+        } catch (Exception e) {
+
+        }
+
+        try {
+            OutputStream out = process.getOutputStream();
+            if (out != null) {
+                out.close();
+            }
+        } catch (Exception e) {
+
+        }
+    }
+
+    public static void processDestroy(@NonNull Process process) {
+        try {
+            if (process.exitValue() != 0) {
+                closeStream(process);
+                killProcess(process);
+            }
+        } catch (Exception e) {
+            closeStream(process);
+            killProcess(process);
+        }
+    }
+}