fix wrong use of softreference

achenglike · Aug 10, 2018 · 84fd57c · 84fd57c
1 parent 6c687c9
commit 84fd57c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/nightmodel/src/main/java/cn/like/nightmodel/NightModelManager.java b/nightmodel/src/main/java/cn/like/nightmodel/NightModelManager.java
@@ -35,7 +35,7 @@ public class NightModelManager {
 
     private boolean modelChanged = false;
 
-    private SparseArrayCompat<List<SoftReference<AttrView>>> attrViewMaps = new SparseArrayCompat<>();
+    private SparseArrayCompat<List<AttrView>> attrViewMaps = new SparseArrayCompat<>();
 
     private static final Map<String, Constructor<? extends View>> sConstructorMap
             = new ArrayMap<>();
@@ -139,11 +139,9 @@ private void applyNewModel() {
         modelChanged = true;
         int count = attrViewMaps.size();
         for (int i=0; i<count; i++) {
-            List<SoftReference<AttrView>> attrViews = attrViewMaps.valueAt(i);
-            for (SoftReference<AttrView> attrView : attrViews) {
-                if (attrView.get() != null) {
-                    attrView.get().apply();
-                }
+            List<AttrView> attrViews = attrViewMaps.valueAt(i);
+            for (AttrView attrView : attrViews) {
+                attrView.apply();
             }
         }
     }
@@ -195,13 +193,13 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         }
 
         private void putAttrView(AttrView attrView, int hashCode) {
-            List<SoftReference<AttrView>> attrViews;
+            List<AttrView> attrViews;
             if (attrViewMaps.indexOfKey(hashCode) > -1) {
                 attrViews = attrViewMaps.get(hashCode);
             } else {
                 attrViews = new ArrayList<>();
             }
-            attrViews.add(new SoftReference<>(attrView));
+            attrViews.add(attrView);
             attrViewMaps.put(hashCode, attrViews);
         }
 

diff --git a/nightmodel/src/main/java/cn/like/nightmodel/attr/AttrView.java b/nightmodel/src/main/java/cn/like/nightmodel/attr/AttrView.java
@@ -2,25 +2,26 @@
 
 import android.view.View;
 
+import java.lang.ref.SoftReference;
 import java.util.List;
 
 /**
  * Created by like on 16/7/20.
  */
 public class AttrView {
-    View view;
+    SoftReference<View> view;
     List<Attr> attrs;
 
     public AttrView(View view, List<Attr> attrs) {
-        this.view = view;
+        this.view = new SoftReference<>(view);
         this.attrs = attrs;
     }
 
     public void apply() {
-        if (null == view) return;
+        if (null == view || view.get() == null) return;
 
         for (Attr attr : attrs) {
-            attr.apply(view);
+            attr.apply(view.get());
         }
     }
 }