主页功能模块列表与个人中心功能模块列表使用同一个adapter,并优化显示

app/src/main/java/com/sheep/gamegroup/model/entity/HomeListEntity.java

@@ -3,7 +3,7 @@ package com.sheep.gamegroup.model.entity;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.absBase.IJumpWeb;
-import com.sheep.gamegroup.absBase.ITag;
+import com.sheep.gamegroup.module.home.api.IHomeList;
 
 /**
  * 首页list
@@ -40,7 +40,7 @@ import com.sheep.gamegroup.absBase.ITag;
  * 是否需要js交互，类型为内部h5时，选填 1:需要 2:不需要
  */
 
-public class HomeListEntity implements ITag, IJumpWeb {
+public class HomeListEntity implements IJumpWeb, IHomeList {
     private String CreateTime;//	integer ($int64)创建时间，时间戳
     private String Desc;//	string描述
     private String Icon;//	string图标地址

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtPlayGame.java

@@ -1,29 +1,21 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.BaseViewHolder;
-import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.entity.GameListTag;
 import com.sheep.gamegroup.model.entity.GameListType;
-import com.sheep.gamegroup.model.entity.GameRecommend;
 import com.sheep.gamegroup.model.entity.ListTypeList;
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -37,9 +29,7 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ObservableUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdpGameCenter1_2List;
 import com.sheep.gamegroup.view.adapter.AdpGameCenter3_3List;
-import com.sheep.gamegroup.view.adapter.AdpUserCenterModule;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -55,11 +45,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.Unbinder;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
 import io.reactivex.schedulers.Schedulers;
 
 /**

app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpHomeList.java

@@ -0,0 +1,34 @@
+package com.sheep.gamegroup.module.home.adapter;
+
+import android.support.annotation.Nullable;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.module.home.api.IHomeList;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import java.util.List;
+
+/**
+ * Created by realicing on 2019/1/23.
+ * realicing@sina.com
+ * 小绵羊3.4.10新增 -- 主页homeList adapter
+ */
+public class AdpHomeList<T extends IHomeList> extends BaseQuickAdapter<T, BaseViewHolder> {
+
+    public AdpHomeList(@Nullable List<T> data) {
+        super(R.layout.item_my_list_but, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, final T item) {
+        helper.setText(R.id.my_item_text, item.getTitle());
+        ViewUtil.updateTag(helper.getView(R.id.my_item_tag), item);
+        Glide.with(SheepApp.getInstance()).load(item.getIcon()).into((ImageView) helper.getView(R.id.my_item_img));
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/home/api/IHomeList.java

@@ -0,0 +1,13 @@
+package com.sheep.gamegroup.module.home.api;
+
+import com.sheep.gamegroup.absBase.ITag;
+
+/**
+ * Created by realicing on 2019/1/23.
+ * realicing@sina.com
+ */
+public interface IHomeList extends ITag {
+    String getTitle();
+
+    String getIcon();
+}

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -2276,7 +2276,7 @@ public class ViewUtil {
         textView.setVisibility(View.INVISIBLE);
 
         int padding1 = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_1);
-        int padding2 = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
+        int padding2 = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_5);
         switch (tag.getTag()) {
             default:
 

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

@@ -1,74 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-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.ViewUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import java.util.List;
-
-/**
- * Created by ljy on 2018/5/10.
- */
-
-public class AdpHomeListGrideview extends BaseAdapter {
-    private List<HomeListEntity> homeListEntity;
-
-    public AdpHomeListGrideview(List<HomeListEntity> homeListEntity) {
-        this.homeListEntity = homeListEntity;
-    }
-
-    @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(SheepApp.getInstance()).inflate(R.layout.adp_homelist_gridview_new, null);
-            holder.gridview_item_tag_tv = convertView.findViewById(R.id.gridview_item_tag_tv);
-            holder.gridview_item_name_tv = convertView.findViewById(R.id.gridview_item_name_tv);
-            holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
-            convertView.setTag(holder);
-        }
-        final HomeListEntity entity = getItem(position);
-        ViewUtil.updateTag(holder.gridview_item_tag_tv, entity);
-        ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
-        Glide.with(SheepApp.getInstance())
-                .load(entity.getIcon())
-                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /3, G.WIDTH /4 /3))
-                .into(holder.gridview_item_icon_iv);
-        return convertView;
-    }
-
-    class ViewHolder{
-        TextView gridview_item_name_tv, gridview_item_tag_tv;
-        ImageView gridview_item_icon_iv;
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chad.library.adapter.base.BaseViewHolder;
-
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
-
-import java.util.List;
-
-/**
- * Created by realicing on 2018/11/14.
- * realicing@sina.com
- * 用户中心模块 adapter
- */
-public class AdpUserCenterModule extends BaseQuickAdapter<UserCenterModule, BaseViewHolder> {
-
-    public AdpUserCenterModule(@Nullable List<UserCenterModule> data) {
-        super(R.layout.item_my_list_but, data);
-    }
-
-    @Override
-    protected void convert(BaseViewHolder helper, final UserCenterModule item) {
-        helper.setText(R.id.my_item_text, item.getTitle());
-        ViewUtil.updateTag((TextView) helper.getView(R.id.my_item_tag), item);
-        Glide.with(SheepApp.getInstance()).load(item.getIcon()).into((ImageView) helper.getView(R.id.my_item_img));
-        helper.getView(R.id.my_item_but).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CommonUtil.getInstance().goNative(v.getContext(), item, "个人中心");
-            }
-        });
-    }
-}

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

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserTaskExistsNew;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.home.adapter.AdpHomeList;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
@@ -33,7 +34,6 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
-import com.sheep.gamegroup.view.adapter.AdpUserCenterModule;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -235,7 +235,9 @@ public class FgtPersonalCenter extends BaseFragment {
         moduleList.setHasFixedSize(true);
         moduleList.setNestedScrollingEnabled(false);
         moduleList.setLayoutManager(manager);
-        moduleList.setAdapter(new AdpUserCenterModule(userCenterModuleList));
+        AdpHomeList<UserCenterModule> adapter = new AdpHomeList<>(userCenterModuleList);
+        adapter.bindToRecyclerView(moduleList);
+        adapter.setOnItemChildClickListener((adapter1, view, position) -> CommonUtil.getInstance().goNative(SheepApp.getInstance().getCurrentActivity(), ListUtil.getItem(userCenterModuleList, position), "个人中心"));
     }
 
     //通过缓存数据初始化用户中心模块列表

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

