feat: parmas

Author: wzbos

build.gradle

@@ -37,6 +37,12 @@ allprojects {
         mavenCentral()
         maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
     }
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            freeCompilerArgs = ['-Xjvm-default=all']
+            jvmTarget = "11"
+        }
+    }
 }
 
 task clean(type: Delete) {

rudolph-annotations/gradle.properties

@@ -9,7 +9,7 @@ PROJ_GROUP=cn.wzbos.android
 # 组件ID
 PROJ_ARTIFACTID=rudolph-annotations
 # 组件版本名称
-PROJ_VERSION=2.1.1
+PROJ_VERSION=2.1.2-SNAPSHOT
 # 组件版本号
 PROJ_VERSION_CODE=1
 # 工程名称

rudolph-annotations/src/main/java/cn/wzbos/android/rudolph/ExtraInfo.kt

@@ -0,0 +1,13 @@
+package cn.wzbos.android.rudolph
+
+import java.lang.reflect.Type
+
+open class ExtraInfo @JvmOverloads constructor(
+    var type: Type,
+    val base64: Boolean = false,
+    val json: Boolean = false
+)
+
+class UnknownExtraType(
+    val className: String,
+) : ExtraInfo(type = Any::class.java, json = true, base64 = true)

rudolph-annotations/src/main/java/cn/wzbos/android/rudolph/ExtraType.kt

@@ -1,13 +1,18 @@
 package cn.wzbos.android.rudolph
 
-import java.lang.reflect.Type
-
-open class ExtraType @JvmOverloads constructor(
-    var type: Type,
-    val base64: Boolean = false,
-    val json: Boolean = false
-)
-
-class UnknownExtraType(
-    val className: String,
-) : ExtraType(type = Any::class.java, json = true, base64 = true)
+enum class ExtraType {
+    Default,
+    Serializable,
+    Parcelable,
+    Base64,
+    Base64Json,
+    Json,
+    CharSequenceArray,
+    CharSequenceArrayList,
+    StringArray,
+    StringArrayList,
+    IntegerArray,
+    IntegerArrayList,
+    ParcelableArray,
+    ParcelableArrayList,
+}

rudolph-annotations/src/main/java/cn/wzbos/android/rudolph/RouteInfo.kt

@@ -13,7 +13,7 @@ class RouteInfo(builder: Builder) {
     @Deprecated("请使用targetClass", replaceWith = ReplaceWith("targetClass"))
     val target: String?
     val targetClass: Class<*>?
-    val extras: MutableMap<String, ExtraType>?
+    val extras: MutableMap<String, ExtraInfo>?
     var type: RouteType?
         private set
 
@@ -32,7 +32,7 @@ class RouteInfo(builder: Builder) {
         var url: MutableList<String>? = null
         var target: String? = null
         var targetClass: Class<*>? = null
-        var extras: MutableMap<String, ExtraType>? = null
+        var extras: MutableMap<String, ExtraInfo>? = null
         var routeType: RouteType? = null
         var tag: String? = null
         var interceptors: MutableList<Class<out RouteInterceptor>>? = null
@@ -74,7 +74,7 @@ class RouteInfo(builder: Builder) {
                     Void::class.java.name -> Void::class.java
                     else -> Class.forName(className)
                 }
-                extra(key, ExtraType(type))
+                extra(key, ExtraInfo(type))
             } catch (e: Exception) {
                 println("类型转换失败! (target=${target}, key:${key}, className:${className})")
                 e.printStackTrace()
@@ -90,10 +90,10 @@ class RouteInfo(builder: Builder) {
             base64: Boolean = false,
             json: Boolean = false
         ): Builder {
-            return extra(key, ExtraType(type, base64 = base64, json = json))
+            return extra(key, ExtraInfo(type, base64 = base64, json = json))
         }
 
-        fun extra(key: String, extraType: ExtraType): Builder {
+        fun extra(key: String, extraType: ExtraInfo): Builder {
             if (extras == null) {
                 extras = LinkedHashMap()
             }

rudolph-annotations/src/main/java/cn/wzbos/android/rudolph/annotations/Extra.kt

@@ -1,13 +1,33 @@
 package cn.wzbos.android.rudolph.annotations
 
+import cn.wzbos.android.rudolph.ExtraType
+
 /**
  * Created by wuzongbo on 2017/5/30.
  */
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class Extra(
+    /**
+     * 参数名称
+     */
     val value: String = "",
+    /**
+     * 是否导出，false不生成参数传递方法
+     */
     val export: Boolean = true,
+    @Deprecated(
+        "请使用objectType=ExtraObjectType.json",
+        replaceWith = ReplaceWith("paramType=ExtraObjectType.json")
+    )
     val json: Boolean = false,
-    val base64: Boolean = false
+    @Deprecated(
+        "请使用objectType=ExtraObjectType.base64",
+        replaceWith = ReplaceWith("paramType=ExtraObjectType.base64")
+    )
+    val base64: Boolean = false,
+    /**
+     * 序列化类型
+     */
+    val paramsType: ExtraType = ExtraType.Default
 )

rudolph-compiler/gradle.properties

@@ -9,7 +9,7 @@ PROJ_GROUP=cn.wzbos.android
 # 组件ID
 PROJ_ARTIFACTID=rudolph-compiler
 # 组件版本名称
-PROJ_VERSION=2.1.1
+PROJ_VERSION=2.1.2-SNAPSHOT
 # 组件版本号
 PROJ_VERSION_CODE=1
 # 工程名称