change func runInMain

Author: YangSen-qn

library/src/androidTest/java/com/qiniu/android/AsynTest.java

@@ -1,5 +1,7 @@
 package com.qiniu.android;
 
+import android.os.Looper;
+
 import com.qiniu.android.utils.AsyncRun;
 import com.qiniu.android.utils.LogUtil;
 
@@ -11,7 +13,7 @@ private class TestParam {
         int completeCount;
         int successCount;
     }
-    public void testAsyncMain(){
+    public void testAsyncMainOnMainThread(){
 
         final TestParam testParam = new TestParam();
         testParam.maxCount = 100;
@@ -22,11 +24,14 @@ public void testAsyncMain(){
             AsyncRun.runInMain(new Runnable() {
                 @Override
                 public void run() {
-                    String threadName = Thread.currentThread().getName();
-                    if (threadName.equals("main")){
+
+                    if (Thread.currentThread() == Looper.getMainLooper().getThread()){
                         testParam.successCount += 1;
                     }
 
+                    String threadName = Thread.currentThread().getName();
+                    LogUtil.d("thread name:" + threadName);
+
                     testParam.completeCount += 1;
                 }
             });
@@ -49,6 +54,53 @@ public boolean shouldWait() {
         assertTrue((testParam.successCount == testParam.maxCount));
     }
 
+    public void testAsyncMainOnOtherThread(){
+
+        final TestParam testParam = new TestParam();
+        testParam.maxCount = 10;
+        testParam.completeCount = 0;
+        testParam.successCount = 0;
+        for (int i = 0; i < testParam.maxCount; i++) {
+            final int i_p = i;
+
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    AsyncRun.runInMain(new Runnable() {
+                        @Override
+                        public void run() {
+
+                            if (Thread.currentThread().getName().equals("main")){
+                                testParam.successCount += 1;
+                            }
+
+                            String threadName = Thread.currentThread().getName();
+                            LogUtil.d("thread name:" + threadName);
+
+                            testParam.completeCount += 1;
+                        }
+                    });
+                }
+            }).start();
+        }
+
+        WaitConditional waitConditional = new WaitConditional() {
+            @Override
+            public boolean shouldWait() {
+                if (testParam.completeCount == testParam.maxCount){
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        };
+
+        wait(waitConditional, 5);
+
+        LogUtil.i(String.format("success count: %d", testParam.successCount));
+        assertTrue((testParam.successCount == testParam.maxCount));
+    }
+
     public void testAsyncBg(){
         final TestParam testParam = new TestParam();
         testParam.maxCount = 100;

library/src/main/java/com/qiniu/android/utils/AsyncRun.java

@@ -14,11 +14,15 @@
  */
 public final class AsyncRun {
 
+    private static final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
     private static final ExecutorService executorService = Executors.newFixedThreadPool(3);
 
     public static void runInMain(Runnable r) {
-        Handler h = new Handler(Looper.getMainLooper());
-        h.post(r);
+        if (Looper.getMainLooper() == Looper.myLooper()){
+            r.run();
+        } else {
+            mainThreadHandler.post(r);
+        }
     }
 
     /**
@@ -30,8 +34,7 @@ public static void runInMain(int delay,
         delayTimerTask(delay, new TimerTask() {
             @Override
             public void run() {
-                Handler h = new Handler(Looper.getMainLooper());
-                h.post(r);
+                mainThreadHandler.post(r);
                 this.cancel();
             }
         });