revert

Xiaofei-it · Aug 30, 2016 · 9a6b260 · 9a6b260
1 parent dec22fc
commit 9a6b260
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/hermes-eventbus/src/main/java/xiaofei/library/hermeseventbus/HermesEventBus.java b/hermes-eventbus/src/main/java/xiaofei/library/hermeseventbus/HermesEventBus.java
@@ -163,6 +163,27 @@ public void unregister(Object subscriber) {
         mEventBus.unregister(subscriber);
     }
 
+    private void actionInternal(final Action<IMainService> action) {
+        if (mMainProcess) {
+            action.call(mMainApis);
+        } else {
+            if (mState == STATE_DISCONNECTED) {
+                Log.w(TAG, HERMES_SERVICE_DISCONNECTED);
+            } else if (mState == STATE_CONNECTING) {
+                mRemoteApis.actionNonNullNonBlocking(new Action<IMainService>() {
+                    @Override
+                    public void call(IMainService o) {
+                        action.call(o);
+                    }
+                });
+            } else if (mState == STATE_CONNECTED) {
+                action.call(mRemoteApis.get());
+            } else {
+                throw new IllegalStateException(UNKNOWN_ERROR);
+            }
+        }
+    }
+
     private <T> T calculateInternal(final Function<IMainService, ? extends T> function) {
         if (mMainProcess) {
             return function.call(mMainApis);
@@ -185,16 +206,6 @@ public T call(IMainService o) {
         }
     }
 
-    private void actionInternal(final Action<IMainService> action) {
-        calculateInternal(new Function<IMainService, Void>() {
-            @Override
-            public Void call(IMainService o) {
-                action.call(o);
-                return null;
-            }
-        });
-    }
-
     public void post(final Object event) {
         actionInternal(new Action<IMainService>() {
             @Override