优化界面

app/src/main/java/com/sheep/gamegroup/util/viewHelper/LayoutParamsUtil.java

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.util.viewHelper;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -39,6 +40,15 @@ public class LayoutParamsUtil {
                 ((LinearLayout.LayoutParams) layoutParams).bottomMargin = lp.getBottomMargin();
             if (lp.getRightMargin() != Lp.NONE)
                 ((LinearLayout.LayoutParams) layoutParams).rightMargin = lp.getRightMargin();
+        } else if (layoutParams instanceof ConstraintLayout.LayoutParams) {
+            if (lp.getTopMargin() != Lp.NONE)
+                ((ConstraintLayout.LayoutParams) layoutParams).topMargin = lp.getTopMargin();
+            if (lp.getLeftMargin() != Lp.NONE)
+                ((ConstraintLayout.LayoutParams) layoutParams).leftMargin = lp.getLeftMargin();
+            if (lp.getBottomMargin() != Lp.NONE)
+                ((ConstraintLayout.LayoutParams) layoutParams).bottomMargin = lp.getBottomMargin();
+            if (lp.getRightMargin() != Lp.NONE)
+                ((ConstraintLayout.LayoutParams) layoutParams).rightMargin = lp.getRightMargin();
         }
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpHomeListListview.java

@@ -1,99 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.model.entity.HomeListEntity;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.jiuyan.samllsheep.R;
-
-import java.util.List;
-
-/**
- * Created by ljy on 2018/5/10.
- */
-
-public class AdpHomeListListview extends BaseAdapter {
-    private List<HomeListEntity> homeListEntity;
-    private Context context;
-
-    public AdpHomeListListview(List<HomeListEntity> homeListEntity, Context context) {
-        this.homeListEntity = homeListEntity;
-        this.context = context;
-    }
-
-    @Override
-    public int getCount() {
-        return homeListEntity.size();
-    }
-
-    @Override
-    public HomeListEntity getItem(int position) {
-        return homeListEntity.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Object tag = convertView == null ? null : convertView.getTag();
-        ViewHolder holder;
-        if(tag instanceof ViewHolder){
-            holder = (ViewHolder) tag;
-        }else {
-            holder = new ViewHolder();
-            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_listview,null);
-
-            holder.hot_tv = convertView.findViewById(R.id.hot_tv);
-            holder.q_iv = convertView.findViewById(R.id.q_iv);
-            holder.q_name_tv = convertView.findViewById(R.id.q_name_tv);
-            holder.q_dec_tv = convertView.findViewById(R.id.q_dec_tv);
-            holder.line_ly_q_view = convertView.findViewById(R.id.line_ly_q_view);
-            convertView.setTag(holder);
-        }
-        final HomeListEntity entity = getItem(position);
-        ViewUtil.setText(holder.hot_tv, entity.getTip());
-        holder.hot_tv.setVisibility(entity.hasTip()?View.VISIBLE: View.GONE);
-        holder.hot_tv.setTextColor(entity.getTipColor());
-        Glide.with(context)
-                .load(entity.getIcon())
-                .apply(new RequestOptions().dontAnimate())
-                .into(holder.q_iv);
-        ViewUtil.setText(holder.q_name_tv, entity.getTitle());
-        ViewUtil.setText(holder.q_dec_tv, entity.getDesc());
-
-        if(position == getCount()-1){
-            holder.line_ly_q_view.setVisibility(View.GONE);
-        }else {
-            holder.line_ly_q_view.setVisibility(View.VISIBLE);
-        }
-
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                UMConfigUtils.IdEvent.HOME_LIST.commit(entity.getId());
-                CommonUtil.getInstance()
-                        .goWhere(context, entity, "首页");
-            }
-        });
-        return convertView;
-    }
-
-    class ViewHolder{
-        ImageView q_iv;
-        TextView q_name_tv, q_dec_tv, hot_tv;
-        View line_ly_q_view;
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -8,7 +8,6 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Handler;
@@ -34,7 +33,6 @@ import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.OvershootInterpolator;
 import android.view.animation.TranslateAnimation;
-import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -65,7 +63,6 @@ import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.RequestParamEty;
-import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -77,14 +74,12 @@ import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.ConfigUtil;
 import com.sheep.gamegroup.util.DataKey;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyGridview;
-import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
@@ -97,7 +92,6 @@ import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
-import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
@@ -143,25 +137,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     LinearLayout homepageItemNoticeLayout;
     @BindView(R.id.banner)
     Banner banner;
-
-    @BindView(R.id.icon_img_iv)
-    ImageView iconImgIv;
-    @BindView(R.id.name_tv)
-    TextView nameTv;
-    @BindView(R.id.sheep_num_tv)
-    TextView sheepNumTv;
-    @BindView(R.id.withdrawal)
-    TextView withdrawal;
-    @BindView(R.id.my_price)
-    TextView myPrice;
-    @BindView(R.id.try_play_layout)
-    LinearLayout tryPlayLayout;
-    @BindView(R.id.invitation_layout)
-    LinearLayout invitationLayout;
-    @BindView(R.id.lying_layout)
-    LinearLayout lyingLayout;
-    @BindView(R.id.card_layout)
-    LinearLayout card_layout;
     @BindView(R.id.scrollView)
     NestedScrollView scrollView;
     @BindView(R.id.newbie_task)
@@ -170,14 +145,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     SmartRefreshLayout refresh;
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
-    @BindView(R.id.recharge)
-    TextView recharge;
     @BindView(R.id.home_list_gridview_gv)
     MyGridview home_list_gridview_gv;
-    @BindView(R.id.home_list_gridview_listview)
-    MyListview home_list_gridview_listview;
-    @BindView(R.id.home_list_gridview_layout)
-    LinearLayout home_list_gridview_layout;
+    @BindView(R.id.home_notice_ll)
+    View home_notice_ll;
     @BindView(R.id.check_net_ll)
     View check_net_ll;
     @BindView(R.id.bg_newbie_task)
@@ -234,15 +205,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private List<HomeListEntity> homeListEntitys = new ArrayList<>();
     private List<HomeListEntity> fullHomeList = new ArrayList<>();
     private List<HomeListEntity> homeListEntitysGridview = new ArrayList<>();
-    private List<HomeListEntity> homeListEntitysListview = new ArrayList<>();
     private AdpHomeListGrideview adpHomeListGrideview;
-    private AdpHomeListListview adpHomeListListview;
-    private Release_task taskEty;
     private AdpTryMakemoney mAdapter;
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
-    public static final int WHAT_LOAD_USER_INFO = 0;//加载用户信息
     public static final int WHAT_LOAD_RUN_TASK = 1;//加载正在进行的任务列表
     public static final int WHAT_TRY_SHOW_HB = 7;//尝试显示红包
 
@@ -251,9 +218,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             switch (msg.what) {
-                case WHAT_LOAD_USER_INFO:
-                    loadUserInfo();
-                    break;
                 case WHAT_LOAD_RUN_TASK:
                     tryMakeMoneyAdp.clear();
                     //正在进行中的任务列表
@@ -735,22 +699,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
     }
 
-    private void loadUserInfo() {
-
-        if (myPrice == null || userEntity == null) {
-            return;
-        }
-        ViewUtil.setText(nameTv, userEntity.getNickname());
-        ViewUtil.setText(sheepNumTv, String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
-        if (ConfigUtil.isSmallDebug()) {
-            sheepNumTv.append("\n邀请人：");
-            sheepNumTv.append(userEntity.getParent_code());
-        }
-        ViewUtil.setText(myPrice, String.format(Locale.CHINA, "%s\u0020元", userEntity.getBalance()));
-        GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
-
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     public void initListener() {
         scrollView.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
@@ -847,9 +795,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     public void initData() {
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
-            loadUserInfo();
-        }
         //任务
 //        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
 //        if (cacheTaskReleaseEtyList != null) {
@@ -886,22 +831,25 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
+        addHomeList(cacheHomeListEtyList);
+        refreshData();
+    }
+
+    //添加homeList数据
+    private void addHomeList(List<HomeListEntity> cacheHomeListEtyList) {
         if (ListUtil.isEmpty(cacheHomeListEtyList)) {
-            ViewUtil.setVisibility(home_list_gridview_layout, false);
+            ViewUtil.setVisibility(home_list_gridview_gv, false);
             ViewUtil.setVisibility(full_home_list_rv, false);
         } else {
-            ViewUtil.setVisibility(home_list_gridview_layout, true);
+            ViewUtil.setVisibility(home_list_gridview_gv, true);
+            homeListEntitys.clear();
+            homeListEntitysGridview.clear();
             fullHomeList.clear();
             CommonUtil.getInstance().splitHomeList(cacheHomeListEtyList, homeListEntitys, fullHomeList);
             ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
             boolean isShowQB = false;
             boolean isShowMd = false;
             for (int i = 0; i < homeListEntitys.size(); i++) {
-                /*if (i < 4) {
-                    homeListEntitysGridview.add(homeListEntitys.get(i));
-                } else {
-                    homeListEntitysListview.add(homeListEntitys.get(i));
-                }*/
                 homeListEntitysGridview.add(homeListEntitys.get(i));
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                     isShowQB = !isShowQB;
@@ -915,10 +863,16 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             SheepApp.getInstance().setShowMidong(isShowMd);
             ViewUtil.notifyDataSetChanged(full_home_list_rv);
             adpHomeListGrideview.notifyDataSetChanged();
-            adpHomeListListview.notifyDataSetChanged();
-            ViewUtil.setVisibility(home_list_gridview_listview, !homeListEntitysListview.isEmpty());
         }
-        refreshData();
+        checkFullHomeList();
+    }
+
+    //fullHomeList有数据时，要让fullHomeList上下遮盖相邻组件
+    private void checkFullHomeList() {
+        if (/*SkinUtil.curPlugin == Plugin.skin_new_year && */!fullHomeList.isEmpty()) {
+            LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp().setTopMargin(0));
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(-G.getRealPix(8)).setBottomMargin(-G.getRealPix(4)));
+        }
     }
 
     /**
@@ -1004,25 +958,20 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
-        adpHomeListListview = new AdpHomeListListview(homeListEntitysListview, activity);
         adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, activity);
-        home_list_gridview_listview.setAdapter(adpHomeListListview);
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
 
-        home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
-                if (homeListEntity == null) {
-                    return;
-                }
-                UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if ("-2".equals(homeListEntity.getJump())) {
-                    setValueList(!homeListEntity.isSelect());
-                } else {
-                    CommonUtil.getInstance()
-                            .goWhere(activity, homeListEntity, "首页");
-                }
+        home_list_gridview_gv.setOnItemClickListener((parent, view, position, id) -> {
+            HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
+            if (homeListEntity == null) {
+                return;
+            }
+            UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
+            if ("-2".equals(homeListEntity.getJump())) {
+                setValueList(!homeListEntity.isSelect());
+            } else {
+                CommonUtil.getInstance()
+                        .goWhere(activity, homeListEntity, "首页");
             }
         });
     }
@@ -1044,49 +993,30 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     }
 
 
-    @OnClick({R.id.recharge, R.id.withdrawal, R.id.view_rob_duty,
-            R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout,
-            R.id.homepage_item_money_tv
+    @OnClick({R.id.view_rob_duty,
+            R.id.newbie_task, R.id.homepage_item_money_tv
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.homepage_item_money_tv:
                 Jump2View.getInstance().goTryplayView(activity, null);
                 break;
-            case R.id.withdrawal://提现
-                Jump2View.getInstance().tryGoWithdrawal(activity, userEntity);
-                break;
             case R.id.newbie_task://新手任务
                 DialogNewbieTaskList.tryShowDialog(activity);
                 NEWBIE_TASK.onEvent();
                 break;
-            case R.id.icon_img_iv://头像
-                if (TestUtil.isTest()) {
-                    TestUtil.test(activity);
-                } else
-                    Jump2View.getInstance().goPersonnalCenterView(activity, null);
-                break;
-            case R.id.user_layout://个人信息
-                Jump2View.getInstance().goPersonnalCenterView(activity, null);
-                break;
-            case R.id.recharge://充值
-                Jump2View.getInstance().goRechargeAct(activity, "首页");
-                break;
             case R.id.view_rob_duty://抢任务弹框
-                CommonUtil.getInstance().robTask(new Action1<RobTask>() {
-                    @Override
-                    public void call(RobTask robTask) {
-                        if (robTask != null) {
-                            DataUtil.putAsInt(DataKey.KEY_ORDER, robTask.getOrder());
-                            try {
-                                ViewUtil.newInstance().showRobDutyDialog(activity, robTask);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                G.showToast(e.getMessage());
-                            }
-                        } else {
-                            G.showToast(R.string.task_sold_out_focus_publish);
+                CommonUtil.getInstance().robTask(robTask -> {
+                    if (robTask != null) {
+                        DataUtil.putAsInt(DataKey.KEY_ORDER, robTask.getOrder());
+                        try {
+                            ViewUtil.newInstance().showRobDutyDialog(activity, robTask);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            G.showToast(e.getMessage());
                         }
+                    } else {
+                        G.showToast(R.string.task_sold_out_focus_publish);
                     }
                 });
                 break;
@@ -1104,7 +1034,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
-        mHandler.sendEmptyMessage(WHAT_LOAD_USER_INFO);
     }
 
     @Override
@@ -1256,48 +1185,14 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
         if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
-            if (ListUtil.isEmpty(homeListEntityList)) {
-                ViewUtil.setVisibility(home_list_gridview_layout, false);
-                ViewUtil.setVisibility(full_home_list_rv, false);
-            } else {
-                ViewUtil.setVisibility(home_list_gridview_layout, true);
-                homeListEntitys.clear();
-                homeListEntitysGridview.clear();
-                homeListEntitysListview.clear();
-                fullHomeList.clear();
-                CommonUtil.getInstance().splitHomeList(homeListEntityList, homeListEntitys, fullHomeList);
-                ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
-                boolean isShowQB = false;
-                boolean isShowMd = false;
-                for (int i = 0; i < homeListEntitys.size(); i++) {
-//                    if (i < 4) {
-//                        homeListEntitysGridview.add(homeListEntitys.get(i));
-//                    } else {
-//                        homeListEntitysListview.add(homeListEntitys.get(i));
-//                    }
-                    homeListEntitysGridview.add(homeListEntitys.get(i));
-                    if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
-                        isShowQB = !isShowQB;
-                    }
-                    if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
-                        isShowMd = !isShowMd;
-                    }
-                }
-                addNewTask();
-                SheepApp.getInstance().setShowQB(isShowQB);
-                SheepApp.getInstance().setShowMidong(isShowMd);
-                ViewUtil.notifyDataSetChanged(full_home_list_rv);
-                adpHomeListGrideview.notifyDataSetChanged();
-                adpHomeListListview.notifyDataSetChanged();
-                ViewUtil.setVisibility(home_list_gridview_listview, !homeListEntitysListview.isEmpty());
-            }
+            addHomeList(homeListEntityList);
         }
     }
 
     @Override
     public void failhomeList(BaseMessage baseMessage) {
         if (homeListEntitys.isEmpty() && fullHomeList.isEmpty())
-            ViewUtil.setVisibility(home_list_gridview_layout, false);
+            ViewUtil.setVisibility(home_list_gridview_gv, false);
 
     }
 
@@ -1306,21 +1201,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     @Override
     public void onResume() {
         super.onResume();
-        UserEntity result = DataUtil.getInstance().getUserEntity();
-        if (result == null) {
-            CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
-                @Override
-                public void call(UserEntity item) {
-                    if (item != null) {
-                        userEntity = item;
-                        loadUserInfo();
-                    }
-                }
-            });
-        } else {
-            userEntity = result;
-            loadUserInfo();
-        }
+        CommonUtil.getInstance().callActionWithUserInfo(item -> userEntity = item);
         if (onResumeCount > 0)
             refreshTaskList();
         onResumeCount++;

app/src/main/res/layout/adp_homelist_listview.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/q_iv"
-        android:layout_width="31dp"
-        android:layout_height="31dp"
-        android:layout_marginBottom="12.5dp"
-        android:layout_marginTop="12.5dp"
-        android:src="@mipmap/home_q_circle_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/q_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="充值Q币"
-        android:textSize="13sp"
-        android:textColor="@color/black_6_3"
-        android:layout_marginStart="@dimen/content_padding_small"
-        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintStart_toEndOf="@+id/q_iv"
-        app:layout_constraintTop_toTopOf="@+id/q_iv" />
-
-    <TextView
-        android:id="@+id/q_dec_tv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="right"
-        android:text="平台绵羊币，充值更便宜"
-        android:textSize="10sp"
-        android:textColor="@color/black_666666"
-        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/q_iv" />
-
-    <View
-        android:id="@+id/line_ly_q_view"
-        android:layout_width="match_parent"
-        android:layout_height="1sp"
-        android:background="@color/bg_gray"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <TextView
-        android:id="@+id/hot_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/content_padding_10"
-        android:layout_marginTop="6dp"
-        android:text="hot~"
-        android:textColor="@color/red"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/q_name_tv"
-        app:layout_constraintStart_toEndOf="@+id/q_name_tv"
-        app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/homepage_act_layout.xml

@@ -26,39 +26,51 @@
             android:scrollbars="none"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:focusableInTouchMode="true">
 
                 <include
-                    layout="@layout/homepage_item_top2"
-                    android:visibility="gone" />
-
-                <include layout="@layout/check_net_view" />
-
-                <include layout="@layout/homepage_item_banner" />
+                    android:id="@+id/check_net_ll"
+                    layout="@layout/check_net_view" />
 
                 <include
-                    layout="@layout/homepage_item_gridview_listview"
-                    android:visibility="visible" />
+                    android:id="@+id/banner"
+                    layout="@layout/homepage_item_banner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/check_net_ll" />
 
-                <!--超维对决HomeList-->
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/full_home_list_rv"
+
+                <com.sheep.gamegroup.util.MyGridview
+                    android:id="@+id/home_list_gridview_gv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone" />
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginTop="13dp"
+                    android:layout_marginEnd="@dimen/content_padding"
+                    android:animateLayoutChanges="true"
+                    android:animationCache="true"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:gravity="center_horizontal"
+                    android:listSelector="@color/transparent"
+                    android:numColumns="4"
+                    android:scrollbars="none"
+                    android:verticalSpacing="@dimen/content_padding_5"
+                    android:layout_below="@id/banner" />
+
                 <LinearLayout
+                    android:id="@+id/home_notice_ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/content_padding"
                     android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginTop="@dimen/content_padding"
                     android:layout_marginEnd="@dimen/content_padding"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:layout_below="@id/full_home_list_rv">
 
                     <include layout="@layout/homepage_item_notice_and_currenttime" />
 
@@ -78,26 +90,24 @@
                         android:visibility="gone" />
                 </LinearLayout>
 
-                <include
-                    layout="@layout/homepage_item_4module"
-                    android:visibility="gone" />
-
-                <include
-                    layout="@layout/homepage_item_liy_q"
-                    android:visibility="gone" />
-
-                <include
-                    layout="@layout/homepage_item_gridview_listview"
-                    android:visibility="gone" />
-
+                <!--超维对决HomeList-->
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/full_home_list_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:layout_below="@id/home_list_gridview_gv" />
                 <LinearLayout
+                    android:id="@+id/home_vp_ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/content_padding"
                     android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginTop="@dimen/content_padding"
                     android:layout_marginEnd="@dimen/content_padding"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:layout_below="@id/home_notice_ll">
+
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/recyclerview"
                         android:layout_width="match_parent"
@@ -118,7 +128,7 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </RelativeLayout>
 
         </android.support.v4.widget.NestedScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>

app/src/main/res/layout/homepage_item_4module.xml

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bg_gray"
-    android:paddingLeft="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingRight="@dimen/content_padding_10">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <LinearLayout
-                android:id="@+id/try_play_layout"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_gravity="center_vertical"
-                android:padding="@dimen/content_padding_10"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                android:layout_marginRight="@dimen/content_padding_small">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginRight="@dimen/content_padding_small">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="试玩赚钱"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="下载应用领现金"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_11"/>
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_try_play_circle_bg"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/invitation_layout"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_gravity="center_vertical"
-                android:padding="@dimen/content_padding_10"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_gravity="center_vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="邀请赚钱"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="上不封顶月入过万"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_11"/>
-                </LinearLayout>
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_invitation_circle_bg" />
-
-            </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/content_padding_small">
-            <LinearLayout
-                android:id="@+id/lying_layout"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_gravity="center_vertical"
-                android:padding="@dimen/content_padding_10"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                android:layout_marginRight="@dimen/content_padding_small">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginRight="@dimen/content_padding_small">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="玩转游戏"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="万款游戏免费下载"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_11"/>
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_lying_circle_bg"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/card_layout"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_gravity="center_vertical"
-                android:padding="@dimen/content_padding_10"
-                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginRight="@dimen/content_padding_small">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="办卡赚钱"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="办信用卡拿现金"
-                        android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_11"/>
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/home_card_circle_bg"/>
-
-            </LinearLayout>
-        </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/homepage_item_gridview_listview.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/home_list_gridview_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="@dimen/content_padding_10">
-
-    <com.sheep.gamegroup.util.MyGridview
-        android:id="@+id/home_list_gridview_gv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/content_padding_5"
-        android:animateLayoutChanges="true"
-        android:animationCache="true"
-        android:gravity="center_horizontal"
-        android:listSelector="@color/transparent"
-        android:numColumns="4"
-        android:scrollbars="none"
-        android:verticalSpacing="@dimen/content_padding_5"
-        android:layout_marginStart="@dimen/content_padding"
-        android:layout_marginEnd="@dimen/content_padding"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
-
-    <com.sheep.gamegroup.util.MyListview
-        android:id="@+id/home_list_gridview_listview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:divider="@null"
-        android:listSelector="@color/transparent"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:scrollbars="none"
-        android:visibility="gone" />
-
-</LinearLayout>

app/src/main/res/layout/homepage_item_liy_q.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_10"
-    android:layout_margin="@dimen/content_padding">
-
-    <ImageView
-        android:id="@+id/q_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/home_q_circle_bg"
-        app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
-        android:padding="@dimen/content_padding_small"
-        android:layout_marginRight="@dimen/content_padding_small"/>
-
-    <TextView
-        android:id="@+id/q_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="充值Q币"
-        app:layout_constraintTop_toTopOf="@+id/q_iv"
-        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintLeft_toRightOf="@+id/q_iv"
-        style="@style/txt_style_16_black"/>
-
-    <TextView
-        android:id="@+id/lying_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="躺着赚钱"
-        app:layout_constraintTop_toTopOf="@+id/lying_iv"
-        app:layout_constraintBottom_toBottomOf="@+id/lying_iv"
-        app:layout_constraintLeft_toRightOf="@+id/lying_iv"
-        style="@style/txt_style_16_black"/>
-
-    <TextView
-        android:id="@+id/q_dec_tv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="平台绵羊币，充值更便宜"
-        app:layout_constraintTop_toTopOf="@+id/q_iv"
-        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
-        android:gravity="right"/>
-
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="微信挂机领现金"
-        app:layout_constraintTop_toTopOf="@+id/lying_iv"
-        app:layout_constraintBottom_toBottomOf="@+id/lying_iv"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/lying_name_tv"
-        android:gravity="right"/>
-
-    <ImageView
-        android:id="@+id/lying_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/home_playgame_circle_bg"
-        app:layout_constraintTop_toBottomOf="@+id/line_ly_q_view"
-        android:padding="@dimen/content_padding_small"
-        android:layout_marginRight="@dimen/content_padding_small"/>
-
-    <View
-        android:id="@+id/line_ly_q_view"
-        android:layout_width="match_parent"
-        android:layout_height="1sp"
-        android:background="@color/bg_gray"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/homepage_item_top2.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/user_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@mipmap/home_blue_bg"
-    android:paddingStart="@dimen/content_padding"
-    android:paddingEnd="@dimen/content_padding"
-    android:paddingTop="30dp"
-    android:paddingBottom="18dp"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/icon_img_iv"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        android:src="@drawable/avatar"
-        app:layout_constraintTop_toTopOf="@+id/name_tv"
-        app:layout_constraintBottom_toBottomOf="@+id/my_price" />
-
-
-    <TextView
-        android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/loading"
-        android:textColor="@color/txt_white"
-        android:textSize="15sp"
-        android:layout_marginBottom="12dp"
-        android:layout_marginStart="@dimen/dp_10"
-        app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-        app:layout_constraintBottom_toTopOf="@+id/sheep_num_tv" />
-
-    <TextView
-        android:id="@+id/sheep_num_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:text="绵羊号："
-        android:textColor="#D3ECFF"
-        android:textSize="10sp"
-        android:layout_marginStart="@dimen/dp_10"
-        app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-        app:layout_constraintBottom_toTopOf="@+id/my_price" />
-
-    <TextView
-        android:id="@+id/my_price"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="1dp"
-        android:text="@string/loading"
-        android:textColor="@color/txt_white"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/my_property"/>
-
-    <TextView
-        android:id="@+id/my_property"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/sheep_num_tv"
-        android:layout_marginStart="@dimen/dp_10"
-        android:text="账户余额："
-        android:textColor="#D3ECFF"
-        android:textSize="10sp"
-        app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-        app:layout_constraintBaseline_toBaselineOf="@+id/my_price" />
-
-
-    <TextView
-        android:id="@+id/recharge"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white_big"
-        android:gravity="center"
-        android:minWidth="100dp"
-        android:text="充 值"
-        android:textColor="#33CCFF"
-        android:textSize="@dimen/text_size_4"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintBottom_toTopOf="@+id/withdrawal"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <TextView
-        android:id="@+id/withdrawal"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white_big"
-        android:gravity="center"
-        android:minWidth="100dp"
-        android:text="提 现"
-        android:textColor="#33CCFF"
-        android:textSize="@dimen/text_size_4"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-</android.support.constraint.ConstraintLayout>