chore:修改示例工程代码

wangshuwen · wangshuwen · commit 75ffc7063b8f · 2020-10-28T13:43:44.000+08:00
diff --git a/app/src/main/java/cn/cheney/app/AlertUtil.java b/app/src/main/java/cn/cheney/app/AlertUtil.java
@@ -0,0 +1,16 @@
+package cn.cheney.app;
+
+import android.content.Context;
+
+import androidx.appcompat.app.AlertDialog;
+
+public class AlertUtil {
+
+    public static void showAlert(Context context,String msg) {
+        new AlertDialog.Builder(context)
+                .setTitle("Result")
+                .setMessage(msg)
+                .create()
+                .show();
+    }
+}
diff --git a/app/src/main/java/cn/cheney/app/HomeActivity.java b/app/src/main/java/cn/cheney/app/HomeActivity.java
@@ -13,7 +13,7 @@
 import cn.cheney.xrouter.annotation.XRoute;
 import cn.cheney.xrouter.core.XRouter;
 
-@XRoute(path = "page", module = "home")
+@XRoute(path = "page", module = "moduleB")
 public class HomeActivity extends AppCompatActivity {
 
     public static final String TAG = HomeActivity.class.getSimpleName();
diff --git a/app/src/main/java/cn/cheney/app/MainActivity.java b/app/src/main/java/cn/cheney/app/MainActivity.java
@@ -13,9 +13,9 @@
 import java.util.List;
 import java.util.Map;
 
-import cn.cheney.xrouter.core.callback.RouteCallback;
 import cn.cheney.xrouter.core.XRouter;
 import cn.cheney.xrouter.core.call.MethodCall;
+import cn.cheney.xrouter.core.callback.RouteCallback;
 import cn.cheney.xrouter.core.util.Logger;
 
 public class MainActivity extends AppCompatActivity {
@@ -24,88 +24,87 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
         findViewById(R.id.btn1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 List<String> infoList = new ArrayList<>();
                 infoList.add("value");
-
-                Map<String,String> map = new HashMap<>();
-                map.put("key","value");
-
-                Integer requestCode = XRouter.page("home/page")
+                Map<String, String> map = new HashMap<>();
+                map.put("key", "value");
+                Integer requestCode = XRouter.page("moduleA/page")
                         .put("infoList", infoList)
                         .put("infoMap", map)
                         .action("cn.cheney.xrouter")
                         .anim(R.anim.enter_bottom, R.anim.exit_bottom)
                         .requestCode(1000)
                         .call();
+
                 Logger.d("Route Page requestCode= " + requestCode);
             }
         });
+
         findViewById(R.id.btn2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Book book = new Book();
                 book.name = "Kotlin";
                 MethodCall<Book> bookMethodCall = XRouter.<Book>method(
-                        "home/getBookName?book={\"name\":\"Kotlin\"}");
+                        "moduleA/getBookName");
                 Book bookReturn = bookMethodCall.call();
-                Logger.d("getSyncBookName bookReturn= " + bookReturn
-                        + " isAsync=" + bookMethodCall.isAsync());
+                AlertUtil.showAlert(MainActivity.this, bookReturn.toString());
             }
         });
+
+
         findViewById(R.id.btn3).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Book book = new Book();
                 book.name = "Kotlin";
-                final MethodCall<Book> methodCall = XRouter.<Book>method("home/getAsyncBookName")
+                final MethodCall<Book> methodCall = XRouter.<Book>method("moduleA/getAsyncBookName")
                         .put("book", book);
                 methodCall.call(new RouteCallback() {
                     @Override
                     public void onResult(Map<String, Object> result) {
-                        Logger.d("getAsyncBookName bookReturn= "
-                                + result + " isAsync=" + methodCall.isAsync());
+                        AlertUtil.showAlert(MainActivity.this, result.toString());
                     }
                 });
             }
         });
         findViewById(R.id.btn4).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Book book = new Book();
-                book.name = "Kotlin";
-                Book bookError = XRouter.<Book>method(null)
-                        .put("book", book)
-                        .call(new RouteCallback() {
-                            @Override
-                            public void onResult(Map<String, Object> result) {
-                                Logger.d("Error  bookReturn= " + result);
-                            }
-                        });
-                Logger.d(" bookError= " + bookError);
+                XRouter.<Void>method("moduleA/setBookInfo?info={\"key\":{\"name\":\"wang\"}}")
+                        .call(MainActivity.this);
             }
         });
+
         findViewById(R.id.btn5).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Book book = new Book();
                 book.name = "Kotlin";
-                Integer requestCode = XRouter.page("test/page1")
-                        .action("cn.cheney.xrouter")
+                Integer requestCode = XRouter.page("moduleD/page1")
+                        //.action("cn.cheney.xrouter")
                         .anim(R.anim.enter_bottom, R.anim.exit_bottom)
                         .requestCode(1000)
                         .call();
-
                 Logger.d("Route test Module page1 requestCode= " + requestCode);
             }
         });
+
         findViewById(R.id.btn6).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                XRouter.method("home/setBookInfo?info={\"key\":{\"name\":\"wang\"}}")
