新增延时任务接口

Author: VeiZhang

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

@@ -10,8 +10,6 @@
 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;
@@ -43,7 +41,8 @@ public class CommandTask {
     private Process mProcess = null;
     private int mStatus = STATUS_WAITING;
     private CommandTaskListener mIListener = null;
-    private Disposable mTimer = null;
+    private Disposable mCommandTask = null;
+    private Disposable mTimerTask = null;
     private String mCmd = null;
 
     private CommandTask(Builder builder) {
@@ -155,9 +154,9 @@ void deploy() {
                 return;
             }
             mStatus = STATUS_RUNNING;
-            Observable.create(new ObservableOnSubscribe<String>() {
+            mCommandTask = Observable.timer(mTimeDelay, mTimeUnit).subscribeOn(Schedulers.io()).subscribe(new Consumer<Long>() {
                 @Override
-                public void subscribe(ObservableEmitter<String> emitter) throws Exception {
+                public void accept(Long aLong) throws Exception {
                     if (mStatus == STATUS_INTERRUPT) {
                         return;
                     }
@@ -188,11 +187,6 @@ public void subscribe(ObservableEmitter<String> emitter) throws Exception {
                         mIListener.onSuccess(result.toString());
                     }
                 }
-            }).subscribeOn(Schedulers.io()).subscribe(new Consumer<String>() {
-                @Override
-                public void accept(String s) throws Exception {
-
-                }
             }, new Consumer<Throwable>() {
                 @Override
                 public void accept(Throwable throwable) throws Exception {
@@ -205,14 +199,14 @@ public void accept(Throwable throwable) throws Exception {
     }
 
     private void resetTimer() {
-        if (mTimer != null && !mTimer.isDisposed()) {
-            mTimer.dispose();
+        if (mTimerTask != null && !mTimerTask.isDisposed()) {
+            mTimerTask.dispose();
         }
     }
 
     private void restartTimer() {
         resetTimer();
-        mTimer = Observable.timer(mTimeOut, mTimeUnit).subscribe(new Consumer<Long>() {
+        mTimerTask = Observable.timer(mTimeOut, mTimeUnit).subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long aLong) throws Exception {
                 mIListener.onError(new Throwable("Time out : " + mCmd));
@@ -230,6 +224,9 @@ private void killProcess() {
             // close stream
             mProcess.destroy();
         }
+        if (mCommandTask != null && !mCommandTask.isDisposed()) {
+            mCommandTask.dispose();
+        }
     }
 
     protected void cancel() {

README.md

@@ -18,6 +18,10 @@ Commander.init();
 Commander.init(new CommanderOptions.Builder().setTimeOut(1000).build())
 
 // 创建执行命令
+推荐方式：
+new CommandTask.Builder().command("ls").build().deploy(Listener);
+
+丢弃方式：
 Commander.addTask("ls", new IListener() {
     @Override
     public void onPre(String command) {

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

@@ -12,7 +12,7 @@
 import com.excellence.exec.CommanderOptions;
 import com.excellence.exec.IListener;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements IListener {
 
     private static final String TAG = MainActivity.class.getSimpleName();
 
@@ -32,34 +32,35 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onClick(View v) {
                 Commander.init(new CommanderOptions.Builder().setTimeOut(1000).build());
                 mTextView.setText("");
-                final CommandTask task = Commander.addTask("ls", new IListener() {
-                    @Override
-                    public void onPre(String command) {
-                        Log.i(TAG, "onPre: " + command);
-                        mTextView.append(command + "\n");
-                    }
-
-                    @Override
-                    public void onProgress(String message) {
-                        Log.i(TAG, "onProgress: " + message);
-                        mTextView.append(message + "\n");
-                    }
-
-                    @Override
-                    public void onError(Throwable t) {
-                        t.printStackTrace();
-                        mTextView.setText("Error:" + t.getMessage());
-                    }
-
-                    @Override
-                    public void onSuccess(String message) {
-                        Log.i(TAG, "onSuccess: " + message);
-                        mTextView.append(message + "\n");
-                    }
-                });
+                new CommandTask.Builder().command("ls").build().deploy(MainActivity.this);
+                // final CommandTask task = Commander.addTask("ls", MainActivity.this);
                 // task.discard();
             }
         });
 
     }
+
+    @Override
+    public void onPre(String command) {
+        Log.i(TAG, "onPre: " + command);
+        mTextView.append(command + "\n");
+    }
+
+    @Override
+    public void onProgress(String message) {
+        //Log.i(TAG, "onProgress: " + message);
+        mTextView.append(message + "\n");
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        t.printStackTrace();
+        mTextView.setText("Error:" + t.getMessage());
+    }
+
+    @Override
+    public void onSuccess(String message) {
+        Log.i(TAG, "onSuccess: " + message);
+        mTextView.append(message + "\n");
+    }
 }