完善路由

Author: FlyJingFish

module-communication-annotation/src/main/java/com/flyjingfish/module_communication_annotation/interfaces/BaseRouterClass.kt

@@ -9,6 +9,7 @@ interface BaseRouterClass {
         params: MutableMap<String, Any?>,
         byPath: Boolean,
         pathInfo: PathInfo,
+        intent:Any,
         invokeRoute: Runnable
     )
 }

module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/cut/RouteInterceptCut.kt

@@ -1,5 +1,6 @@
 package com.flyjingfish.module_communication_intercept.cut
 
+import android.content.Intent
 import com.flyjingfish.android_aop_annotation.ProceedJoinPoint
 import com.flyjingfish.android_aop_annotation.anno.AndroidAopMatchClassMethod
 import com.flyjingfish.android_aop_annotation.base.MatchClassMethod
@@ -19,7 +20,8 @@ internal class RouteInterceptCut : MatchClassMethod{
         val map = joinPoint.args?.get(1)
         val byPath = joinPoint.args?.get(2)
         val pathInfo = joinPoint.args?.get(3)
-        val proceed = Proceed(joinPoint,path as String,map as MutableMap<String,Any?>,pathInfo as PathInfo,byPath as Boolean)
+        val intent = joinPoint.args?.get(4)
+        val proceed = Proceed(joinPoint,path as String,map as MutableMap<String,Any?>,pathInfo as PathInfo,byPath as Boolean,intent as Intent)
         RouterInterceptManager.notifyIntercept(proceed)
         return null
     }

module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/intercept/Proceed.kt

@@ -1,5 +1,6 @@
 package com.flyjingfish.module_communication_intercept.intercept
 
+import android.content.Intent
 import com.flyjingfish.android_aop_annotation.ProceedJoinPoint
 import com.flyjingfish.module_communication_annotation.bean.PathInfo
 
@@ -20,7 +21,12 @@ class Proceed(
     /**
      * true则时通过 ModuleRoute 类跳转的，false则是通过帮助类
      */
-    val byPath:Boolean
+    val byPath:Boolean,
+    /**
+     * 页面跳转的 [Intent]
+     *
+     */
+    val intent: Intent
 ) {
     internal var hasNext = false
     internal lateinit var listener: OnProceedListener

module-communication-ksp/src/main/java/com/flyjingfish/module_communication_ksp/CommunicationKspSymbolProcessor.kt

@@ -292,11 +292,9 @@ class CommunicationKspSymbolProcessor(
                                 )
                             }
                         }
+
                         whatsMyName1.addStatement(
-                            "routeClazz.goByPath(\"$usePath\",paramMap,false,pathInfo){"
-                        )
-                        whatsMyName1.addStatement(
-                            "  val intent = %T(context,routeClazz.$classFunName())",
+                            "val intent = %T(context,routeClazz.$classFunName())",
                             ClassName.bestGuess(
                                 "android.content.Intent"
                             )
@@ -309,12 +307,15 @@ class CommunicationKspSymbolProcessor(
                                 typeName?.let {
                                     whatsMyName1.addParameter(paramsName,it)
                                     whatsMyName1.addStatement(
-                                        "  intent.putExtra(\"$paramsName\",$paramsName)",
+                                        "intent.putExtra(\"$paramsName\",$paramsName)",
                                     )
                                 }
 
                             }
                         }
+                        whatsMyName1.addStatement(
+                            "routeClazz.goByPath(\"$usePath\",paramMap,false,pathInfo,intent){"
+                        )
                         whatsMyName1.addStatement(
                             "  context.startActivity(intent)",
                         )
@@ -464,6 +465,7 @@ class CommunicationKspSymbolProcessor(
                     ,ClassName.bestGuess(Any::class.qualifiedName!!).copy(nullable = true)))
                 .addParameter("byPath", Boolean::class)
                 .addParameter("pathInfo", PathInfo::class)
+                .addParameter("intent", Any::class)
                 .addParameter("invokeRoute", Runnable::class)
                 .addStatement("invokeRoute.run()")
                 .addModifiers(KModifier.OVERRIDE)

module-communication-route/src/main/java/com/flyjingfish/module_communication_route/ModuleRoute.kt

@@ -126,8 +126,10 @@ object ModuleRoute {
             }
 
             val clazzInfo = getClassInfo()
-            clazzInfo?.goRouterClazz?.goByPath(usePath, paramsMap, true,clazzInfo.pathInfo) {
-                intent.setClass(context, clazzInfo.pathInfo.clazz.java)
+            clazzInfo?.let {
+                intent.setClass(context, it.pathInfo.clazz.java)
+            }
+            clazzInfo?.goRouterClazz?.goByPath(usePath, paramsMap, true,clazzInfo.pathInfo,intent) {
                 context.startActivity(intent)
             }
         }