Selaa lähdekoodia

修复有可能的空指针

詹子聪 5 vuotta sitten
vanhempi
commit
2de956149a

+ 8 - 2
app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateFragment.java

@@ -186,7 +186,10 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
 
         if (mCurrentPage == PAGE_START) {
             mCouponBeanList.clear();
-            mCouponBeanList.addAll(couponBeanList);
+            if (couponBeanList != null) {
+                mCouponBeanList.addAll(couponBeanList);
+            }
+
             // 本地写死的数据
             mCouponBeanList.addAll(DataTool.getTemplateList(mTemplateType));
             mAdapter.notifyDataSetChanged();
@@ -197,7 +200,10 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
                 rv_template.smoothScrollToPosition(0);
             }
         } else {
-            mCouponBeanList.addAll(couponBeanList);
+            if (couponBeanList != null) {
+                mCouponBeanList.addAll(couponBeanList);
+            }
+
             mAdapter.notifyDataSetChanged();
         }
 

+ 8 - 2
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsFragment.java

@@ -191,7 +191,10 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
 
         if (mCurrentPage == PAGE_START) {
             mGoodsList.clear();
-            mGoodsList.addAll(goodsList);
+            if (goodsList != null) {
+                mGoodsList.addAll(goodsList);
+            }
+
             // 本地写死的数据
             mGoodsList.addAll(DataTool.getGoodsList());
             mAdapter.notifyDataSetChanged();
@@ -202,7 +205,10 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
                 rv_goods.smoothScrollToPosition(0);
             }
         } else {
-            mGoodsList.addAll(goodsList);
+            if (goodsList != null) {
+                mGoodsList.addAll(goodsList);
+            }
+
             mAdapter.notifyDataSetChanged();
         }
 

+ 8 - 2
app/src/main/java/com/itant/shibei/ui/home/search/SearchActivity.java

@@ -198,7 +198,10 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
 
         if (mCurrentPage == PAGE_START) {
             mGoodsList.clear();
-            mGoodsList.addAll(goodsList);
+            if (goodsList != null) {
+                mGoodsList.addAll(goodsList);
+            }
+
             // 本地写死的数据
             mAdapter.notifyDataSetChanged();
             // 如果是下拉刷新获取的第0页数据,item不要自动滚动一段距离
@@ -207,7 +210,10 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
                 rv_search_result.smoothScrollToPosition(0);
             }
         } else {
-            mGoodsList.addAll(goodsList);
+            if (goodsList != null) {
+                mGoodsList.addAll(goodsList);
+            }
+
             mAdapter.notifyDataSetChanged();
         }