增强超时控制：永不超时

Author: VeiZhang

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

@@ -20,8 +20,6 @@ class Command {
 
     private static final String TAG = Command.class.getSimpleName();
 
-    protected static final int DEFAULT_TIME_OUT = 10 * 1000;
-
     private final LinkedList<CommandTask> mTaskQueue;
     private int mParallelTaskCount = 0;
     private long mTimeOut = 0;
@@ -34,9 +32,6 @@ protected Command(CommanderOptions options) {
             mParallelTaskCount = Integer.MAX_VALUE;
         }
         mTimeOut = options.mTimeOut;
-        if (mTimeOut <= 0) {
-            mTimeOut = DEFAULT_TIME_OUT;
-        }
 
         final Handler handler = new Handler(Looper.getMainLooper());
         mResponsePoster = new Executor() {

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

@@ -49,9 +49,12 @@ private CommandTask(Builder builder) {
 
         mCommand = builder.mCommand;
         mTimeUnit = builder.mTimeUnit;
-        mTimeOut = builder.mTimeOut;
-        if (mTimeOut <= 0) {
-            mTimeOut = mManager.getTimeOut();
+        /**
+         * 单任务超时配置覆盖全局超时配置
+         */
+        mTimeOut = mManager.getTimeOut();
+        if (builder.isOverrideTimeOut) {
+            mTimeOut = builder.mTimeOut;
         }
         mTimeDelay = builder.mTimeDelay;
         if (mTimeDelay < 0) {
@@ -67,6 +70,7 @@ public static class Builder {
         private TimeUnit mTimeUnit = TimeUnit.MILLISECONDS;
         private long mTimeOut = 0;
         private long mTimeDelay = 0;
+        private boolean isOverrideTimeOut = false;
 
         /**
          * 单个命令参数
@@ -123,13 +127,14 @@ public Builder timeUnit(TimeUnit timeUnit) {
         }
 
         /**
-         * 单独设置任务超时时间，默认:10 * 1000ms {@link Command#DEFAULT_TIME_OUT}
+         * 单独设置任务超时时间
          *
          * @param timeOut
          * @return
          */
         public Builder timeOut(long timeOut) {
             mTimeOut = timeOut;
+            isOverrideTimeOut = true;
             return this;
         }
 
@@ -259,6 +264,11 @@ private void resetTimer() {
 
     private void restartTimer() {
         resetTimer();
+        mTimerTask = null;
+        if (mTimeOut <= 0) {
+            return;
+        }
+
         mTimerTask = Observable.timer(mTimeOut, mTimeUnit).subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long aLong) throws Exception {

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

@@ -6,8 +6,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.excellence.exec.Command.DEFAULT_TIME_OUT;
-
 /**
  * <pre>
  *     author : VeiZhang
@@ -20,12 +18,14 @@ public class Commander {
 
     private static final String TAG = Commander.class.getSimpleName();
 
+    private static final int DEFAULT_TIME_OUT = 10 * 1000;
+
     private static Commander mInstance = null;
 
     private Command mCommand = null;
 
     /**
-     * 默认：不限制并发线程数；指令超时10s终止
+     * 默认：不限制并发线程数；指令超时{@link Commander#DEFAULT_TIME_OUT}终止
      */
     public static void init() {
         init(new CommanderOptions.Builder().parallelTaskCount(Integer.MAX_VALUE).timeOut(DEFAULT_TIME_OUT).build());

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

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