添加命令参数

Author: VeiZhang

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

@@ -28,13 +28,13 @@ public class Command {
     private int mParallelTaskCount = 0;
     private int mTimeOut = 0;
 
-    protected Command(int parallelTaskCount, int timeOut) {
+    protected Command(CommanderOptions options) {
         mTaskQueue = new LinkedList<>();
-        mParallelTaskCount = parallelTaskCount;
+        mParallelTaskCount = options.mParallelTaskCount;
         if (mParallelTaskCount <= 0) {
             mParallelTaskCount = Integer.MAX_VALUE;
         }
-        mTimeOut = timeOut;
+        mTimeOut = options.mTimeOut;
         if (mTimeOut <= 0) {
             mTimeOut = DEFAULT_TIME_OUT;
         }

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

@@ -30,22 +30,19 @@ public class Commander {
      * 默认：不限制并发线程数；指令超时10s终止
      */
     public static void init() {
-        init(Integer.MAX_VALUE, DEFAULT_TIME_OUT);
+        init(new CommanderOptions.Builder().setParallelTaskCount(Integer.MAX_VALUE).setTimeOut(DEFAULT_TIME_OUT).build());
     }
 
     /**
      * 初始化
-     *
-     * @param parallelTaskCount 并发线程数
-     * @param timeOut 执行命令超时时间（存在某些命令会需要人为输入确认，此时命令会一直卡住等待），默认10s超时，终止指令
      */
-    public static void init(int parallelTaskCount, int timeOut) {
+    public static void init(CommanderOptions options) {
         if (mInstance != null) {
             Log.i(TAG, "Commander initialized!!!");
             return;
         }
         mInstance = new Commander();
-        mInstance.mCommand = new Command(parallelTaskCount, timeOut);
+        mInstance.mCommand = new Command(options);
     }
 
     private Commander() {
@@ -67,7 +64,8 @@ public static CommandTask addTask(@NonNull String command, IListener listener) {
         return addTask(new String[]{command}, listener);
     }
 
-    public static CommandTask addUniqueTask() {
+    public static CommandTask addUniqueTask(@NonNull String command, IListener listener) {
+        checkCommander();
         return null;
     }
 

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

@@ -0,0 +1,48 @@
+package com.excellence.exec;
+
+/**
+ * <pre>
+ *     author : VeiZhang
+ *     blog   : http://tiimor.cn
+ *     time   : 2018/8/16
+ *     desc   :
+ * </pre> 
+ */
+public class CommanderOptions {
+
+    protected int mParallelTaskCount = 0;
+    protected int mTimeOut = 0;
+
+    private CommanderOptions(Builder builder) {
+        mParallelTaskCount = builder.mParallelTaskCount;
+        mTimeOut = builder.mTimeOut;
+    }
+
+    public static class Builder {
+
+        private int mParallelTaskCount = 0;
+        private int mTimeOut = 0;
+
+        /**
+         *
+         * @param parallelTaskCount 并发线程数
+         */
+        public Builder setParallelTaskCount(int parallelTaskCount) {
+            mParallelTaskCount = parallelTaskCount;
+            return this;
+        }
+
+        /**
+         *
+         * @param timeOut 执行命令超时时间（存在某些命令会需要人为输入确认，此时命令会一直卡住等待），默认10s超时，终止指令
+         */
+        public Builder setTimeOut(int timeOut) {
+            mTimeOut = timeOut;
+            return this;
+        }
+
+        public CommanderOptions build() {
+            return new CommanderOptions(this);
+        }
+    }
+}

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

@@ -6,6 +6,7 @@
 
 import com.excellence.exec.Command.CommandTask;
 import com.excellence.exec.Commander;
+import com.excellence.exec.CommanderOptions;
 import com.excellence.exec.IListener;
 
 public class MainActivity extends AppCompatActivity {
@@ -17,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Commander.init();
+        Commander.init(new CommanderOptions.Builder().setTimeOut(1).build());
         final CommandTask task = Commander.addTask("ls", new IListener() {
             @Override
             public void onPre(String command) {