詹子聪 5 лет назад
Родитель
Сommit
371b6d6762

+ 10 - 24
app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateFragment.java

@@ -10,7 +10,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.itant.shibei.R;
 import com.itant.shibei.base.ITopActionListener;
-import com.itant.shibei.tool.DataTool;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.ui.mine.coupon.AddCouponActivity;
 import com.itant.shibei.widget.bottomlistener.OnRcvScrollListener;
@@ -176,35 +175,22 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
         srl_template.setRefreshing(false);
         if (!success) {
             ToastTool.showShort(message);
-            if (mCouponBeanList.size() == 0) {
-                // 本地写死的数据
-                mCouponBeanList.addAll(DataTool.getTemplateList(mTemplateType));
-                mAdapter.notifyDataSetChanged();
-            }
             return;
         }
 
         if (mCurrentPage == PAGE_START) {
             mCouponBeanList.clear();
-            if (couponBeanList != null) {
-                mCouponBeanList.addAll(couponBeanList);
-            }
-
-            // 本地写死的数据
-            mCouponBeanList.addAll(DataTool.getTemplateList(mTemplateType));
-            mAdapter.notifyDataSetChanged();
-            // 如果是下拉刷新获取的第0页数据,item不要自动滚动一段距离
-            // 或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
-            if (mIsRefresh) {
-                ToastTool.showShort("刷新成功");
-                rv_template.smoothScrollToPosition(0);
-            }
-        } else {
-            if (couponBeanList != null) {
-                mCouponBeanList.addAll(couponBeanList);
-            }
+        }
 
-            mAdapter.notifyDataSetChanged();
+        if (couponBeanList != null) {
+            mCouponBeanList.addAll(couponBeanList);
+        }
+        mAdapter.notifyDataSetChanged();
+        // 如果是下拉刷新获取的第0页数据,item不要自动滚动一段距离
+        // 或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
+        if (mIsRefresh) {
+            ToastTool.showShort("刷新成功");
+            rv_template.smoothScrollToPosition(0);
         }
 
         // 请求到数据了,页数自增

+ 5 - 19
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsFragment.java

@@ -11,7 +11,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.itant.shibei.R;
 import com.itant.shibei.base.ITopActionListener;
-import com.itant.shibei.tool.DataTool;
 import com.itant.shibei.ui.mine.goods.AddGoodsActivity;
 import com.itant.shibei.widget.bottomlistener.OnRcvScrollListener;
 import com.itant.shibei.widget.decoration.SpacesItemDecoration;
@@ -180,37 +179,24 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
     public void onGoodsDataCome(boolean success, String message, List<GoodsBean> goodsList) {
         srl_goods.setRefreshing(false);
         if (!success) {
-            if (mGoodsList.size() == 0) {
-                // 本地写死的数据
-                mGoodsList.addAll(DataTool.getGoodsList());
-                mAdapter.notifyDataSetChanged();
-            }
             ToastTool.showShort(message);
             return;
         }
 
         if (mCurrentPage == PAGE_START) {
             mGoodsList.clear();
-            if (goodsList != null) {
-                mGoodsList.addAll(goodsList);
-            }
-
-            // 本地写死的数据
-            mGoodsList.addAll(DataTool.getGoodsList());
-            mAdapter.notifyDataSetChanged();
             // 如果是下拉刷新获取的第0页数据,item不要自动滚动一段距离
             // 或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
             if (mIsRefresh) {
                 ToastTool.showShort("刷新成功");
                 rv_goods.smoothScrollToPosition(0);
             }
-        } else {
-            if (goodsList != null) {
-                mGoodsList.addAll(goodsList);
-            }
-
-            mAdapter.notifyDataSetChanged();
         }
+        if (goodsList != null) {
+            mGoodsList.addAll(goodsList);
+        }
+
+        mAdapter.notifyDataSetChanged();
 
         // 请求到数据了,页数自增
         if (goodsList != null && goodsList.size() > 0) {