hanjing 6 vuotta sitten
vanhempi
commit
50ff853a00

+ 34 - 28
app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtPromoteGoodsList.java

@@ -53,7 +53,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
 
 
     private void notifyDataSetChanged() {
-        if(empty_view == null || view_list == null){
+        if (empty_view == null || view_list == null) {
             return;
         }
         ViewUtil.notifyDataSetChanged(view_list);
@@ -84,6 +84,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     }
 
     private AdpPromoteGoods adapter;
+
     public void initView() {
         if (activity == null) {
             return;
@@ -126,13 +127,14 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
         }
         notifyDataSetChanged();
     }
+
     private int page = 1;
     private int per_page = DataUtil.PER_PAGE;
 
     public void mInitData() {
         CommonUtil.getInstance().resetEmptyView(empty_view);
         //先加载缓存
-        if(isFirstCache) {
+        if (isFirstCache) {
             getReleaseFromACache();
         }
         //再加载网络数据
@@ -149,7 +151,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     private void getReleaseFromACache() {
         try {
             GetPromoteGoodsUrl getPromoteGoodsUrl = DataUtil.getInstance().getCacheResult(getKey(), GetPromoteGoodsUrl.class);
-            if(getPromoteGoodsUrl != null){
+            if (getPromoteGoodsUrl != null) {
                 adapter.setBaseUrl(getPromoteGoodsUrl.getGoods_url());
                 ListUtil.addAllItem(list, getPromoteGoodsUrl.getList());
             }
@@ -166,27 +168,28 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     //从网络获取发布的任务列表
     private void getReleaseFromNetWork() {
         SheepApp.getInstance().getNetComponent().getApiService().getYfShopPromoteGoods(page, per_page)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                boolean isNewData = DataUtil.getInstance().isNewData(getKey());
-                                if (isNewData || !isFirstCache) {
-                                    GetPromoteGoodsUrl getPromoteGoodsUrl = baseMessage.getData(GetPromoteGoodsUrl.class);
-                                    if(getPromoteGoodsUrl != null){
-                                        adapter.setBaseUrl(getPromoteGoodsUrl.getGoods_url());
-                                        ListUtil.addAllItem(list, getPromoteGoodsUrl.getList());
-                                    }
-                                }
-                                notifyDataSetChanged();
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                notifyDataSetChanged();
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(getKey());
+                        if (isNewData || !isFirstCache) {
+                            GetPromoteGoodsUrl getPromoteGoodsUrl = baseMessage.getData(GetPromoteGoodsUrl.class);
+                            if (getPromoteGoodsUrl != null) {
+                                if (adapter == null) return;
+                                adapter.setBaseUrl(getPromoteGoodsUrl.getGoods_url());
+                                ListUtil.addAllItem(list, getPromoteGoodsUrl.getList());
                             }
-                        });
+                        }
+                        notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        notifyDataSetChanged();
+                    }
+                });
     }
 
     public int getDataCount() {
@@ -194,6 +197,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     }
 
     private boolean noMore = false;
+
     public boolean isNoMore() {
         return noMore;
     }
@@ -201,7 +205,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
 
     //加载完成时更新header或footer
     protected void refreshOrLoadMoreComplete() {
-        if(smartRefreshLayout != null && getUserVisibleHint()) {
+        if (smartRefreshLayout != null && getUserVisibleHint()) {
             if (page == 1) {
                 smartRefreshLayout.finishRefresh();
             } else {
@@ -209,9 +213,10 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
             }
         }
     }
+
     //重新设置ViewPager的高度
     protected void resetViewPagerHeight() {
-        if(viewPager != null && getUserVisibleHint()){
+        if (viewPager != null && getUserVisibleHint()) {
             int count = getDataCount();
             ViewGroup.LayoutParams params = viewPager.getLayoutParams();
             params.height = count == 0 ? G.HEIGHT / 2 : count * getItemHeight();
@@ -224,16 +229,17 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
         resetViewPagerHeight();
-        if(smartRefreshLayout != null && getUserVisibleHint()) {
+        if (smartRefreshLayout != null && getUserVisibleHint()) {
             smartRefreshLayout.setNoMoreData(noMore);
         }
     }
-    protected int getItemHeight(){
+
+    protected int getItemHeight() {
         return G.getRealPix(140);
     }
 
     //是否显示无数据占位图
-    protected void updateEmptyView(){
+    protected void updateEmptyView() {
         boolean showEmpty = list.isEmpty();
         CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
     }