add BaseCompRouter

Author: mrzhang

URI设计.md

@@ -15,6 +15,12 @@ android {
             enabled = true
         }
 
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [host: "app"]
+            }
+        }
+
     }
     buildTypes {
         release {
@@ -31,7 +37,7 @@ android {
 
 dependencies {
     compile project(':componentservice')
-//    annotationProcessor project(':router-anno-compiler')
+    annotationProcessor project(':router-anno-compiler')
 }
 
 combuild {

app/build.gradle

@@ -1,15 +1,19 @@
 package com.luojilab.componentdemo;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
 
 import com.luojilab.component.componentlib.router.Router;
 import com.luojilab.componentservice.readerbook.ReadBookService;
+import com.luojilab.router.facade.annotation.RouteNode;
 
+@RouteNode(host = "app", path = "/main")
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
     Fragment fragment;
@@ -57,4 +61,13 @@ public void onClick(View v) {
                 break;
         }
     }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (data != null) {
+            Toast.makeText(this, data.getStringExtra("result"), Toast.LENGTH_SHORT).show();
+        }
+    }
 }

app/src/main/java/com/luojilab/componentdemo/MainActivity.java

@@ -2,6 +2,8 @@
 
 import android.app.Application;
 
+import com.luojilab.component.componentlib.router.ui.UIRouter;
+
 /**
  * Created by mrzhang on 2017/6/15.
  */
@@ -12,6 +14,8 @@ public class AppApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
+        UIRouter.getInstance().registerUI("app");
+
         //如果isRegisterCompoAuto为false，则需要通过反射加载组件
 //        Router.registerComponent("com.luojilab.reader.applike.ReaderAppLike");
 //        Router.registerComponent("com.luojilab.share.applike.ShareApplike");

app/src/main/java/com/luojilab/componentdemo/application/AppApplication.java

@@ -4,6 +4,7 @@
  * Created by mrzhang on 2017/12/19.
  */
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -15,11 +16,22 @@
 import java.util.Map;
 
 public class BaseCompRouter implements IComponentRouter {
-    protected static Map<String, Class> routeMapper = new HashMap<String, Class>();
+    protected Map<String, Class> routeMapper = new HashMap<String, Class>();
 
-    protected static Map<Class, Map<String, Integer>> paramsMapper;
+    protected Map<Class, Map<String, Integer>> paramsMapper = new HashMap<>();
 
-    protected static String HOST = "";
+    protected String HOST = "";
+
+    protected boolean hasInitHost = false;
+    protected boolean hasInitMap = false;
+
+    protected void initHost() {
+        hasInitHost = true;
+    }
+
+    protected void initMap() {
+        hasInitMap = true;
+    }
 
     @Override
     public boolean openUri(Context context, String url, Bundle bundle) {
@@ -44,6 +56,9 @@ public boolean openUri(Context context, String url, Bundle bundle, Integer reque
 
     @Override
     public boolean openUri(Context context, Uri uri, Bundle bundle, Integer requestCode) {
+        if (!hasInitMap) {
+            initMap();
+        }
         if (uri == null || context == null) {
             return true;
         }
@@ -64,8 +79,8 @@ public boolean openUri(Context context, Uri uri, Bundle bundle, Integer requestC
             com.luojilab.component.componentlib.utils.UriUtils.setBundleValue(bundle, params, paramsType);
             Intent intent = new Intent(context, target);
             intent.putExtras(bundle);
-            if (requestCode > 0 && context instanceof android.app.Activity) {
-                ((android.app.Activity) context).startActivityForResult(intent, requestCode);
+            if (requestCode > 0 && context instanceof Activity) {
+                ((Activity) context).startActivityForResult(intent, requestCode);
                 return true;
             }
             context.startActivity(intent);
@@ -76,10 +91,19 @@ public boolean openUri(Context context, Uri uri, Bundle bundle, Integer requestC
 
     @Override
     public boolean verifyUri(Uri uri) {
+        if (!hasInitHost) {
+            initHost();
+        }
         String host = uri.getHost();
+        if (!HOST.equals(host)) {
+            return false;
+        }
+        if (!hasInitMap) {
+            initMap();
+        }
         List<String> pathSegments = uri.getPathSegments();
         String path = "/" + TextUtils.join("/", pathSegments);
-        return HOST.equals(host) && routeMapper.containsKey(path);
+        return routeMapper.containsKey(path);
     }
 }
 

componentlib/src/main/java/com/luojilab/component/componentlib/router/UiActivityUri.java

@@ -8,7 +8,7 @@
  * router behaviors for component type
  * Created by mrzhang on 2017/6/20.
  */
-public  interface IComponentRouter {
+public interface IComponentRouter {
 
     /**
      * 打开一个链接

componentlib/src/main/java/com/luojilab/component/componentlib/router/ui/BaseCompRouter.java

@@ -83,7 +83,7 @@ public static int parseInt(String src, int defaultValue) {
     }
 
     public static void setBundleValue(Bundle bundle, Map<String, String> params, Map<String, Integer> paramsType) {
-        if (!paramsType.isEmpty() && !params.isEmpty()) {
+        if (paramsType != null && params != null && !paramsType.isEmpty() && !params.isEmpty()) {
             for (Map.Entry<String, Integer> param : paramsType.entrySet()) {
                 UriUtils.setBundleValue(bundle, param.getValue(), param.getKey(), params.get(param.getKey()));
             }

componentlib/src/main/java/com/luojilab/component/componentlib/router/ui/IComponentRouter.java

@@ -11,6 +11,12 @@ android {
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [host: "reader"]
+            }
+        }
+
     }
 
     buildTypes {
@@ -32,7 +38,7 @@ android {
 dependencies {
     compile project(':componentservice')
     compile fileTree(include: ['*.jar'], dir: 'libs')
-
+    annotationProcessor project(':router-anno-compiler')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })

componentlib/src/main/java/com/luojilab/component/componentlib/utils/UriUtils.java

@@ -20,6 +20,8 @@ public class ReaderFragment extends Fragment {
 
     private View rootView;
 
+    private final static int REQUEST_CODE = 7777;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -28,14 +30,27 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
             rootView = inflater.inflate(R.layout.readerbook_fragment_reader, container,
                     false);
 
-            rootView.findViewById(R.id.tv_content).setOnClickListener(new View.OnClickListener() {
+            rootView.findViewById(R.id.tv_1).setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    goToShareActivityWithBundle();
+                }
+            });
+            rootView.findViewById(R.id.tv_2).setOnClickListener(new View.OnClickListener() {
 
                 @Override
                 public void onClick(View v) {
                     goToShareActivityWithUri();
                 }
             });
+            rootView.findViewById(R.id.tv_3).setOnClickListener(new View.OnClickListener() {
 
+                @Override
+                public void onClick(View v) {
+                    goToShareActivityForResult();
+                }
+            });
 
         }
         return rootView;
@@ -49,16 +64,16 @@ private void goToShareActivityWithBundle() {
         Bundle bundle = new Bundle();
         bundle.putString("bookName", "Gone with the Wind");
         bundle.putString("author", JsonService.Factory.getInstance().create().toJsonString(author));
-        UIRouter.getInstance().openUri(getActivity(), "dunb://share/shareBook", bundle);
+        UIRouter.getInstance().openUri(getActivity(), "DDComp://share/shareBook", bundle);
     }
 
     // UI transfer with URI
     private void goToShareActivityWithUri() {
         Author author = new Author();
-        author.setName("Margaret Mitchell");
-        author.setCounty("USA");
+        author.setName("Barack Obama");
+        author.setCounty("New York");
         UIRouter.getInstance().openUri(getActivity(),
-                "dunb://share/shareBook?bookName=Gone with the Wind&author="
+                "DDComp://share/shareMagazine?bookName=NYTIME&author="
                         + JsonService.Factory.getInstance().create().toJsonString(author), null);
     }
 
@@ -68,8 +83,8 @@ private void goToShareActivityForResult() {
         author.setName("Margaret Mitchell");
         author.setCounty("USA");
         UIRouter.getInstance().openUri(getActivity(),
-                "dunb://share/shareBook?bookName=Gone with the Wind&author="
-                        + JsonService.Factory.getInstance().create().toJsonString(author), null);
+                "DDComp://share/shareBook?bookName=Gone with the Wind&author="
+                        + JsonService.Factory.getInstance().create().toJsonString(author), null, REQUEST_CODE);
     }
 
 }