在removeObserver的时候，如果livedata上没有observer，则删除这个livadata，以减少内存占用

JeremyLiao · Dec 27, 2018 · 9ae7b8c · 9ae7b8c
1 parent 23a4c8a
commit 9ae7b8c
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 4 deletions.
diff --git a/live-event-bus-v2/demo/build.gradle b/live-event-bus-v2/demo/build.gradle
@@ -35,8 +35,8 @@ dependencies {
     implementation 'io.reactivex:rxandroid:1.2.1'
 
     //liveeventbus
-//    implementation project(':liveeventbus')
-    implementation 'com.jeremyliao:live-event-bus:1.0.0'
+    implementation project(':liveeventbus')
+//    implementation 'com.jeremyliao:live-event-bus:1.0.0'
 
     //test
     testImplementation 'junit:junit:4.12'

diff --git a/...-event-bus-v2/demo/src/androidTest/java/com/jeremyliao/liveeventbus/LiveEventBusTest.java b/...-event-bus-v2/demo/src/androidTest/java/com/jeremyliao/liveeventbus/LiveEventBusTest.java
@@ -5,6 +5,8 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.jeremyliao.liveeventbus.helper.LiveEventBusTestHelper;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -290,4 +292,11 @@ public void run() {
         });
     }
 
+    @Test
+    public void testRemoveObserve() throws Exception {
+        Assert.assertTrue(LiveEventBusTestHelper.getLiveEventBusCount() > 0);
+        rule.getActivity().finish();
+        Thread.sleep(500);
+        Assert.assertTrue(LiveEventBusTestHelper.getLiveEventBusCount() == 0);
+    }
 }
diff --git a/.../demo/src/androidTest/java/com/jeremyliao/liveeventbus/helper/LiveEventBusTestHelper.java b/.../demo/src/androidTest/java/com/jeremyliao/liveeventbus/helper/LiveEventBusTestHelper.java
@@ -0,0 +1,27 @@
+package com.jeremyliao.liveeventbus.helper;
+
+import com.jeremyliao.liveeventbus.LiveEventBus;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+/**
+ * Created by liaohailiang on 2018/12/27.
+ */
+public class LiveEventBusTestHelper {
+
+    private LiveEventBusTestHelper() {
+    }
+
+    public static int getLiveEventBusCount() {
+        try {
+            Field bus = LiveEventBus.class.getDeclaredField("bus");
+            bus.setAccessible(true);
+            Map map = (Map) bus.get(LiveEventBus.get());
+            return map.size();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+    }
+}
diff --git a/live-event-bus-v2/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/LiveEventBus.java b/live-event-bus-v2/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/LiveEventBus.java
@@ -36,7 +36,7 @@ public static LiveEventBus get() {
 
     public synchronized <T> Observable<T> with(String key, Class<T> type) {
         if (!bus.containsKey(key)) {
-            bus.put(key, new BusLiveEvent<>());
+            bus.put(key, new BusLiveEvent<>(key));
         }
         return (Observable<T>) bus.get(key);
     }
@@ -78,8 +78,14 @@ public void run() {
             }
         }
 
+        @NonNull
+        private final String key;
         private Handler mainHandler = new Handler(Looper.getMainLooper());
 
+        private BusLiveEvent(String key) {
+            this.key = key;
+        }
+
         @Override
         protected Lifecycle.State observerActiveLevel() {
             return super.observerActiveLevel();
@@ -90,5 +96,13 @@ protected Lifecycle.State observerActiveLevel() {
         public void postValueDelay(T value, long delay, TimeUnit unit) {
             mainHandler.postDelayed(new PostValueTask(value), unit.convert(delay, unit));
         }
+
+        @Override
+        public void removeObserver(@NonNull Observer<T> observer) {
+            super.removeObserver(observer);
+            if (!hasObservers()) {
+                LiveEventBus.get().bus.remove(key);
+            }
+        }
     }
 }
diff --git a/...t-bus/liveeventbus/src/androidTest/java/com/jeremyliao/liveeventbus/LiveEventBusTest.java b/...t-bus/liveeventbus/src/androidTest/java/com/jeremyliao/liveeventbus/LiveEventBusTest.java
@@ -5,6 +5,8 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.jeremyliao.liveeventbus.helper.LiveEventBusTestHelper;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -290,4 +292,11 @@ public void run() {
         });
     }
 
+    @Test
+    public void testRemoveObserve() throws Exception {
+        Assert.assertTrue(LiveEventBusTestHelper.getLiveEventBusCount() > 0);
+        rule.getActivity().finish();
+        Thread.sleep(500);
+        Assert.assertTrue(LiveEventBusTestHelper.getLiveEventBusCount() == 0);
+    }
 }
diff --git a/...ntbus/src/androidTest/java/com/jeremyliao/liveeventbus/helper/LiveEventBusTestHelper.java b/...ntbus/src/androidTest/java/com/jeremyliao/liveeventbus/helper/LiveEventBusTestHelper.java
@@ -0,0 +1,27 @@
+package com.jeremyliao.liveeventbus.helper;
+
+import com.jeremyliao.liveeventbus.LiveEventBus;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+/**
+ * Created by liaohailiang on 2018/12/27.
+ */
+public class LiveEventBusTestHelper {
+
+    private LiveEventBusTestHelper() {
+    }
+
+    public static int getLiveEventBusCount() {
+        try {
+            Field bus = LiveEventBus.class.getDeclaredField("bus");
+            bus.setAccessible(true);
+            Map map = (Map) bus.get(LiveEventBus.get());
+            return map.size();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+    }
+}
diff --git a/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/LiveEventBus.java b/live-event-bus/liveeventbus/src/main/java/com/jeremyliao/liveeventbus/LiveEventBus.java
@@ -39,7 +39,7 @@ public static LiveEventBus get() {
 
     public synchronized <T> Observable<T> with(String key, Class<T> type) {
         if (!bus.containsKey(key)) {
-            bus.put(key, new BusMutableLiveData<>());
+            bus.put(key, new BusMutableLiveData<>(key));
         }
         return (Observable<T>) bus.get(key);
     }
@@ -82,9 +82,16 @@ public void run() {
             }
         }
 
+        @NonNull
+        private final String key;
         private Map<Observer, Observer> observerMap = new HashMap<>();
         private Handler mainHandler = new Handler(Looper.getMainLooper());
 
+
+        private BusMutableLiveData(String key) {
+            this.key = key;
+        }
+
         @Override
         public void postValue(T value) {
             mainHandler.post(new PostValueTask(value));
@@ -146,6 +153,9 @@ public void removeObserver(@NonNull Observer<T> observer) {
                 realObserver = observer;
             }
             super.removeObserver(realObserver);
+            if (!hasObservers()) {
+                LiveEventBus.get().bus.remove(key);
+            }
         }
 
         private void setLifecycleObserverMapSize(Lifecycle lifecycle, int size) {