-                        .call();
+                Book bookError = XRouter.<Book>method("sssss")
+                        .call(new RouteCallback() {
+                            @Override
+                            public void onResult(Map<String, Object> result) {
+                                AlertUtil.showAlert(MainActivity.this, "错误异步返回结果=" + result);
+                            }
+                        });
+                AlertUtil.showAlert(MainActivity.this, "错误同步返回结果=" + bookError);
             }
         });
     }
diff --git a/app/src/main/java/cn/cheney/app/ModuleA.java b/app/src/main/java/cn/cheney/app/ModuleA.java
@@ -13,10 +13,10 @@
 import cn.cheney.xrouter.annotation.XRoute;
 import cn.cheney.xrouter.core.XRouter;
 
-@XRoute(module = "home")
-public class HomeMethod {
+@XRoute(module = "moduleA")
+public class ModuleA {
 
-    private static final String TAG = HomeMethod.class.getSimpleName();
+    private static final String TAG = ModuleA.class.getSimpleName();
 
     @XMethod(name = "getBookName")
     public static Book getBookName(Context context) {
@@ -35,12 +35,14 @@ public static void getAsyncBookName(@XParam(name = XParam.RequestId) String requ
         XRouter.getInstance().invokeCallback(requestId, map);
     }
 
+
     @XMethod(name = "setBookInfo")
-    public static List<String> setBookInfo(@XParam(name = "info") Map<String, Object> info) {
-        for (Map.Entry<String, Object> entry : info.entrySet()) {
-            Object book = entry.getValue();
+    public static List<String> setBookInfo(Context context, @XParam(name = "info") Map<String, Book> info) {
+        for (Map.Entry<String, Book> entry : info.entrySet()) {
+            Book book = entry.getValue();
             Log.i(TAG, "setBookInfo  KEY:" + entry.getKey() + "|VALUE:" + book);
         }
+        AlertUtil.showAlert(context, "传参 =" + info);
         return new ArrayList<>();
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -29,21 +29,18 @@
         android:id="@+id/btn4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="错误协议调用" />
-
+        android:text="MAP泛型 传参" />
 
     <Button
         android:id="@+id/btn5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="跨模块调用Test Page1" />
 
-
-
     <Button
         android:id="@+id/btn6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="MAP 传参" />
+        android:text="错误协议调用" />
+</LinearLayout>
 
-</LinearLayout>
diff --git a/m_test/src/main/java/cn/cheney/mtest/AlertUtil.java b/m_test/src/main/java/cn/cheney/mtest/AlertUtil.java
@@ -0,0 +1,16 @@
+package cn.cheney.mtest;
+
+import android.content.Context;
+
+import androidx.appcompat.app.AlertDialog;
+
+public class AlertUtil {
+
+    public static void showAlert(Context context,String msg) {
+        new AlertDialog.Builder(context)
+                .setTitle("Result")
+                .setMessage(msg)
+                .create()
+                .show();
+    }
+}
diff --git a/m_test/src/main/java/cn/cheney/mtest/TestActivity.java b/m_test/src/main/java/cn/cheney/mtest/TestActivity.java
@@ -8,9 +8,8 @@
 
 import cn.cheney.xrouter.annotation.XRoute;
 import cn.cheney.xrouter.core.XRouter;
-import cn.cheney.xrouter.core.util.Logger;
 
-@XRoute(path = "page1", module = "test")
+@XRoute(path = "page1", module = "moduleD")
 public class TestActivity extends Activity {
 
 
@@ -21,9 +20,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         findViewById(R.id.btn1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Object bookReturn = XRouter.method("home/getBookName2")
+                Object bookReturn = XRouter.method("moduleA/getBookName")
                         .call();
-                Logger.d("getSyncBookName bookReturn= " + bookReturn);
+                AlertUtil.showAlert(TestActivity.this, "" + bookReturn);
             }
         });
     }
diff --git a/m_test/src/main/java/cn/cheney/mtest/TestModule.java b/m_test/src/main/java/cn/cheney/mtest/TestModule.java
@@ -3,8 +3,8 @@
 import cn.cheney.xrouter.annotation.XMethod;
 import cn.cheney.xrouter.annotation.XRoute;
 
-@XRoute(module = "test")
-public class TestMethod {
+@XRoute(module = "moduleC")
+public class TestModule {
 
     @XMethod(name = "getBookName")
     public static String getBookName() {
diff --git a/m_test/src/main/res/layout/mtest_activity_1.xml b/m_test/src/main/res/layout/mtest_activity_1.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:text="测试module点击调用app模块方法"
+        android:text="调用AppModule方法"
         android:textSize="20sp"
         android:textStyle="bold" />
 
diff --git a/xrouter_core/src/main/java/cn/cheney/xrouter/core/invok/ParamInfo.java b/xrouter_core/src/main/java/cn/cheney/xrouter/core/invok/ParamInfo.java
@@ -1,9 +1,6 @@
 package cn.cheney.xrouter.core.invok;
 
-import com.alibaba.fastjson.TypeReference;
-
 import java.lang.reflect.Type;
-import java.util.Map;
 
 public class ParamInfo {
 
@@ -13,7 +10,6 @@ public class ParamInfo {
     public ParamInfo(String name, Type type) {
         this.name = name;
         this.type = type;
-        this.type = new TypeReference<Map<String, Object>>(){}.getType();
     }
 
     public String getName() {
