完善router功能

Author: FlyJingFish

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

@@ -17,21 +17,24 @@ import java.util.Arrays
 class SchemeFilterActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-                val uri = intent.data
-//        val userHelper = ImplementClassUtils.getSingleInstance<UserHelper>(UserHelper::class)
-//        val user = userHelper?.getUser()
-//        val gson = Gson()
-//        val intArray = intArrayOf(1,2,3)
-//        val testArray = arrayOf(TestBean(1),TestBean(2))
-//        val idArray = ArrayList<String>(listOf("3","3"))
-//        val userTestBean2List = ArrayList<TestBean2>(listOf(TestBean2(11), TestBean2(22)))
-////        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)}" +
-//                "&userList=${gson.toJson(testArray)}&userIdList=${gson.toJson(idArray)}&userTestBean2List=${gson.toJson(userTestBean2List)}"
-//        Log.e("SchemeFilterActivity",uriTest)
-//
-//        val uri = uriTest.toUri()
+        //        val uri = intent.data
+        val userHelper = ImplementClassUtils.getSingleInstance<UserHelper>(UserHelper::class)
+        val user = userHelper?.getUser()
+        val gson = Gson()
+        val intArray = intArrayOf(1,2,3)
+        val stringArray = arrayOf("4","5")
+        val testArray = arrayOf(TestBean(1),TestBean(2))
+        val idArray = ArrayList<String>(listOf("3","3"))
+        val userTestBean2List = ArrayList<TestBean2>(listOf(TestBean2(11), TestBean2(22)))
+        val testBean2Array = arrayOf(TestBean2(33),TestBean2(44))
+//        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)}&stringArray=${gson.toJson(stringArray)}" +
+                "&userList=${gson.toJson(testArray)}&userIdList=${gson.toJson(idArray)}&userTestBean2List=${gson.toJson(userTestBean2List)}" +
+                "&testBean2Array=${gson.toJson(testBean2Array)}"
+        Log.e("SchemeFilterActivity",uriTest)
+
+        val uri = uriTest.toUri()
         uri?.let {
             ModuleRoute.builder(it)?.go()
             finish()

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

@@ -34,6 +34,10 @@ public class DetailActivity extends AppCompatActivity {
     private ArrayList<String> userIdList;
     @RouteParams(name = "userTestBean2List")
     private ArrayList<TestBean2> userTestBean2List;
+    @RouteParams(name = "testBean2Array")
+    private TestBean2[] testBean2Array;
+    @RouteParams(name = "stringArray")
+    private String[] stringArray;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,12 +52,23 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         userList = (TestBean[]) getIntent().getSerializableExtra("userList");
         userIdList = getIntent().getStringArrayListExtra("userIdList");
         userTestBean2List = getIntent().getParcelableArrayListExtra("userTestBean2List");
+        Parcelable[] bean2Array = getIntent().getParcelableArrayExtra("testBean2Array");
+        if (bean2Array != null){
+            testBean2Array = new TestBean2[bean2Array.length];
+            for (int i = 0; i < bean2Array.length; i++) {
+                testBean2Array[i] = (TestBean2) bean2Array[i];
+            }
+        }
+
+        stringArray = getIntent().getStringArrayExtra("stringArray");
 
         Gson gson = new Gson();
 
+
         String logText = "age="+age+",name="+name+",aChar="+aChar+",user="+user
                 +",userIds="+ gson.toJson(userIds)+",userList="+gson.toJson(userList)+",userIdList="
-                +userIdList+",userTestBean2List="+userTestBean2List;
+                +userIdList+",userTestBean2List="+userTestBean2List+",testBean2Array="+gson.toJson(testBean2Array)
+                +",stringArray="+gson.toJson(stringArray);
         binding.tvText.setText(logText);
         Log.e("DetailActivity",logText);
 

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

@@ -249,9 +249,6 @@ object ModuleRoute {
         fun putValue(paramName: String, paramsValue: Array<String>?): RouteBuilder {
             return autoPutValue(paramName, paramsValue)
         }
-        fun putValue(paramName: String, paramsValue: Array<out Serializable>?): RouteBuilder {
-            return autoPutValue(paramName, paramsValue)
-        }
         fun putValue(paramName: String, paramsValue: Bundle?): RouteBuilder {
             return autoPutValue(paramName, paramsValue)
         }

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

@@ -146,11 +146,6 @@ internal object Utils {
                 val data = gson.fromJson<BooleanArray>(strValue, paramsInfo.clazz.java)
                 builder.putValue(paramsInfo.name, data)
             }
-            Array<Parcelable>::class -> {
-                val gson = Gson()
-                val data = gson.fromJson<Array<Parcelable>>(strValue, paramsInfo.clazz.java)
-                builder.putValue(paramsInfo.name, data)
-            }
             Array<CharSequence>::class -> {
                 val gson = Gson()
                 val data = gson.fromJson<Array<CharSequence>>(strValue, paramsInfo.clazz.java)
@@ -161,11 +156,6 @@ internal object Utils {
                 val data = gson.fromJson<Array<String>>(strValue, paramsInfo.clazz.java)
                 builder.putValue(paramsInfo.name, data)
             }
-            Array<out Serializable>::class -> {
-                val gson = Gson()
-                val data = gson.fromJson<Array<Serializable>>(strValue, paramsInfo.clazz.java)
-                builder.putValue(paramsInfo.name, data)
-            }
             ArrayList::class -> {
                 val gson = Gson()
                 val listType: Type = object : TypeToken<ArrayList<*>>() {}.type
@@ -194,7 +184,9 @@ internal object Utils {
             else -> {
                 val gson = Gson()
                 val data = gson.fromJson<Any>(strValue, paramsInfo.clazz.java)
-                if (data is Serializable){
+                if (data is Array<*> && data.isArrayOf<Parcelable>()){
+                    builder.putValue(paramsInfo.name, data as Array<out Parcelable>)
+                }else if (data is Serializable){
                     builder.putValue(paramsInfo.name, data)
                 }
             }