设置执行超时

Author: VeiZhang

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

@@ -4,10 +4,13 @@
 import java.io.InputStreamReader;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -96,6 +99,8 @@ public class CommandTask {
         private Process mProcess = null;
         private int mStatus = STATUS_WAITING;
         private IListener mIListener = null;
+        private Disposable mTimer = null;
+        private String mCmd = null;
 
         private CommandTask(List<String> command, final IListener listener) {
             mCommand = command;
@@ -116,10 +121,12 @@ public void onProgress(String message) {
 
                 @Override
                 public void onError(Throwable t) {
-                    mStatus = STATUS_FINISHED;
-                    if (listener != null) {
-                        listener.onError(t);
+                    if (mStatus != STATUS_INTERRUPT) {
+                        if (listener != null) {
+                            listener.onError(t);
+                        }
                     }
+                    mStatus = STATUS_FINISHED;
                     remove(CommandTask.this);
                 }
 
@@ -152,19 +159,24 @@ public void subscribe(ObservableEmitter<String> emitter) throws Exception {
                         for (String item : mCommand) {
                             cmd.append(item).append(" ");
                         }
-                        mIListener.onPre(cmd.toString());
+                        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 && mStatus != STATUS_INTERRUPT) {
-                            mIListener.onProgress(line);
-                            result.append(line);
+                        while (mStatus == STATUS_RUNNING && (line = stdin.readLine()) != null) {
+                            if (mStatus == STATUS_RUNNING) {
+                                restartTimer();
+                                mIListener.onProgress(line);
+                                result.append(line);
+                            }
                         }
                         stdin.close();
-
-                        if (mStatus != STATUS_INTERRUPT) {
+                        resetTimer();
+                        if (mStatus == STATUS_RUNNING) {
                             mIListener.onSuccess(result.toString());
                         }
                     }
@@ -174,23 +186,34 @@ public void subscribe(ObservableEmitter<String> emitter) throws Exception {
             }
         }
 
+        private void resetTimer() {
+            if (mTimer != null && !mTimer.isDisposed()) {
+                mTimer.dispose();
+            }
+        }
+
+        private void restartTimer() {
+            resetTimer();
+            mTimer = Observable.timer(mTimeOut, TimeUnit.MILLISECONDS).subscribe(new Consumer<Long>() {
+                @Override
+                public void accept(Long aLong) throws Exception {
+                    mIListener.onError(new Throwable("Time out : " + mCmd));
+                    discard();
+                }
+            });
+        }
+
         private boolean isRunning() {
             return mStatus == STATUS_RUNNING;
         }
 
         private void cancel() {
             mStatus = STATUS_INTERRUPT;
-            if (mProcess != null) {
-                mProcess.destroy();
-            }
             mTaskQueue.remove(this);
         }
 
         public void discard() {
             mStatus = STATUS_INTERRUPT;
-            if (mProcess != null) {
-                mProcess.destroy();
-            }
             remove(this);
         }
 

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

@@ -34,7 +34,7 @@ public Builder setParallelTaskCount(int parallelTaskCount) {
 
         /**
          *
-         * @param timeOut 执行命令超时时间（存在某些命令会需要人为输入确认，此时命令会一直卡住等待），默认10s超时，终止指令
+         * @param timeOut ms:执行命令超时时间（存在某些命令会需要人为输入确认，此时命令会一直卡住等待），默认10s超时，终止指令
          */
         public Builder setTimeOut(int timeOut) {
             mTimeOut = timeOut;

README.md

@@ -8,6 +8,9 @@ Android命令执行以及回调
 // 初始化，默认：不限制并发线程数；指令超时10s终止
 Commander.init();
 
+// 自定义初始化参数：超时1s终止
+Commander.init(new CommanderOptions.Builder().setTimeOut(1000).build())
+
 // 创建执行命令
 Commander.addTask("ls", new IListener() {
     @Override
@@ -30,6 +33,12 @@ Commander.addTask("ls", new IListener() {
         Log.i(TAG, "onSuccess: " + message);
     }
 });
+
+// 终止命令
+CommandTask.discard()
+
+// 终止所有命令
+Commander.destory()
 ```
 
 ## Runtime

sample/src/main/java/com/excellence/exec/sample/MainActivity.java

@@ -18,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Commander.init(new CommanderOptions.Builder().setTimeOut(1).build());
+        Commander.init(new CommanderOptions.Builder().setTimeOut(1000).build());
         final CommandTask task = Commander.addTask("ls", new IListener() {
             @Override
             public void onPre(String command) {