添加时间单位和延时

Author: VeiZhang

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

@@ -24,7 +24,7 @@ class Command {
 
     private final LinkedList<CommandTask> mTaskQueue;
     private int mParallelTaskCount = 0;
-    private int mTimeOut = 0;
+    private long mTimeOut = 0;
     private Executor mResponsePoster = null;
 
     protected Command(CommanderOptions options) {
@@ -47,7 +47,7 @@ public void execute(@NonNull Runnable command) {
         };
     }
 
-    protected int getTimeOut() {
+    protected long getTimeOut() {
         return mTimeOut;
     }
 

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

@@ -35,29 +35,39 @@ public class CommandTask {
     private Command mManager = null;
     private Executor mResponsePoster = null;
     private List<String> mCommand = null;
-    private int mTimeOut = 0;
+    private TimeUnit mTimeUnit = null;
+    private long mTimeOut = 0;
+    private long mTimeDelay = 0;
 
     private Process mProcess = null;
     private int mStatus = STATUS_WAITING;
     private CommandTaskListener mIListener = null;
     private Disposable mTimer = null;
     private String mCmd = null;
 
-    private CommandTask(List<String> command, int timeOut) {
+    private CommandTask(Builder builder) {
         mManager = Commander.getCommand();
-        mCommand = command;
-        mTimeOut = timeOut;
+
+        mCommand = builder.mCommand;
+        mTimeUnit = builder.mTimeUnit;
+        mTimeOut = builder.mTimeOut;
         if (mTimeOut <= 0) {
             mTimeOut = mManager.getTimeOut();
         }
+        mTimeDelay = builder.mTimeDelay;
+        if (mTimeDelay < 0) {
+            mTimeDelay = 0;
+        }
         mResponsePoster = mManager.getResponsePoster();
         mIListener = new CommandTaskListener();
     }
 
     public static class Builder {
 
         private List<String> mCommand = null;
-        private int mTimeOut = 0;
+        private TimeUnit mTimeUnit = TimeUnit.MILLISECONDS;
+        private long mTimeOut = 0;
+        private long mTimeDelay = 0;
 
         /**
          * 任务命令
@@ -71,18 +81,40 @@ public Builder command(List<String> command) {
         }
 
         /**
-         * 单独设置任务超时时间:ms
+         * 延时、超时的时间单位，默认:ms {@link TimeUnit#MILLISECONDS}
+         *
+         * @param timeUnit
+         * @return
+         */
+        public Builder timeUnit(TimeUnit timeUnit) {
+            mTimeUnit = timeUnit;
+            return this;
+        }
+
+        /**
+         * 单独设置任务超时时间，默认:10 * 1000ms {@link Command#DEFAULT_TIME_OUT}
          *
          * @param timeOut
          * @return
          */
-        public Builder timeOut(int timeOut) {
+        public Builder timeOut(long timeOut) {
             mTimeOut = timeOut;
             return this;
         }
 
+        /**
+         * 设置任务延时启动，默认:0ms
+         *
+         * @param timeDelay
+         * @return
+         */
+        public Builder timeDelay(long timeDelay) {
+            mTimeDelay = timeDelay;
+            return this;
+        }
+
         public CommandTask build() {
-            return new CommandTask(mCommand, mTimeOut);
+            return new CommandTask(this);
         }
     }
 
@@ -164,7 +196,7 @@ private void resetTimer() {
 
     private void restartTimer() {
         resetTimer();
-        mTimer = Observable.timer(mTimeOut, TimeUnit.MILLISECONDS).subscribe(new Consumer<Long>() {
+        mTimer = Observable.timer(mTimeOut, mTimeUnit).subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long aLong) throws Exception {
                 mIListener.onError(new Throwable("Time out : " + mCmd));

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

@@ -11,7 +11,7 @@
 public class CommanderOptions {
 
     protected int mParallelTaskCount = 0;
-    protected int mTimeOut = 0;
+    protected long mTimeOut = 0;
 
     private CommanderOptions(Builder builder) {
         mParallelTaskCount = builder.mParallelTaskCount;
@@ -21,7 +21,7 @@ private CommanderOptions(Builder builder) {
     public static class Builder {
 
         private int mParallelTaskCount = 0;
-        private int mTimeOut = 0;
+        private long mTimeOut = 0;
 
         /**
          *
@@ -36,7 +36,7 @@ public Builder setParallelTaskCount(int parallelTaskCount) {
          *
          * @param timeOut ms:执行命令超时时间（存在某些命令会需要人为输入确认，此时命令会一直卡住等待），默认10s超时，终止指令
          */
-        public Builder setTimeOut(int timeOut) {
+        public Builder setTimeOut(long timeOut) {
             mTimeOut = timeOut;
             return this;
         }