Resolve callback support generic, Support reactive programming, Remove resolve.call 'type' param.

Author: TangXiaoLv

README.md

@@ -5,13 +5,14 @@ English | [中文](https://github.com/TangXiaoLv/Android-Router/blob/master/READ
 
 |lib|androidrouter|androidrouter-compiler|androidrouter-annotations|
 |---|---|---|---|
-|version|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter/images/download.svg?version=1.0.7) ](https://bintray.com/tangxiaolv/maven/androidrouter/1.0.7/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-compiler/images/download.svg?version=1.0.1) ](https://bintray.com/tangxiaolv/maven/androidrouter-compiler/1.0.1/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-annotations/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-annotations/1.0.0/link)|
+|version|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter/images/download.svg?version=2.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter/2.0.0/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-compiler/images/download.svg?version=1.0.1) ](https://bintray.com/tangxiaolv/maven/androidrouter-compiler/1.0.1/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-annotations/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-annotations/1.0.0/link)|
 
 High-performance, flexible, easy-to-use lightweight Android component-based framework, Used to solve the interdependence of complex projects, A single module is conducive to independent development and maintenance.
 
 Update Log
 ---
 ```
+2.0.0: Resolve callback support generic, Support reactive programming, Remove resolve.call 'type' param. 
 1.0.7: Fix system params passed exception.
 1.0.6: Fix known issues.
 1.0.5: Support array params and extend params.
@@ -168,6 +169,11 @@ public class MainModule implements IRouter {
     public void throwError(VPromise promise) {
         promise.reject(new RouterRemoteException("I'm error................."));
     }
+    
+    @RouterPath("/reactive")
+        public void reactive(VPromise promise) {
+            promise.resolve("I'm from reactive!!!!!");
+    }
 }
 
 //Support multiple scheme.
@@ -185,7 +191,8 @@ public class RemoteModule implements IRouter {
 ```
 ###Step 2:Invoke
 ```
-AndroidRouter.open("android://main/activity/localActivity")
+AndroidRouter
+    .open("android://main/activity/localActivity")
     .callOnSubThread()
     .returnOnMainThread()
     .call(new Resolve() {
@@ -201,13 +208,46 @@ AndroidRouter.open("android://main/activity/localActivity")
 });
 
 //or
-AndroidRouter.open("android", "main", "/differentTypes")
+AndroidRouter
+    .open("android", "main", "/differentTypes")
     .showTime()//Show time
     .call();//Igone result and error.
     
 //or
 //Await the result returned.It will block thread.
-Object value = AndroidRouter.open(router11.getText().toString()).getValue();
+Object value = AndroidRouter.open("android://main/getValue").getValue();
+
+//or
+AndroidRouter.open("android://main/reactive")
+    .call(new Func<String, Integer>() {
+        @Override
+        public Integer call(String s) {
+            return 1;
+        }
+    })
+    .then(new Func<Integer, Double>() {
+        @Override
+        public Double call(Integer integer) {
+            return 2.0;
+        }
+    })
+    .then(new Func<Double, String>() {
+        @Override
+        public String call(Double ddouble) {
+            return "I'm reactive!";
+        }
+    })
+    .done(new Resolve<String>() {
+        @Override
+        public void call(String result) {
+            title.setText(result);
+        }
+    }, new Reject() {
+        @Override
+        public void call(Exception e) {
+            title.setText(e.toString());
+        }
+    });
 ```
 ###Proguard
 ```

README_CN.md

@@ -5,13 +5,14 @@
 
 |lib|androidrouter|androidrouter-compiler|androidrouter-annotations|
 |---|---|---|---|
-|version|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter/images/download.svg?version=1.0.7) ](https://bintray.com/tangxiaolv/maven/androidrouter/1.0.7/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-compiler/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-compiler/1.0.0/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-annotations/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-annotations/1.0.0/link)|
+|version|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter/images/download.svg?version=2.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter/2.0.0/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-compiler/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-compiler/1.0.0/link)|[ ![Download](https://api.bintray.com/packages/tangxiaolv/maven/androidrouter-annotations/images/download.svg?version=1.0.0) ](https://bintray.com/tangxiaolv/maven/androidrouter-annotations/1.0.0/link)|
 
 高性能，灵活，简单易用的轻量级Android组件化协议框架，用来解决复杂工程的互相依赖，解耦出的单个模块有利于独立开发和维护。
 
 Update Log
 ---
 ```
+2.0.0: 支持泛型返回值,支持响应式处理回调函数。
 1.0.7: 修复系统类参数传递异常。
 1.0.6: 修复一些已知问题。
 1.0.5: 支持数组类型参数和可变参数。
@@ -168,6 +169,11 @@ public class MainModule implements IRouter {
     public void throwError(VPromise promise) {
         promise.reject(new RouterRemoteException("I'm error................."));
     }
+    
+    @RouterPath("/reactive")
+    public void reactive(VPromise promise) {
+        promise.resolve("I'm from reactive!!!!!");
+    }
 }
 
 //支持接收多scheme
@@ -209,6 +215,38 @@ AndroidRouter.open("android://main/activity/localActivity")
 //方式三
 //阻塞式拿返回值
 Object value = AndroidRouter.open("android://main/getValue").getValue();
+
+//方式四:响应式处理
+AndroidRouter.open("android://main/reactive")
+    .call(new Func<String, Integer>() {
+        @Override
+        public Integer call(String s) {
+            return 1;
+        }
+    })
+    .then(new Func<Integer, Double>() {
+        @Override
+        public Double call(Integer integer) {
+            return 2.0;
+        }
+    })
+    .then(new Func<Double, String>() {
+        @Override
+        public String call(Double ddouble) {
+            return "I'm reactive!";
+        }
+    })
+    .done(new Resolve<String>() {
+        @Override
+        public void call(String result) {
+            title.setText(result);
+        }
+    }, new Reject() {
+        @Override
+        public void call(Exception e) {
+            title.setText(e.toString());
+        }
+    });
 ```
 ###混淆
 ```

androidrouter/gradle.properties

@@ -4,7 +4,7 @@ GROUP_ID=com.library.tangxiaolv
 #must be the same as MODULE name
 ARTIFACT_ID=androidrouter
 #publicVersion
-PUBLIC_VERSION=1.0.7
+PUBLIC_VERSION=2.0.0
 #jcenter repo library Name
 LIBRARY_NAME=androidrouter
 #library description

androidrouter/src/main/java/com/tangxiaolv/router/AndroidRouter.java

@@ -3,6 +3,8 @@
 
 import android.text.TextUtils;
 
+import com.tangxiaolv.router.operators.CPromise;
+
 import java.util.List;
 import java.util.Map;
 
@@ -20,9 +22,9 @@ public final class AndroidRouter {
      * @param url scheme://host/path?params=json
      * @return {@link CPromise}
      */
-    public static CPromise open(String url) {
+    public static <R> CPromise<R> open(String url) {
         Promise promise = new Promise(new Asker(url));
-        return new CPromise(promise);
+        return new CPromise<>(promise);
     }
 
     /**
@@ -33,9 +35,9 @@ public static CPromise open(String url) {
      * @param path   The path of protocol
      * @return {@link CPromise}
      */
-    public static CPromise open(String scheme, String host, String path) {
+    public static <R> CPromise<R> open(String scheme, String host, String path) {
         Promise promise = new Promise(new Asker(scheme, host, path, null));
-        return new CPromise(promise);
+        return new CPromise<>(promise);
     }
 
     /**
@@ -47,9 +49,9 @@ public static CPromise open(String scheme, String host, String path) {
      * @param params The jsonObject params of protocol
      * @return {@link CPromise}
      */
-    public static CPromise open(String scheme, String host, String path, Map<String, Object> params) {
+    public static <R> CPromise<R> open(String scheme, String host, String path, Map<String, Object> params) {
         Promise promise = new Promise(new Asker(scheme, host, path, params));
-        return new CPromise(promise);
+        return new CPromise<>(promise);
     }
 
     /**
@@ -61,9 +63,9 @@ public static CPromise open(String scheme, String host, String path, Map<String,
      * @param params The jsonArray params of protocol
      * @return {@link CPromise}
      */
-    public static CPromise open(String scheme, String host, String path, List params) {
+    public static <R> CPromise<R> open(String scheme, String host, String path, List params) {
         Promise promise = new Promise(new Asker(scheme, host, path, params));
-        return new CPromise(promise);
+        return new CPromise<>(promise);
     }
 
     /**
@@ -72,12 +74,12 @@ public static CPromise open(String scheme, String host, String path, List params
      * @param scheme The scheme of protocol
      * @param host   The host of protocol
      * @param path   The path of protocol
-     * @param json The json params of protocol
+     * @param json   The json params of protocol
      * @return {@link CPromise}
      */
-    public static CPromise open(String scheme, String host, String path, String json) {
+    public static <R> CPromise<R> open(String scheme, String host, String path, String json) {
         Promise promise = new Promise(new Asker(scheme, host, path, json));
-        return new CPromise(promise);
+        return new CPromise<>(promise);
     }
 
     /**

androidrouter/src/main/java/com/tangxiaolv/router/Asker.java

@@ -1,20 +1,19 @@
 
 package com.tangxiaolv.router;
 
-import java.lang.reflect.Method;
-import java.net.URLDecoder;
+import android.net.Uri;
+import android.text.TextUtils;
 
 import com.tangxiaolv.router.exceptions.NotFoundRouterException;
 import com.tangxiaolv.router.exceptions.RouterException;
 import com.tangxiaolv.router.interfaces.IMirror;
-import com.tangxiaolv.router.utils.RLog;
 import com.tangxiaolv.router.utils.ReflectTool;
 
-import android.net.Uri;
-import android.text.TextUtils;
-
 import org.json.JSONException;
 
+import java.lang.reflect.Method;
+import java.net.URLDecoder;
+
 /**
  * Parse url and invoke {@link IMirror}
  */