@@ -19,6 +19,7 @@ import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -43,6 +44,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -67,6 +69,7 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.home.adapter.AdpHomeList;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
@@ -79,7 +82,6 @@ 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.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
@@ -91,10 +93,8 @@ import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 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.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
-import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -125,8 +125,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
 
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
-
 public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.View, TryMakeMoneyContract.View {
 
     @BindView(R.id.upview1)
@@ -143,8 +141,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     SmartRefreshLayout refresh;
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
-    @BindView(R.id.home_list_gridview_gv)
-    MyGridview home_list_gridview_gv;
+    @BindView(R.id.home_list_rv)
+    RecyclerView home_list_rv;
     @BindView(R.id.home_notice_ll)
     View home_notice_ll;
     @BindView(R.id.check_net_ll)
@@ -196,8 +194,8 @@ 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 AdpHomeListGrideview adpHomeListGrideview;
+    private List<HomeListEntity> homeListList = new ArrayList<>();
+    private AdpHomeList<HomeListEntity> adpHomeList;
     private AdpTryMakemoney mAdapter;
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
@@ -830,16 +828,17 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     //添加homeList数据
     private void addHomeList(List<HomeListEntity> cacheHomeListEtyList) {
         if (ListUtil.isEmpty(cacheHomeListEtyList)) {
-            ViewUtil.setVisibility(home_list_gridview_gv, false);
+            ViewUtil.setVisibility(home_list_rv, false);
         } else {
+            ViewUtil.setVisibility(home_list_rv, true);
             homeListEntitys.clear();
-            homeListEntitysGridview.clear();
+            homeListList.clear();
             fullHomeList.clear();
             CommonUtil.getInstance().splitHomeList(cacheHomeListEtyList, homeListEntitys, fullHomeList);
             boolean isShowQB = false;
             boolean isShowMd = false;
             for (int i = 0; i < homeListEntitys.size(); i++) {
-                homeListEntitysGridview.add(homeListEntitys.get(i));
+                homeListList.add(homeListEntitys.get(i));
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                     isShowQB = !isShowQB;
                 }
@@ -851,7 +850,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             SheepApp.getInstance().setShowQB(isShowQB);
             SheepApp.getInstance().setShowMidong(isShowMd);
             ViewUtil.notifyDataSetChanged(full_home_list_rv);
-            adpHomeListGrideview.notifyDataSetChanged();
+            adpHomeList.notifyDataSetChanged();
         }
         checkFullHomeList();
     }
@@ -950,20 +949,23 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
-        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview);
-        home_list_gridview_gv.setAdapter(adpHomeListGrideview);
+        adpHomeList = new AdpHomeList<>(homeListList);
 
