添加命令执行状态

Author: VeiZhang

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

@@ -53,7 +53,7 @@ private synchronized void schedule() {
         // count running task
         int runningTaskCount = 0;
         for (CommandTask task : mTaskQueue) {
-            if (task.isRunning) {
+            if (task.isRunning()) {
                 runningTaskCount++;
             }
         }
@@ -87,9 +87,14 @@ public synchronized void clearAll() {
 
     public class CommandTask {
 
+        private static final int STATUS_WAITING = 0;
+        private static final int STATUS_FINISHED = 1;
+        private static final int STATUS_RUNNING = 2;
+        private static final int STATUS_INTERRUPT = 3;
+
         private List<String> mCommand = null;
         private Process mProcess = null;
-        private boolean isRunning = false;
+        private int mStatus = STATUS_WAITING;
         private IListener mIListener = null;
 
         private CommandTask(List<String> command, final IListener listener) {
@@ -111,7 +116,7 @@ public void onProgress(String message) {
 
                 @Override
                 public void onError(Throwable t) {
-                    isRunning = false;
+                    mStatus = STATUS_FINISHED;
                     if (listener != null) {
                         listener.onError(t);
                     }
@@ -120,7 +125,7 @@ public void onError(Throwable t) {
 
                 @Override
                 public void onSuccess(String message) {
-                    isRunning = false;
+                    mStatus = STATUS_FINISHED;
                     if (listener != null) {
                         listener.onSuccess(message);
                     }
@@ -131,10 +136,14 @@ public void onSuccess(String message) {
 
         void deploy() {
             try {
-                isRunning = true;
+                mStatus = STATUS_RUNNING;
                 Observable.create(new ObservableOnSubscribe<String>() {
                     @Override
                     public void subscribe(ObservableEmitter<String> emitter) throws Exception {
+                        if (mStatus == STATUS_INTERRUPT) {
+                            return;
+                        }
+
                         StringBuilder cmd = new StringBuilder();
                         for (String item : mCommand) {
                             cmd.append(item).append(" ");
@@ -145,28 +154,36 @@ public void subscribe(ObservableEmitter<String> emitter) throws Exception {
                         BufferedReader stdin = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
                         StringBuilder result = new StringBuilder();
                         String line = null;
-                        while ((line = stdin.readLine()) != null) {
+                        while ((line = stdin.readLine()) != null && mStatus != STATUS_INTERRUPT) {
                             mIListener.onProgress(line);
                             result.append(line);
                         }
                         stdin.close();
 
-                        mIListener.onSuccess(result.toString());
+                        if (mStatus != STATUS_INTERRUPT) {
+                            mIListener.onSuccess(result.toString());
+                        }
                     }
-                }).observeOn(Schedulers.io()).subscribe();
+                }).subscribeOn(Schedulers.io()).subscribe();
             } catch (Exception e) {
                 mIListener.onError(e);
             }
         }
 
         private void cancel() {
+            mStatus = STATUS_INTERRUPT;
             if (mProcess != null) {
                 mProcess.destroy();
             }
             mTaskQueue.remove(this);
         }
 
+        private boolean isRunning() {
+            return mStatus == STATUS_RUNNING;
+        }
+
         public void discard() {
+            mStatus = STATUS_INTERRUPT;
             if (mProcess != null) {
                 mProcess.destroy();
             }

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

@@ -71,6 +71,11 @@ public static CommandTask addUniqueTask() {
         return null;
     }
 
+    public static void destory() {
+        checkCommander();
+        mInstance.mCommand.clearAll();
+    }
+
     private static void checkCommander() {
         if (mInstance == null) {
             throw new RuntimeException("Commander not initialized!!!");

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

@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.excellence.exec.Command.CommandTask;
 import com.excellence.exec.Commander;
 import com.excellence.exec.IListener;
 
@@ -17,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         Commander.init();
-        Commander.addTask("ls", new IListener() {
+        final CommandTask task = Commander.addTask("ls", new IListener() {
             @Override
             public void onPre(String command) {
                 Log.i(TAG, "onPre: " + command);
@@ -38,5 +39,6 @@ public void onSuccess(String message) {
                 Log.i(TAG, "onSuccess: " + message);
             }
         });
+        // task.discard();
     }
 }