Merge pull request #42 from wyjsonGo/develop

publish v2.4.8
1.修复存在多个相同页面事件解绑不及时bug
2.修改动态注册模块Application方法

Author: wyjsonGo

GoRouter-Api/src/main/java/com/wyjson/router/GoRouter.java

@@ -157,7 +157,7 @@ public static void callAMOnTrimMemory(int level) {
      *
      * @param am
      */
-    public static void registerAM(Class<? extends IApplicationModule> am) {
+    public void registerAM(Class<? extends IApplicationModule> am) {
         ApplicationModuleCenter.register(am);
     }
 

GoRouter-Api/src/main/java/com/wyjson/router/core/EventCenter.java

@@ -19,6 +19,8 @@
 import com.wyjson.router.exception.RouterException;
 import com.wyjson.router.utils.TextUtils;
 
+import java.util.Map;
+
 public class EventCenter {
 
     public static <T> void registerEvent(LifecycleOwner owner, Class<T> type, boolean isForever, @NonNull Observer<T> observer) {
@@ -39,7 +41,7 @@ public static <T> void registerEvent(LifecycleOwner owner, Class<T> type, boolea
             return;
         }
 
-        String key = path + "$" + type.getCanonicalName();
+        String key = path + "$" + type.getCanonicalName() + "$" + owner;
         MutableLiveData<T> liveData;
         if (Warehouse.events.containsKey(key)) {
             liveData = Warehouse.events.get(key);
@@ -70,7 +72,7 @@ public static <T> void unRegisterEvent(LifecycleOwner owner, Class<T> type, Obse
             return;
         }
 
-        String key = path + "$" + type.getCanonicalName();
+        String key = path + "$" + type.getCanonicalName() + "$" + owner;
         if (Warehouse.events.containsKey(key)) {
             MutableLiveData<T> liveData = Warehouse.events.get(key);
             if (liveData != null) {
@@ -133,18 +135,24 @@ public static <T> void postEvent(String path, T value) {
             throw new RouterException("value cannot be empty!");
         }
         String key = path + "$" + value.getClass().getCanonicalName();
-        if (Warehouse.events.containsKey(key)) {
-            MutableLiveData<T> liveData = Warehouse.events.get(key);
-            if (liveData != null) {
-                if (Looper.myLooper() == Looper.getMainLooper()) {
-                    liveData.setValue(value);
+        boolean isFound = false;
+        for (Map.Entry<String, MutableLiveData> entry : Warehouse.events.entrySet()) {
+            if (entry.getKey().startsWith(key)) {
+                isFound = true;
+                MutableLiveData<T> liveData = entry.getValue();
+                if (liveData != null) {
+                    GoRouter.logger.info(null, "[postEvent] send path[" + entry.getKey() + "] value[" + value + "]");
+                    if (Looper.myLooper() == Looper.getMainLooper()) {
+                        liveData.setValue(value);
+                    } else {
+                        liveData.postValue(value);
+                    }
                 } else {
-                    liveData.postValue(value);
+                    GoRouter.logger.error(null, "[postEvent] LiveData is empty??");
                 }
-            } else {
-                GoRouter.logger.error(null, "[postEvent] LiveData is empty??");
             }
-        } else {
+        }
+        if (!isFound) {
             GoRouter.logger.warning(null, "[postEvent] No observer was found for this event");
         }
     }

README.md

@@ -69,7 +69,7 @@ dependencyResolutionManagement {
 }
 
 dependencies {
-    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.7'
+    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.4.8'
 }
 // Kotlin配置参见8-1
 ```
@@ -89,7 +89,7 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.7'
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'
 }
 ```
 
@@ -157,7 +157,7 @@ pluginManagement {
 // 项目根目录下的build.gradle
 buildscript {
     dependencies {
-        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.7'
+        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.4.8'
     }
 }
 ```
@@ -894,7 +894,7 @@ kapt {
 }
 
 dependencies {
-    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.7'
+    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.4.8'
 }
 ```
 

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     dependencies {
-        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
+//        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
     }
 }
 

gradle.properties

@@ -25,4 +25,4 @@ android.nonTransitiveRClass=true
 # org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 
 GROUP_ID=com.github.wyjsonGo.GoRouter
-VERSION=2.4.7
+VERSION=2.4.8

settings.gradle

@@ -18,11 +18,11 @@ dependencyResolutionManagement {
 
 rootProject.name = "GoRouter"
 
-include ':app'
-include ':module_main'
-include ':module_user'
-include ':module_kotlin'
-include ':module_common'
+//include ':app'
+//include ':module_main'
+//include ':module_user'
+//include ':module_kotlin'
+//include ':module_common'
 
 include ':GoRouter-Api'
 include ':GoRouter-Annotation'