fix: 重构问题修复

Author: wzbos

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.3.72'
+        kotlin_version = '1.4.0'
         ANDROID_COMPILE_SDK = 28
         ANDROID_MIN_SDK = 16
         ANDROID_TARGET_SDK = 28
@@ -19,7 +19,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

gradle.properties

@@ -18,7 +18,7 @@ siteUrl=https://github.com/wzbos/Android-Rudolph-Router
 gitUrl=https://github.com/wzbos/Android-Rudolph-Router.git
 licenseName=The Apache Software License, Version 2.0
 licenseUrl=http://www.apache.org/licenses/LICENSE-2.0.txt
-rudolph_version=2.0.0-rc1
+rudolph_version=2.0.1
 developerId=wzbos
 developerName=zongbo.wu
 developerEmail=sckoo@163.com

rudolph-compiler/build.gradle

@@ -18,8 +18,6 @@ compileJava {
 
 dependencies {
     implementation 'com.squareup:javapoet:1.11.1'
-    implementation 'com.google.auto.service:auto-service-annotations:1.0-rc7'
-    kapt 'com.google.auto.service:auto-service:1.0-rc7'
     implementation 'org.apache.commons:commons-lang3:3.5'
     implementation 'org.apache.commons:commons-collections4:4.1'
     implementation project(':rudolph-annotations')

rudolph-compiler/src/main/java/cn/wzbos/android/rudolph/RudolphProcessor.kt

@@ -6,7 +6,6 @@ import cn.wzbos.android.rudolph.annotations.Component
 import cn.wzbos.android.rudolph.annotations.Export
 import cn.wzbos.android.rudolph.annotations.Extra
 import cn.wzbos.android.rudolph.annotations.Route
-import com.google.auto.service.AutoService
 import com.squareup.javapoet.*
 import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.lang3.StringUtils
@@ -28,7 +27,6 @@ import javax.tools.StandardLocation
  * Router Processor
  * Created by wuzongbo on 2017/5/30.
  */
-@AutoService(Processor::class)
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes(Constant.ANNOTATION_TYPE_ROUTE, Constant.ANNOTATION_TYPE_COMPONENT)
 class RudolphProcessor : AbstractProcessor() {
@@ -54,7 +52,7 @@ class RudolphProcessor : AbstractProcessor() {
         private val Gson = ClassName.get("com.google.gson", "Gson")
         private val Base64 = ClassName.get("android.util", "Base64")
         private val TypeToken = ClassName.get("com.google.gson.reflect", "TypeToken")
-        private val clsApplication = ClassName.get("android.app", "Application")
+        private val clsContext = ClassName.get("android.content", "Context")
         private val Bundle = ClassName.get("android.os", "Bundle")
     }
 
@@ -95,17 +93,31 @@ class RudolphProcessor : AbstractProcessor() {
     override fun process(annotations: Set<TypeElement>, roundEnvironment: RoundEnvironment): Boolean {
         if (CollectionUtils.isNotEmpty(annotations)) {
             try {
-                //构件路由表类的初始化方法 init(Application application)
-                val builder = MethodSpec.methodBuilder("init")
+
+                val clsName = routeClsName
+                val superInterfaceType = elements!!.getTypeElement(Constant.ROUTE_TABLE)
+
+                val clsBuilder = TypeSpec.classBuilder(clsName)
+                        .addJavadoc(Constant.WARNING_TIPS)
+                        .addSuperinterface(ClassName.get(superInterfaceType))
+                        .addModifiers(Modifier.PUBLIC);
+
+                //构件路由表类的初始化方法 init(Context context)
+                val initMethodBuilder = MethodSpec.methodBuilder("init")
                         .addAnnotation(Override::class.java)
                         .addModifiers(Modifier.PUBLIC)
-                        .addParameter(ParameterSpec.builder(clsApplication, "application").build())
+                        .addParameter(ParameterSpec.builder(clsContext, "context").build())
                 val components = roundEnvironment.getElementsAnnotatedWith(Component::class.java)
                 if (CollectionUtils.isNotEmpty(components)) {
                     for (element in components) {
-                        builder.addStatement("new \$T().init(application)", element)
+                        initMethodBuilder.addStatement("new \$T().init(context)", element)
                     }
                 }
+
+                //构件路由表类的初始化方法 register()
+                val registerMethodBuilder = MethodSpec.methodBuilder("register")
+                        .addAnnotation(Override::class.java)
+                        .addModifiers(Modifier.PUBLIC)
                 val routers = roundEnvironment.getElementsAnnotatedWith(Route::class.java)
                 if (CollectionUtils.isNotEmpty(routers)) {
                     var routetype: RouteType
@@ -144,18 +156,13 @@ class RudolphProcessor : AbstractProcessor() {
                             logger.error("UnKnown route type:$kind")
                             continue
                         }
-                        generateRouteTable(builder, element, target, route, routetype)
+                        generateRouteTable(registerMethodBuilder, element, target, route, routetype)
                     }
                 }
-                val superInterfaceType = elements!!.getTypeElement(Constant.ROUTE_TABLE)
-                val clsName = routeClsName
-                JavaFile.builder(Constant.PACKAGE_NAME,
-                        TypeSpec.classBuilder(clsName)
-                                .addJavadoc(Constant.WARNING_TIPS)
-                                .addSuperinterface(ClassName.get(superInterfaceType))
-                                .addModifiers(Modifier.PUBLIC)
-                                .addMethod(builder.build())
-                                .build()
+                JavaFile.builder(Constant.PACKAGE_NAME, clsBuilder
+                        .addMethod(registerMethodBuilder.build())
+                        .addMethod(initMethodBuilder.build())
+                        .build()
                 ).build().writeTo(mFiler)
                 writeClsNameToAssets(clsName)
                 logger.info(">>> Generated $clsName <<<")
@@ -344,13 +351,13 @@ class RudolphProcessor : AbstractProcessor() {
                         .addJavadoc("create new instance\n")
                         .returns(interfaceClsName)
                         .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                        .addStatement("return builder()")
+                        .addStatement("return (\$T) builder().build().open()", interfaceClsName)
                         .build())
             }
         }
 
 
-        if (routeType != RouteType.SERVICE && !route.singleton) {
+        if (routeType != RouteType.SERVICE || !route.singleton) {
             val routerBuilderClsName = ClassName.get(clsName, "Builder")
             val builderTypeSpec = generate(interfaceClsName, routerBuilderClsName, element, routeType)
             clsRouterBuilder.addType(builderTypeSpec)

…es/javax.annotation.processing.Processor …es/javax.annotation.processing.Processorrudolph-compiler/src/main/res/META-INF/services/javax.annotation.processing.Processor renamed to rudolph-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor rudolph-compiler/src/main/res/META-INF/services/javax.annotation.processing.Processor renamed to rudolph-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -39,8 +39,8 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api "com.android.support:appcompat-v7:${appcompat_v7_version}"
     api "com.google.code.gson:gson:${gson_version}"
-//    api "${publishedGroupId}:rudolph-annotations:${rudolph_version}"
     api project(':rudolph-annotations')
+//    api "${publishedGroupId}:rudolph-annotations:${rudolph_version}"
 }
 
 apply from: '../install.gradle'

rudolph/build.gradle

@@ -0,0 +1,15 @@
+package cn.wzbos.android.rudolph
+
+import android.content.Context
+
+/**
+ * 路由表接口
+ */
+interface IRouteComponent {
+    /**
+     * 初始化组件
+     *
+     * @param context Context
+     */
+    fun init(context: Context)
+}

rudolph/src/main/java/cn/wzbos/android/rudolph/IRouteComponent.kt

@@ -1,15 +1,12 @@
 package cn.wzbos.android.rudolph
 
-import android.app.Application
-
 /**
  * 路由表接口
  */
-interface IRouteTable {
+interface IRouteTable : IRouteComponent {
+
     /**
-     * 初始化方法
-     *
-     * @param application Application
+     * 注册路由
      */
-    fun init(application: Application?)
+    fun register()
 }

rudolph/src/main/java/cn/wzbos/android/rudolph/IRouteTable.kt

@@ -51,17 +51,24 @@ object Rudolph {
         try {
             val list = assetManager.list("rudolph")
             if (null != list && list.isNotEmpty()) {
+                val tables: MutableList<IRouteTable> = ArrayList()
                 for (className in list) {
                     try {
                         val clazz = Class.forName("cn.wzbos.android.rudolph.routes.$className")
                         if (IRouteTable::class.java.isAssignableFrom(clazz)) {
-                            val iGroupInstance = clazz.newInstance() as IRouteTable
-                            iGroupInstance.init(application)
+                            val iRouteTable = clazz.newInstance() as IRouteTable
+                            iRouteTable.register()
+                            tables.add(iRouteTable)
                         }
                     } catch (e: ClassNotFoundException) {
                         RLog.e(TAG, "初始化\"$className\"组件失败，请检查包名是否正确！", e)
                     }
                 }
+
+                //待所有组件注册完成后再进行初始化，防止组件之间相互访问
+                for (iRouteTable in tables) {
+                    iRouteTable.init(application)
+                }
             }
             this.isInitialized = true
         } catch (e: Exception) {

rudolph/src/main/java/cn/wzbos/android/rudolph/Rudolph.kt

@@ -1,16 +1,18 @@
 package cn.wzbos.samplea;
 
-import android.app.Application;
+import android.content.Context;
 import android.widget.Toast;
 
+import org.jetbrains.annotations.NotNull;
+
+import cn.wzbos.android.rudolph.IRouteComponent;
 import cn.wzbos.android.rudolph.annotations.Component;
-import cn.wzbos.android.rudolph.IRouteTable;
 
 @Component
-public class TestComponent implements IRouteTable {
+public class TestComponent implements IRouteComponent {
 
     @Override
-    public void init(Application application) {
-        Toast.makeText(application.getApplicationContext(), "Module A initialized！", Toast.LENGTH_SHORT).show();
+    public void init(@NotNull Context context) {
+        Toast.makeText(context.getApplicationContext(), "Module A initialized！", Toast.LENGTH_SHORT).show();
     }
 }