Merge remote-tracking branch 'origin/dev'

Author: FlyJingFish

README.md

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

gradle.properties

@@ -35,7 +35,7 @@ DEVELOPER_ID=FlyJingFish
 DEVELOPER_NAME=FlyJingFish
 DEVELOPER_EMAIL=749617782@qq.com
 
-TestVersion = 1.2.1
+TestVersion = 1.2.2
 SonatypeTestCode = 1332
 TestType = 0
 

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.2.1"
+    const val version = "1.2.2"
     const val buildDir = "communication"
     const val pathName = "java"
     const val resName = "res"

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

@@ -6,6 +6,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
 import com.flyjingfish.module_communication_annotation.bean.ParamsInfo
@@ -27,6 +29,7 @@ object ModuleRoute {
     private val allRouteClass = mutableMapOf<String, BaseRouterClass>()
     private val allClazz = mutableMapOf<String, ClassInfo?>()
     private var application: Application? = null
+    private val handler = Handler(Looper.getMainLooper())
 
     fun addRouteClass(moduleName: String, routeClazz: BaseRouterClass) {
         allRouteClass[moduleName] = routeClazz
@@ -135,14 +138,6 @@ object ModuleRoute {
         fun go(context: Context, onNavigationBack: OnNavigationBack ?= null):Any? {
             val clazzInfo = getClassInfo()
 
-            PathInfo("/user/UserActivity",ModuleRoute::class,0,PathType.ACTIVITY, object :NewAny{
-                override fun newInstance(): Any {
-                    return 1
-                }
-            },mutableListOf<ParamsInfo>().apply
-            {
-                add(ParamsInfo("params1",String::class,null,false))
-            })
             val found = clazzInfo != null
             onNavigationBack?.onResult(NavigationResult(found,this,context))
             if (!found){
@@ -160,7 +155,7 @@ object ModuleRoute {
                     clazzInfo.pathInfo,
                     intent
                 ) {
-                    context.startActivity(intent)
+                    goActivity(context, intent)
                 }
             }else if (clazzInfo != null && clazzInfo.pathInfo.type == PathType.FRAGMENT){
                 val instance = clazzInfo.pathInfo.newInstance()
@@ -175,6 +170,16 @@ object ModuleRoute {
             return null
         }
 
+        private fun goActivity(context: Context,intent: Intent){
+            if (Looper.getMainLooper() == Looper.myLooper()){
+                context.startActivity(intent)
+            }else{
+                handler.post {
+                    context.startActivity(intent)
+                }
+            }
+        }
+
         /**
          * 跳转页面，需要 [ModuleRoute].[setApplication] 来初始化 application.
          * @param onNavigationBack 返回跳转结果

version.properties

@@ -1,2 +1,2 @@
-#Fri May 24 17:41:11 CST 2024
-PROJ_VERSION=1.2.1
+#Fri May 24 18:44:45 CST 2024
+PROJ_VERSION=1.2.2