完善路由

Author: FlyJingFish

README.md

@@ -51,7 +51,7 @@
 buildscript {
     dependencies {
         //必须项 👇
-        classpath 'io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:1.1.7'
+        classpath 'io.github.FlyJingFish.ModuleCommunication:module-communication-plugin:1.1.8'
     }
 }
 ```
@@ -163,7 +163,7 @@ b、如果 ```lib-login``` 也没有引入过 ```communication.export``` 插件
 ```gradle
 dependencies {
     //必须项 👇（可以直接放在公共 module）
-    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:1.1.7'
+    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:1.1.8'
 }
 ```
 
@@ -279,9 +279,9 @@ communicationConfig{
 ```gradle
 dependencies {
     //使用拦截器（不是必须的）
-    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-intercept:1.1.7'
+    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-intercept:1.1.8'
     //使用路径的方式跳转才需要 （不是必须的）
-    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-route:1.1.7'
+    implementation 'io.github.FlyJingFish.ModuleCommunication:module-communication-route:1.1.8'
 }
 ```
 

app/src/main/java/com/flyjingfish/modulecommunication/SchemeFilterActivity.kt

@@ -6,6 +6,7 @@ import androidx.activity.ComponentActivity
 import androidx.core.net.toUri
 import com.flyjingfish.module_communication_annotation.ImplementClassUtils
 import com.flyjingfish.module_communication_route.ModuleRoute
+import com.flyjingfish.user.TestBean
 import com.flyjingfish.user.UserHelper
 import com.google.gson.Gson
 
@@ -18,8 +19,9 @@ class SchemeFilterActivity : ComponentActivity() {
         val user = userHelper?.getUser()
         val gson = Gson()
         val intArray = intArrayOf(1,2,3)
+        val testArray = arrayOf(TestBean(1),TestBean(2))
 //        Log.e("SchemeFilterActivity",gson.toJson(intArray))
-        val uriTest = "lightrouter://test.flyjingfish.com/user/DetailActivity?age=10&name=hahahaha&aChar=a&user=${gson.toJson(user)}&userIds=${gson.toJson(intArray)}"
+        val uriTest = "lightrouter://test.flyjingfish.com/user/DetailActivity?age=10&name=hahahaha&aChar=a&user=${gson.toJson(user)}&userIds=${gson.toJson(intArray)}&userList=${gson.toJson(testArray)}"
         Log.e("SchemeFilterActivity",uriTest)
 
         val uri = uriTest.toUri()

gradle.properties

@@ -35,7 +35,7 @@ DEVELOPER_ID=FlyJingFish
 DEVELOPER_NAME=FlyJingFish
 DEVELOPER_EMAIL=[email protected]
 
-TestVersion = 1.1.7
+TestVersion = 1.1.8
 SonatypeTestCode = 1332
 TestType = 0
 

lib-user/src/main/java/com/flyjingfish/user/DetailActivity.java

@@ -28,7 +28,7 @@ public class DetailActivity extends AppCompatActivity {
     @RouteParams(name = "userIds")
     private int[] userIds;
     @RouteParams(name = "userList")
-    private ArrayList<User> userList;
+    private TestBean[] userList;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -40,8 +40,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         aChar = getIntent().getCharExtra("aChar",'s');
         user = (User) getIntent().getSerializableExtra("user");
         userIds = getIntent().getIntArrayExtra("userIds");
+        userList = (TestBean[]) getIntent().getSerializableExtra("userList");
 
-        String logText = "age="+age+",name="+name+",aChar="+aChar+",user="+user+",userIds="+ userIds;
+        String logText = "age="+age+",name="+name+",aChar="+aChar+",user="+user+",userIds="+ userIds+"userList="+userList;
         binding.tvText.setText(logText);
         Log.e("DetailActivity",logText);
 

lib-user/src/main/java/com/flyjingfish/user/TestBean.kt

@@ -0,0 +1,6 @@
+package com.flyjingfish.user
+
+import com.flyjingfish.module_communication_annotation.ExposeBean
+import java.io.Serializable
+@ExposeBean
+data class TestBean(val test:Int): Serializable

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

@@ -33,18 +33,17 @@ data class RouteParamsConfig(val className:String,val realClassName :String, val
                     val typeArguments = element.typeArguments
                     val type = typeArguments[0].type
                     if (type != null){
+                        val isSubtype = (type.resolve().declaration as KSClassDeclaration).isSubtype("java.io.Serializable")
+                                ||(type.resolve().declaration as KSClassDeclaration).isSubtype("android.os.Parcelable")
+
                         val subPackageName = type.resolve().declaration.packageName.asString()
                         val subClazzName = type.resolve().declaration.toString()
                         val typeClazzName = "$subPackageName.$subClazzName"
                         val typeName = ClassName.bestGuess(this.realClassName)
-                        if (typeClazzName == "android.os.Parcelable"
-                            ||typeClazzName == "kotlin.CharSequence"
-                            ||typeClazzName == "kotlin.String"
-                            ||typeClazzName == "java.lang.CharSequence"
-                            ||typeClazzName == "java.lang.String"){
+                        if (isSubtype){
                             typeName.parameterizedBy(ClassName.bestGuess(typeClazzName))
                         }else{
-                            null
+                            throw IllegalArgumentException("$typeClazzName 至少需要实现 java.io.Serializable 或 android.os.Parcelable 这两个接口中的一个")
                         }
                     }else{
                         null

module-communication-plugin/src/main/kotlin/com/flyjingfish/module_communication_plugin/LibVersion.kt

@@ -1,7 +1,7 @@
 package com.flyjingfish.module_communication_plugin
 
 object LibVersion {
-    const val version = "1.1.7"
+    const val version = "1.1.8"
     const val buildDir = "communication"
     const val pathName = "java"
     const val resName = "res"

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

@@ -83,6 +83,8 @@ fun <T> Intent.putValue(paramName: String, paramsValue: T) {
                 intent.putExtra(paramName, paramsValue as Array<out CharSequence>)
             } else if (paramsValue.isArrayOf<String>()) {
                 intent.putExtra(paramName, paramsValue as Array<out String>)
+            } else if (paramsValue.isArrayOf<Serializable>()) {
+                intent.putExtra(paramName, paramsValue as Array<out Serializable>)
             }
         }
 

version.properties

@@ -1,2 +1,2 @@
-#Tue May 21 11:29:17 CST 2024
-PROJ_VERSION=1.1.7
+#Tue May 21 18:03:24 CST 2024
+PROJ_VERSION=1.1.8