feat:更换路由表的加载方式&&一次性加载

Author: wangshuwen15222

.gitignore

@@ -7,3 +7,4 @@
 /captures
 .externalNativeBuild
 .cxx
+/repo

app/src/main/java/cn/cheney/app/MainActivity.java

@@ -16,7 +16,6 @@
 import cn.cheney.mtest.entity.Book;
 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 {
@@ -59,14 +58,10 @@ protected void onCreate(Bundle savedInstanceState) {
                     AlertUtil.showAlert(MainActivity.this, result.toString()));
         });
 
+
         findViewById(R.id.btn4).setOnClickListener(v -> {
             Book bookError = XRouter.<Book>method("sssss")
-                    .call(new RouteCallback() {
-                        @Override
-                        public void onResult(Map<String, Object> result) {
-                            AlertUtil.showAlert(MainActivity.this, "错误异步返回结果=" + result);
-                        }
-                    });
+                    .call(result -> AlertUtil.showAlert(MainActivity.this, "错误异步返回结果=" + result));
             AlertUtil.showAlert(MainActivity.this, "错误同步返回结果=" + bookError);
         });
     }

app/src/main/java/cn/cheney/app/XRouter$$Module$$All.java

@@ -0,0 +1 @@
+b8f6b17bfb073570ca65275bc8e26c7f

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.jar

@@ -0,0 +1 @@
+6de9d445f57b5e970bad02c00078704a0dbe7bbd

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.jar.md5

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cn.cheney.plugin</groupId>
+  <artifactId>xrouter</artifactId>
+  <version>1.0.1</version>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle</artifactId>
+      <version>3.3.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>15.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.jar.sha1

@@ -0,0 +1 @@
+bd1d4aea195f1f6c92b66881dd17909b

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.pom

@@ -0,0 +1 @@
+42f5f9fe2e7e560c181bcefe364354721b246dfe

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.pom.md5

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>cn.cheney.plugin</groupId>
+  <artifactId>xrouter</artifactId>
+  <versioning>
+    <release>1.0.1</release>
+    <versions>
+      <version>1.0.1</version>
+    </versions>
+    <lastUpdated>20210826031336</lastUpdated>
+  </versioning>
+</metadata>

repo/cn/cheney/plugin/xrouter/1.0.1/xrouter-1.0.1.pom.sha1

@@ -0,0 +1 @@
+68e35268c30d8d9f179524fab5ed29e3

repo/cn/cheney/plugin/xrouter/maven-metadata.xml

@@ -0,0 +1 @@
+b5ab7745b59a0e938646eee5df42306deac5713e

repo/cn/cheney/plugin/xrouter/maven-metadata.xml.md5