-        home_list_gridview_gv.setOnItemClickListener((parent, view, position, id) -> {
-            HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
-            if (homeListEntity == null) {
+        GridLayoutManager manager = new GridLayoutManager(SheepApp.getInstance(), 4);
+        home_list_rv.setHasFixedSize(true);
+        home_list_rv.setNestedScrollingEnabled(false);
+        home_list_rv.setLayoutManager(manager);
+        adpHomeList.bindToRecyclerView(home_list_rv);
+        adpHomeList.setOnItemClickListener((adapter, view, position) -> {
+            HomeListEntity item = ListUtil.getItem(homeListList, position);
+            if (item == null) {
                 return;
             }
-            UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-            if ("-2".equals(homeListEntity.getJump())) {
-                setValueList(!homeListEntity.isSelect());
+            UMConfigUtils.IdEvent.HOME_LIST.commit(item.getId());
+            if ("-2".equals(item.getJump())) {
+                setValueList(!item.isSelect());
             } else {
-                CommonUtil.getInstance()
-                        .goWhere(activity, homeListEntity, "首页");
+                CommonUtil.getInstance().goWhere(activity, item, "首页");
             }
         });
     }
@@ -1178,9 +1180,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void failhomeList(BaseMessage baseMessage) {
-        if (homeListEntitys.isEmpty() && fullHomeList.isEmpty())
-            ViewUtil.setVisibility(home_list_gridview_gv, false);
-
+        ViewUtil.setVisibility(home_list_rv, !homeListList.isEmpty());
+        ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
     }
 
     private int onResumeCount = 0;
@@ -1529,7 +1530,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             }
         }
 
-        if (CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null) {
+        if (CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListList != null) {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
             homeListEntityNewTask.setTitle(getString(R.string.fresh_task));
             homeListEntityNewTask.setDesc(getString(R.string.fresh_task));
@@ -1550,17 +1551,17 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     private void setValueList(boolean flag) {
         boolean isNewYear = SkinUtil.getSkinByTime() == Plugin.skin_new_year;
-        homeListEntitysGridview.clear();
+        homeListList.clear();
         for (int i = 0; i < homeListEntitys.size(); i++) {
             if (flag) {
-                homeListEntitysGridview.add(homeListEntitys.get(i));
+                homeListList.add(homeListEntitys.get(i));
             } else {
                 if (i < 8) {
-                    homeListEntitysGridview.add(homeListEntitys.get(i));
+                    homeListList.add(homeListEntitys.get(i));
                 }
             }
         }
-        if (homeListEntitysGridview.size() > 8) {
+        if (homeListList.size() > 8) {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
@@ -1573,13 +1574,13 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 homeListEntity.setDesc("查看更多");
                 homeListEntity.setIcon(ViewUtil.getNetImgByName((isNewYear ? "ic_new_year_" : "") + "homepage_chakangd"));
             }
-            homeListEntitysGridview.set(7, homeListEntity);
+            homeListList.set(7, homeListEntity);
         }
         /* 为了避免第一次点击时网络图片未加载到本地导致UI混乱,第一次点击不执行此动画,转而使用View自带的变换动画 */
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && clickCount > 1) {
 //            TransitionManager.beginDelayedTransition(home_list_gridview_gv, new ChangeBounds());
 //        }
-        adpHomeListGrideview.notifyDataSetChanged();
+        adpHomeList.notifyDataSetChanged();
     }
 
     @BindView(R.id.home_search_msg_tv)

app/src/main/java/com/sheep/jiuyan/samllsheep/bean/UserCenterModule.java

@@ -2,13 +2,14 @@ package com.sheep.jiuyan.samllsheep.bean;
 
 import com.sheep.gamegroup.absBase.IJump;
 import com.sheep.gamegroup.absBase.ITag;
+import com.sheep.gamegroup.module.home.api.IHomeList;
 
 /**
  * Created by: zhoujuncai.
  * Created date: 2018/11/1.
  * Description: 用户中心item数据对象
  */
-public class UserCenterModule implements IJump, ITag {
+public class UserCenterModule implements IJump, IHomeList {
 
     /**
      * display:	integer ($int64)

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

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10">
-
-    <LinearLayout
-        android:id="@+id/linearlayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_marginTop="@dimen/content_padding_4">
-
-        <ImageView
-            android:id="@+id/gridview_item_icon_iv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"/>
-
-        <TextView
-            android:id="@+id/gridview_item_name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="试玩赚钱"
-            android:textSize="10sp"
-            android:textColor="@color/black_6_3"
-            android:layout_marginTop="@dimen/content_padding_small"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/gridview_item_tag_tv"
-        android:layout_width="35dp"
-        android:layout_height="wrap_content"
-        android:text="试玩"
-        android:textSize="7sp"
-        android:gravity="center"
-        android:padding="2dp"
-        android:textColor="@color/black_6_3"
-        android:layout_toRightOf="@+id/linearlayout"/>
-</RelativeLayout>

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

@@ -44,21 +44,14 @@
                     android:layout_below="@id/check_net_ll" />
 
 
-                <com.sheep.gamegroup.util.MyGridview
-                    android:id="@+id/home_list_gridview_gv"
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/home_list_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     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
@@ -95,7 +88,7 @@
                     android:id="@+id/full_home_list_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/home_list_gridview_gv" />
+                    android:layout_below="@id/home_list_rv" />
                 <LinearLayout
                     android:id="@+id/home_vp_ll"
                     android:layout_width="match_parent"

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

@@ -3,47 +3,35 @@
     android:id="@+id/my_item_but"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10">
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp">
 
-    <LinearLayout
-        android:id="@+id/my_item_img_text"
+    <ImageView
+        android:id="@+id/my_item_img"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/content_padding_4"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/my_item_img"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:minHeight="46dp"
-            android:layout_weight="1"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/icon" />
+        android:layout_height="60dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/icon" />
 
-        <TextView
-            android:id="@+id/my_item_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="试玩赚钱"
-            android:textColor="@color/black_6_3"
-            android:textSize="14sp" />
-    </LinearLayout>
+    <TextView
+        android:id="@+id/my_item_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/my_item_img"
+        android:layout_marginTop="5dp"
+        android:gravity="center"
+        android:text="试玩赚钱"
+        android:textColor="@color/black_6_3"
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/my_item_tag"
-        android:layout_width="26dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignEnd="@id/my_item_img_text"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
         android:gravity="center"
         android:text="试玩"
         android:textColor="@color/black_6_3"