处理阻塞，优化任务销毁

Author: VeiZhang

AndroidExecLibrary/build.gradle

@@ -29,8 +29,8 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 }
 
 /*********************上传jCenter依赖*********************/

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

@@ -13,6 +13,8 @@
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
+import static com.excellence.exec.ProcessUtils.closeStream;
+
 /**
  * <pre>
  *     author : VeiZhang
@@ -235,14 +237,20 @@ public void accept(Long aLong) throws Exception {
                 BufferedReader stdin = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
                 StringBuilder result = new StringBuilder();
                 String line = null;
-                while (mStatus == STATUS_RUNNING && (line = stdin.readLine()) != null) {
-                    if (mStatus == STATUS_RUNNING) {
-                        restartTimer();
-                        mIListener.onProgress(line);
-                        result.append(line);
+                try {
+                    while (mStatus == STATUS_RUNNING && (line = stdin.readLine()) != null) {
+                        if (mStatus == STATUS_RUNNING) {
+                            restartTimer();
+                            mIListener.onProgress(line);
+                            result.append(line);
+                        }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    closeStream(mProcess);
+                    stdin.close();
                 }
-                stdin.close();
                 resetTimer();
                 if (mStatus == STATUS_RUNNING) {
                     mIListener.onSuccess(result.toString());

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

@@ -69,7 +69,6 @@ public static void closeStream(@NonNull Process process) {
     }
 
     public static void destroyProcess(@NonNull Process process) {
-        closeStream(process);
         killProcess(process);
     }
 }