@@ -2,11 +2,11 @@
 
 public interface GenerateFileConstant {
 
-    String MODULE_FILE_PREFIX = "XRoute$$Module$$";
+    String ROUTER_PACKAGE_NAME = "cn.cheney.xrouter";
 
-    String PARAM_FILE_PREFIX = "XRoute$$XParam$$";
+    String MODULE_FILE_PREFIX = "XRouterModule_";
 
-    String MODULE_CLASS_PREFIX = "cn.cheney.xrouter." + MODULE_FILE_PREFIX;
+    String PARAM_FILE_PREFIX = "XRouterXParam_";
 
     String WARNING_TIPS = "DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY XROUTER.";
 

repo/cn/cheney/plugin/xrouter/maven-metadata.xml.sha1

@@ -13,9 +13,9 @@ java {
 }
 
 dependencies {
-    if(debug == "true"){
+    if (debug == "true") {
         implementation project(":xrouter_annotation")
-    }else {
+    } else {
         implementation "io.github.wangshuwen1107:xrouter-annotation:$sdkVersion"
     }
     compileOnly 'com.google.auto.service:auto-service-annotations:1.0-rc7'

xrouter_annotation/src/main/java/cn/cheney/xrouter/constant/GenerateFileConstant.java

@@ -23,12 +23,10 @@ public class XTypeMirror {
     public static final String CONTEXT = "android.content.Context";
     //XRouter
     public static final String CALLBACK = "cn.cheney.xrouter.core.RouteCallback";
-    public static final String BASE_MODULE = "cn.cheney.xrouter.core.module.BaseModule";
     public static final String INVOKABLE = "cn.cheney.xrouter.core.invok.Invokable";
     public static final String ACTIVITY_INVOKE = "cn.cheney.xrouter.core.invok.ActivityInvoke";
     public static final String SYRINGE = "cn.cheney.xrouter.core.syringe.Syringe";
     public static final String PARAM_INFO = "cn.cheney.xrouter.core.invok.ParamInfo";
-
     //ClassName
     public static final ClassName CLASSNAME_TYPE_REFERENCE = ClassName.get("com.alibaba.fastjson",
             "TypeReference");

xrouter_compiler/build.gradle

@@ -33,13 +33,13 @@
 
 public class ModuleClassGenerator {
 
-    private String generatorClassName;
+    private final String generatorClassName;
 
-    private String module;
+    private final String module;
 
-    private XRouterProcessor.Holder holder;
+    private final XRouterProcessor.Holder holder;
 
-    private MethodSpec.Builder loadMethodBuilder;
+    private final MethodSpec.Builder loadMethodBuilder;
 
 
     public ModuleClassGenerator(String module, XRouterProcessor.Holder holder) {
@@ -53,19 +53,12 @@ public ModuleClassGenerator(String module, XRouterProcessor.Holder holder) {
      * 最后生产java文件
      */
     public void generateJavaFile() {
-        TypeMirror baseModuleType = holder.elementUtils
-                .getTypeElement(XTypeMirror.BASE_MODULE).asType();
-
         TypeSpec typeSpec = TypeSpec.classBuilder(generatorClassName)
-                .superclass(TypeName.get(baseModuleType))
                 .addJavadoc(GenerateFileConstant.WARNING_TIPS)
                 .addModifiers(Modifier.PUBLIC)
                 .addMethod(loadMethodBuilder.build())
-                .addMethod(getNameMethodBuilder.addStatement("return $S", module)
-                        .build())
                 .build();
-
-        JavaFile javaFile = JavaFile.builder("cn.cheney.xrouter", typeSpec)
+        JavaFile javaFile = JavaFile.builder(GenerateFileConstant.ROUTER_PACKAGE_NAME, typeSpec)
                 .build();
         try {
             javaFile.writeTo(holder.filer);
@@ -82,23 +75,15 @@ private MethodSpec.Builder loadMethodBuilder() {
                 get(XTypeMirror.CLASSNAME_INVOKABLE, TypeVariableName.get("?"));
         return MethodSpec.methodBuilder("load")
                 .addModifiers(Modifier.PUBLIC)
+                .addModifiers(Modifier.STATIC)
                 .returns(TypeName.VOID)
-                .addAnnotation(Override.class)
                 .addParameter(ParameterizedTypeName.get(
                         ClassName.get(Map.class),
                         ClassName.get(String.class),
                         methodInvokableType),
                         "routeMap");
     }
 
-    /**
-     * public String getName() {return "home";}
-     */
-    private MethodSpec.Builder getNameMethodBuilder = MethodSpec.methodBuilder("getName")
-            .addModifiers(Modifier.PUBLIC)
-            .returns(String.class)
-            .addAnnotation(Override.class);
-
 
     /**
      * routeMap.put("/test2",new MethodInvoke() or new ActivityInvoke());
@@ -142,7 +127,7 @@ private void addActivityInvoke(TypeElement activityType, String path) {
         paramsInfoSeg.append("$L.put($S,new $T($T.ACTIVITY,$T.class,$S,$S");
 
         paramsInfoSegList.add("routeMap");
-        paramsInfoSegList.add(path);
+        paramsInfoSegList.add(module + "/" + path);
         paramsInfoSegList.add(typeActivityInvoke);
         paramsInfoSegList.add(RouteType.class);
         paramsInfoSegList.add(activityType);
@@ -258,7 +243,7 @@ private void addMethodInvoke(TypeElement classType, ExecutableElement methodElem
                 .addSuperinterface(methodInvokableType)
                 .addMethod(invokeBuilder.build())
                 .build();
-        loadMethodBuilder.addStatement("$L.put($S,$L)", "routeMap", xMethod.name(), methodInvoke);
+        loadMethodBuilder.addStatement("$L.put($S,$L)", "routeMap", module + "/" + xMethod.name(), methodInvoke);
     }
 
 

xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/contant/XTypeMirror.java

@@ -2,14 +2,15 @@
 
 import android.app.Activity;
 import android.app.Application;
-import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,7 +25,6 @@
 import cn.cheney.xrouter.core.interceptor.RouterInterceptor;
 import cn.cheney.xrouter.core.invok.Invokable;
 import cn.cheney.xrouter.core.invok.ParamInfo;
-import cn.cheney.xrouter.core.module.RouteModuleManager;
 import cn.cheney.xrouter.core.parser.DefaultParser;
 import cn.cheney.xrouter.core.parser.ParamParser;
 import cn.cheney.xrouter.core.syringe.Syringe;
@@ -36,6 +36,8 @@ public class XRouter {
 
     private static final String DEFAULT_SCHEME = "xrouter";
 
+    private static final String ROUTER_LOAD_CLASS = "cn.cheney.xrouter.XRouterModule_Loader";
+
     public static String sScheme = DEFAULT_SCHEME;
 
     private static WeakReference<Activity> sTopActivityRf;
@@ -44,18 +46,17 @@ public class XRouter {
 
     private static boolean hasInit;
 
-    private final RouteModuleManager mRouteModules;
+    private final static Map<String, Invokable<?>> sRouterMap = new HashMap<>();
 
     private final SyringeManager mSyringeManager;
 
     private final List<RouterInterceptor> mInterceptorList;
 
-    private final ParamParser paramParser = new DefaultParser();
+    private final ParamParser mParamParser = new DefaultParser();
 
     private RouterErrorHandler mErrorHandler;
 
     private XRouter() {
-        mRouteModules = new RouteModuleManager();
         mInterceptorList = new ArrayList<>();
         mSyringeManager = new SyringeManager();
     }
@@ -86,9 +87,20 @@ public void onActivityResumed(@NonNull Activity activity) {
         if (!TextUtils.isEmpty(scheme)) {
             sScheme = scheme;
         }
+        loadRouters();
         hasInit = true;
     }
 
+    private static void loadRouters() {
+        try {
+            Class<?> loadClass = Class.forName(ROUTER_LOAD_CLASS);
+            Method loadInto = loadClass.getMethod("loadInto", Map.class);
+            loadInto.invoke(null, sRouterMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public void inject(Activity activity) {
         if (null == activity) {
             Logger.e("inject activity not null");
@@ -126,10 +138,10 @@ public void setErrorHandler(RouterErrorHandler errorHandler) {
         this.mErrorHandler = errorHandler;
     }
 
-    public Object proceed(Context context, BaseCall<?> call) {
+    public Object proceed(BaseCall<?> call) {
         addInterceptor(new BuildInvokeInterceptor());
         RealChain realChain = new RealChain(call, mInterceptorList);
-        return realChain.proceed(context, call);
+        return realChain.proceed(call);
     }
 
     public void onError(String url, String errorMsg) {
@@ -142,23 +154,22 @@ public Activity getTopActivity() {
         return sTopActivityRf.get();
     }
 
-    public RouteModuleManager getRouteModules() {
-        return mRouteModules;
+
+    public static Map<String, Invokable<?>> getRouterMap() {
+        return sRouterMap;
     }
 
     public Object parse(BaseCall<?> call, String paramName, String paramValue) {
-        Invokable<?> invokable = XRouter.getInstance().getRouteModules().getInvokable(call.getModule(),
-                call.getPath());
-        if (null == invokable
-                || TextUtils.isEmpty(paramName)) {
+        Invokable<?> invokable = sRouterMap.get(call.getModule() + "/" + call.getPath());
+        if (null == invokable || TextUtils.isEmpty(paramName)) {
             return paramValue;
         }
         List<ParamInfo> params = invokable.getParams();
         for (ParamInfo param : params) {
             if (paramName.equals(param.getName())) {
                 Object parseObject = null;
                 try {
-                    parseObject = paramParser.parse(paramName, paramValue, param.getType());
+                    parseObject = mParamParser.parse(paramName, paramValue, param.getType());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

xrouter_compiler/src/main/java/cn/cheney/xrouter/compiler/generator/ModuleClassGenerator.java

@@ -16,6 +16,7 @@ public abstract class BaseCall<R> {
     private String module;
     private String path;
     private Uri uri;
+    protected Context context;
     Map<String, Object> paramsMap = new HashMap<>();
 
     BaseCall(String uriStr) {
@@ -58,6 +59,9 @@ private void parseUri(String uriStr) {
         rebuild();
     }
 
+    public Context getContext() {
+        return context;
+    }
 
     private void rebuild() {
         this.module = uri.getHost();

xrouter_core/src/main/java/cn/cheney/xrouter/core/XRouter.java

@@ -31,13 +31,14 @@ public R call(Context context, RouteCallback callback) {
         if (context == null) {
             context = XRouter.getInstance().getTopActivity();
         }
+        this.context = context;
         this.paramsMap.put(XParam.Context, context);
         if (null != callback) {
             String requestId = RequestManager.getInstance().generateRequestId();
             this.paramsMap.put(XParam.RequestId, requestId);
             RequestManager.getInstance().addCallback(requestId, callback);
         }
-        R result = (R) XRouter.getInstance().proceed(context, this);
+        R result = (R) XRouter.getInstance().proceed(this);
         if (null == result) {
             if (null != callback) {
                 callback.onResult(null);

xrouter_core/src/main/java/cn/cheney/xrouter/core/call/BaseCall.java

@@ -60,7 +60,8 @@ public Integer call() {
     }
 
     public Integer call(Context context) {
-        return (Integer) XRouter.getInstance().proceed(context, this);
+        this.context = context;
+        return (Integer) XRouter.getInstance().proceed(this);
     }
 
 }