Преглед изворни кода

首页除homeList子菜单功能、每日必玩、限时抢购外,完成

zengjiebin пре 7 година
родитељ
комит
f98dac7afe

+ 12 - 15
app/src/main/java/com/sheep/gamegroup/module/game/util/HpRefreshWelfareHelper.java

@@ -27,10 +27,10 @@ import butterknife.OnClick;
  */
  */
 public class HpRefreshWelfareHelper {
 public class HpRefreshWelfareHelper {
 
 
-//    private View hp_refresh_welfare_box;
+    private View hp_refresh_welfare_box;
 
 
     public HpRefreshWelfareHelper(View hp_refresh_welfare_box) {
     public HpRefreshWelfareHelper(View hp_refresh_welfare_box) {
-//        this.hp_refresh_welfare_box = hp_refresh_welfare_box;
+        this.hp_refresh_welfare_box = hp_refresh_welfare_box;
         ButterKnife.bind(this, hp_refresh_welfare_box);
         ButterKnife.bind(this, hp_refresh_welfare_box);
         initRefreshWelfareList();
         initRefreshWelfareList();
     }
     }
@@ -52,18 +52,15 @@ public class HpRefreshWelfareHelper {
         hp_refresh_welfare.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
         hp_refresh_welfare.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
         hp_refresh_welfare.setHasFixedSize(true);
         hp_refresh_welfare.setHasFixedSize(true);
         hp_refresh_welfare.setNestedScrollingEnabled(false);
         hp_refresh_welfare.setNestedScrollingEnabled(false);
-        hp_refresh_welfare.setAdapter(new AdpRefreshWelfare(R.layout.item_hp_refresh_welfare, refreshWelfareList).setChangeOne(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                refreshWelfareList.clear();
-                ViewUtil.notifyDataSetChanged(hp_refresh_welfare);
-                ViewUtil.delay2(new AbsObserver<Integer>(){
-                    @Override
-                    public void onNext(Integer o) {
-                        refreshData();
-                    }
-                }, 100);
-            }
+        hp_refresh_welfare.setAdapter(new AdpRefreshWelfare(R.layout.item_hp_refresh_welfare, refreshWelfareList).setChangeOne(view -> {
+            refreshWelfareList.clear();
+            ViewUtil.notifyDataSetChanged(hp_refresh_welfare);
+            ViewUtil.delay2(new AbsObserver<Integer>(){
+                @Override
+                public void onNext(Integer o) {
+                    refreshData();
+                }
+            }, 100L);
         }));
         }));
     }
     }
 
 
@@ -76,7 +73,7 @@ public class HpRefreshWelfareHelper {
                 refreshWelfareList.add(commendTask.getM());
                 refreshWelfareList.add(commendTask.getM());
                 ViewUtil.notifyDataSetChanged(hp_refresh_welfare);
                 ViewUtil.notifyDataSetChanged(hp_refresh_welfare);
             }
             }
-            ViewUtil.setVisibility(hp_game_welfare_entrance, commendTask != null);
+            ViewUtil.setVisibility(hp_refresh_welfare_box, commendTask != null);
         });
         });
     }
     }
 }
 }

+ 12 - 9
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -174,6 +174,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     LinearLayout to_search_but;
     LinearLayout to_search_but;
     @BindView(R.id.title_car)
     @BindView(R.id.title_car)
     LinearLayout titleCardLayout;
     LinearLayout titleCardLayout;
+    @BindView(R.id.home_award_container)
+    View home_award_container;
     /* 记录滑动坐标的数组 */
     /* 记录滑动坐标的数组 */
     int[] locate = new int[2];
     int[] locate = new int[2];
 
 
@@ -779,10 +781,12 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 //        }
 //        }
 
 
 
 
-        //实时动态
-        List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
-        if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
-            invite(cacheMoreDataEtyList);
+        if(ViewUtil.isVisible(home_award_container)) {
+            //实时动态
+            List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
+            if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
+                invite(cacheMoreDataEtyList);
+            }
         }
         }
 
 
         //公告
         //公告
@@ -891,9 +895,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         pagePresenter.slideshow(null);//轮播
         pagePresenter.slideshow(null);//轮播
         pagePresenter.homeList();//首页list
         pagePresenter.homeList();//首页list
 
 
-        CommonUtil.getInstance().getUserNoDoingTaskMoney(new Action1<BaseMessage>() {
-            @Override
-            public void call(BaseMessage o) {
+        if(ViewUtil.isVisible(home_award_container)) {
+            CommonUtil.getInstance().getUserNoDoingTaskMoney(o -> {
 
 
                 if (o != null) {
                 if (o != null) {
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
@@ -907,8 +910,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                         homepage_item_juan_tv.setText(welfare);
                         homepage_item_juan_tv.setText(welfare);
                     }
                     }
                 }
                 }
-            }
-        });
+            });
+        }
         mHpRefreshWelfareHelper.refreshData();
         mHpRefreshWelfareHelper.refreshData();
         if (!isFirst) {
         if (!isFirst) {
             for (int i = 0; i < mAdapter.getCount(); i++) {
             for (int i = 0; i < mAdapter.getCount(); i++) {

+ 2 - 0
app/src/main/res/layout/homepage_act_layout.xml

@@ -98,6 +98,7 @@
                     android:layout_width="match_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/full_home_list_rv"
                     android:layout_below="@id/full_home_list_rv"
+                    android:visibility="gone"
                     android:background="@color/white">
                     android:background="@color/white">
 
 
                     <include layout="@layout/homepage_item_get_award" />
                     <include layout="@layout/homepage_item_get_award" />
@@ -108,6 +109,7 @@
                     android:layout_width="match_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
                     android:visibility="gone"
+                    android:layout_marginTop="10dp"
                     layout="@layout/inclue_hp_refresh_welfare_box"
                     layout="@layout/inclue_hp_refresh_welfare_box"
                     android:layout_below="@id/home_award_container" />
                     android:layout_below="@id/home_award_container" />