소스 검색

1.修改Android Apex Drivers Detail由于空指针导致Crash。

Pen Li 7 년 전
부모
커밋
90ca9a3936

+ 9 - 4
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/detail/DetailAdapter.java

@@ -856,10 +856,15 @@ public class DetailAdapter extends BaseExpandableListAdapter {
 
         void setModel(DetailMultiplePhotoModel model) {
             if (weakCell != null) {
-                if (model != null) {
-                    weakCell.get().setModel(model.getMapModel());
-                } else {
-                    weakCell.get().setModel(null);
+
+                PhotoCell cell = weakCell.get();
+
+                if (cell != null) {
+                    if (model != null) {
+                        cell.setModel(model.getMapModel());
+                    } else {
+                        cell.setModel(null);
+                    }
                 }
             }
         }

+ 6 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/photoCell/PhotoCell.java

@@ -112,8 +112,13 @@ public class PhotoCell extends RelativeLayout implements PhotoModelDelegate,Phot
 
     private WeakReference<PhotoModel> weakModel;
     public void setModel(PhotoModel model) {
+
         if (weakModel != null) {
-            weakModel.get().setDelegate(null);
+
+            PhotoModel oldModel = weakModel.get();
+            if (oldModel != null) {
+                oldModel.setDelegate(null);
+            }
         }
 
         if (model == null) {