Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

.idea/gradle.xml

@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

app/build.gradle

@@ -463,7 +463,7 @@ dependencies {
     //鸿途信达 广告sdk
     implementation(name: 'ad-htxd-201901071720', ext: 'aar')
 
-    //切换皮肤框架
+    //切换皮肤框架 https://github.com/ximsfei/Android-skin-support
 
     //    implementation 'skin.support:skin-support:4.0.1'                   // skin-support
 

app/src/main/AndroidManifest.xml

@@ -191,6 +191,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity-alias
+            android:name=".NewYearSplashAct"
+            android:enabled="false"
+            android:icon="@mipmap/icon_new_year"
+            android:label="@string/app_name"
+            android:targetActivity="com.sheep.gamegroup.view.activity.SplashAct">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
         <activity
             android:name="com.sheep.gamegroup.view.activity.MiddleSchemeAct"
             android:configChanges="keyboardHidden|screenSize|orientation"

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1563,9 +1563,10 @@ public interface ApiService {
 
     /**
      * 小绵羊3.4.5新增 -- 查询视频列表
+     *  @Param   sort        query   int true       "排序 1:最热 2:最新"
      */
     @GET(ApiKey.getVideoList)
-    Observable<BaseMessage> getVideoList(@Query("page_no") int page, @Query("page_size") int per_page);
+    Observable<BaseMessage> getVideoList(@Query("page_no") int page, @Query("page_size") int per_page, @Query("sort") int sort);
 
     /**
      * 小绵羊3.4.5新增 -- 查询音乐列表

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

@@ -221,9 +221,9 @@ public class GameEntity implements Serializable, ISearchRecord {
      * 获取平台
      * @return
      */
-    public String getManufacturer() {
+    public String getPackage_type_name() {
         if (app != null) {
-            return app.getManufacturer();
+            return app.getPackage_type_name();
         }
         return "";
     }

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/model/entity/TitleInfoList.java

@@ -70,27 +70,6 @@ public class TitleInfoList implements Comparable<TitleInfoList> {
                 return new LinearLayoutManager(SheepApp.getInstance());
         }
     }
-    private boolean showTopLine = true;//默认显示上面的线
-
-    public boolean isShowTopLine() {
-        return showTopLine;
-    }
-
-    public TitleInfoList setShowTopLine(boolean showTopLine) {
-        this.showTopLine = showTopLine;
-        return this;
-    }
-
-    private boolean showBottomLine;
-
-    public boolean isShowBottomLine() {
-        return showBottomLine;
-    }
-
-    public TitleInfoList setShowBottomLine(boolean showBottomLine) {
-        this.showBottomLine = showBottomLine;
-        return this;
-    }
 
     @Override
     public int compareTo(@NonNull TitleInfoList item) {

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActSearchGameGroup.java

@@ -107,8 +107,8 @@ public class ActSearchGameGroup extends BaseContainerActivity {
     private Runnable autoSearchRunnable = this::toSearchApp;
 
     public static final int MAX_SHOW_SEARCH_RECORD_COUNT = 10;//最多展示的搜索历史的个数
-    public static final int SORT_TOP_SEARCH = 1;//热门推荐 的排序
-    public static final int SORT_SEARCH_RECORD = 2;//搜索历史 的排序
+    public static final int SORT_TOP_SEARCH = 2;//热门推荐 的排序
+    public static final int SORT_SEARCH_RECORD = 1;//搜索历史 的排序
     List<ISearchRecord> topSearchList = new ArrayList<>();
 
     public static final String TOP_SEARCH_NAME = "热门搜索";

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenterTypeList.java

@@ -43,7 +43,7 @@ public class AdpGameCenterTypeList extends BaseQuickAdapter<GameEntity, BaseView
             ViewUtil.setText(item_dm_name_tv, download.getTask_name());
             String info = String.format(Locale.CHINA, "人在玩\u0020%sM\u3000", download.getPackage_size());
             ViewUtil.setText(item_dm_info_tv, new SpannableSb().append(item.getDownload_count(), "#2EBEF2").append(info, "#8E8E8E")
-//                    .append(item.getManufacturer(), "#FD2D54")
+                    .append(item.getPackage_type_name(), "#FD2D54")
                     .getSsb());
 
             item_dm_btn_tv.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + download.getDownload_link());

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenterTypeList2.java

@@ -37,7 +37,6 @@ public class AdpGameCenterTypeList2 extends BaseQuickAdapter<GameGroup, BaseView
             ViewUtil.setText(item_dm_name_tv, item.getName());
             String info = String.format(Locale.CHINA, "%sM\u3000", item.getPackage_size());
             ViewUtil.setText(item_dm_info_tv, new SpannableSb().append(info, "#8E8E8E")
-//                    .append(item.getManufacturer(), "#FD2D54")
                     .getSsb());
 
         }

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameGroupGameCompare.java

@@ -40,6 +40,6 @@ public class AdpGameGroupGameCompare extends BaseQuickAdapter<Applications, Base
         ViewUtil.setText(item_gggc_score_tv, NumberFormatUtils.retain1(item.getScore())+"分");
         item_gggc_score_acrb.setMax(10);
         item_gggc_score_acrb.setProgress((int) item.getScore());
-        ViewUtil.setVisibility(item_gggc_line, helper.getAdapterPosition() != 0);
+        ViewUtil.setVisibility(item_gggc_line, helper.getAdapterPosition() + 1 != getItemCount());
     }
 }

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpSearchResp.java

@@ -37,6 +37,7 @@ public class AdpSearchResp extends AdbCommonRecycler<SearchResp>{
         holder.itemView.setOnClickListener(v -> Jump2View.getInstance().goSearchResp(item));
         View item_download_welfare_line = holder.itemView.findViewById(R.id.line_tv);
         TextView detail_task_tv_center = holder.itemView.findViewById(R.id.detail_task_tv_center);
+        TextView detail_task_tv_center2 = holder.itemView.findViewById(R.id.detail_task_tv_center2);
         TextView item_name_tv = holder.itemView.findViewById(R.id.item_name_tv);
         TextView item_date_tv = holder.itemView.findViewById(R.id.item_date_tv);
         LinearLayout ll_game_tag = holder.itemView.findViewById(R.id.ll_game_tag);
@@ -51,6 +52,7 @@ public class AdpSearchResp extends AdbCommonRecycler<SearchResp>{
         ViewUtil.setText(detail_task_tv_center, "查看详情");
 
         ViewUtil.setVisibility(item_download_welfare_line, holder.getAdapterPosition() + 1 == getItemCount() ? View.GONE : View.VISIBLE);
+        ViewUtil.setVisibility(detail_task_tv_center2, gameGroup.getGame_discount_id() > 0);
 
         Applications download = item.getDownload();
         //tag 标签绘制

app/src/main/java/com/sheep/gamegroup/module/game/api/IGameGroup.java

@@ -10,4 +10,6 @@ public interface IGameGroup {
     String getPackageSizeMsg();
 
     String getIcon();
+
+    int getGame_discount_id();
 }

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

@@ -2,11 +2,14 @@ package com.sheep.gamegroup.module.game.fragment;
 
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
 
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.KeyEventUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.view.fragment.FgtDownloadWelfareList;
@@ -45,16 +48,16 @@ public class FgtGameCenter extends BaseFragment {
     @BindView(R.id.my_walfare_btn)
     Button myWalfareBtn;
 
-    private TitleFragmentListAdapter mAdapter;
 
     private void initView() {
+        ViewUtil.setVisibility(myWalfareBtn, false);
         backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
-        mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
+        TitleFragmentListAdapter mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
         mAdapter.add(new FgtPlayGame(), "玩转游戏");
         mAdapter.add(new FgtDownloadWelfareList(), "礼包中心");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
-        pager.setOffscreenPageLimit(3);
+        pager.setOffscreenPageLimit(mAdapter.getCount());
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int i, float v, int i1) {
@@ -63,9 +66,8 @@ public class FgtGameCenter extends BaseFragment {
 
             @Override
             public void onPageSelected(int i) {
-                downloadBtn.setVisibility(i == 0 ? View.VISIBLE : View.GONE);
-                searchBtn.setVisibility(i == 0 ? View.VISIBLE : View.GONE);
-                myWalfareBtn.setVisibility(i == 0 ? View.GONE : View.VISIBLE);
+                ViewUtil.setVisibility(downloadBtn, i == 0);
+                ViewUtil.setVisibility(searchBtn, i == 0);
             }
 
             @Override
@@ -90,7 +92,7 @@ public class FgtGameCenter extends BaseFragment {
 
     @OnClick(R.id.back_btn)
     public void doBack(View v) {
-        getActivity().finish();
+        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
     }
 
     @OnClick(R.id.download_btn)

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/game/model/GameGroup.java

@@ -40,6 +40,8 @@ public class GameGroup implements IGameGroup {
 
     private int tag;
 
+    private int game_discount_id;
+
     private String updated_at;
 
     public String getName() {
@@ -127,6 +129,15 @@ public class GameGroup implements IGameGroup {
         this.updated_at = updated_at;
     }
 
+    public int getGame_discount_id() {
+        return game_discount_id;
+    }
+
+    public void setGame_discount_id(int game_discount_id) {
+        this.game_discount_id = game_discount_id;
+    }
+
+
 
 
     /**

app/src/main/java/com/sheep/gamegroup/module/game/model/SearchResp.java

@@ -81,36 +81,4 @@ public class SearchResp {
         }
         return null;
     }
-
-    public String getPackage_size() {
-        switch (type){
-            case TYPE_GAME:
-                if(applications != null){
-                    return applications.getPackage_size()+"M";
-                }
-                break;
-            case TYPE_GAME_GROUP:
-                if(game_group != null){
-                    return game_group.getPackage_size()+"M";
-                }
-                break;
-        }
-        return "";
-    }
-
-    public String getIcon() {
-        switch (type){
-            case TYPE_GAME:
-                if(applications != null){
-                    return applications.getIcon();
-                }
-                break;
-            case TYPE_GAME_GROUP:
-                if(game_group != null){
-                    return game_group.getIcon();
-                }
-                break;
-        }
-        return null;
-    }
 }

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/module/login/LoginAct.java

@@ -11,7 +11,6 @@ import android.view.Menu;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.model.entity.LoginEntity;
-import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.module.login.controller.LoginController;
 import com.sheep.gamegroup.module.login.fragments.EditUserInfoFgt;
 import com.sheep.gamegroup.module.login.fragments.FindAccountFgt;

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -6,6 +6,7 @@ import android.text.TextUtils;
 import android.text.method.HideReturnsTransformationMethod;
 import android.text.method.PasswordTransformationMethod;
 import android.view.View;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 
@@ -16,6 +17,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.login.controller.LoginController;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -43,6 +45,14 @@ public class SignUpFgt extends BaseFragment {
     EditText passwordBox;
     @BindView(R.id.show_hide_pwd_btn)
     ImageView showHidePwdBtn;
+    @BindView(R.id.password_box2)
+    EditText passwordBox2;
+    @BindView(R.id.show_hide_pwd_btn2)
+    ImageView showHidePwdBtn2;
+
+    //用户协议
+    @BindView(R.id.tel_agreement_cb)
+    CheckBox tel_agreement_cb;
 
     public SignUpFgt() {
         // Required empty public constructor
@@ -77,9 +87,23 @@ public class SignUpFgt extends BaseFragment {
         }
         passwordBox.setSelection(passwordBox.getText().toString().length());
     }
+    @OnClick(R.id.show_hide_pwd_btn2)
+    public void doShowHidePwd2(View v) {
+        showHidePwdBtn2.setSelected(!showHidePwdBtn2.isSelected());
+        showHidePwdBtn2.setImageResource(showHidePwdBtn2.isSelected() ? R.mipmap.pwd_show : R.mipmap.pwd_hide);
+        if (showHidePwdBtn2.isSelected()) {
+            //如果选中，显示密码
+            passwordBox2.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+        } else {
+            //否则隐藏密码
+            passwordBox2.setTransformationMethod(PasswordTransformationMethod.getInstance());
+        }
+        passwordBox2.setSelection(passwordBox2.getText().toString().length());
+    }
 
     @OnClick(R.id.register_btn)
     public void doRegister(View v) {
+        if(checkAgreement()) return;
         if (!validate()) return;
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("user_name", userNameBox.getText().toString().trim());
@@ -109,7 +133,7 @@ public class SignUpFgt extends BaseFragment {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(getActivity(), loginEty.getToken());
+                            SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
                             DataUtil.getInstance().initUserEntity(loginEty.getUser());
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }
@@ -120,6 +144,7 @@ public class SignUpFgt extends BaseFragment {
     private boolean validate() {
         String username = userNameBox.getText().toString().trim();
         String password = passwordBox.getText().toString().trim();
+        String password2 = passwordBox2.getText().toString().trim();
         if (TextUtils.isEmpty(username)) {
             G.shortToast("请输入用户名");
             return false;
@@ -128,6 +153,10 @@ public class SignUpFgt extends BaseFragment {
             G.shortToast("请输入密码");
             return false;
         }
+        if (TextUtils.isEmpty(password2)) {
+            G.shortToast("请确认密码");
+            return false;
+        }
         if (!StringUtils.isUserName(username)) {
             G.shortToast("用户名只能包含英文、数字、._-@符号，长度4-20");
             return false;
@@ -136,7 +165,24 @@ public class SignUpFgt extends BaseFragment {
             G.shortToast("密码只能包含英文、数字、_.-@$!*%符号，长度6-16");
             return false;
         }
+        if (!TextUtils.equals(password, password2)) {
+            G.shortToast("两次输入的密码不相同");
+            return false;
+        }
         return true;
     }
 
+    @OnClick(R.id.tel_agreement_tv)
+    public void showAgreement(View v) {
+        Jump2View.getInstance().tryShowAgreement(SheepApp.getInstance().getCurrentActivity(), G::showToast);
+    }
+
+    //检查是否同意用户协议
+    protected boolean checkAgreement() {
+        if(tel_agreement_cb.isChecked()){
+            return false;
+        }
+        G.showToast("温馨提示：您必须同意用户协议才能继续体验小绵羊APP！");
+        return true;
+    }
 }

app/src/main/java/com/sheep/gamegroup/module/skin/util/SkinUtil.java

@@ -1,6 +1,8 @@
 package com.sheep.gamegroup.module.skin.util;
 
 import android.app.Activity;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.absBase.AbsObserver;
@@ -11,6 +13,9 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.Md5Util;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.gamegroup.view.activity.SplashAct;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.io.File;
@@ -56,19 +61,20 @@ public class SkinUtil {
     public static final String KEY_CUR_SKIN_MD5 = "cur_skin";//当前正在使用的皮肤的key
     //切换皮肤
     public static void changeSkin(Action1<Object> action1) {
-        curPlugin = getSkinByTime();//需要加载的皮肤
+        Plugin willLoadPlugin = getSkinByTime();//需要加载的皮肤
         String curSkinMd5 = PreferenceUtils.getPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, null);
-        if(curPlugin == null){//默认皮肤
+        if(willLoadPlugin == null){//默认皮肤
             String curSkinName = SkinPreference.getInstance().getSkinName();
             if(TextUtils.isEmpty(curSkinMd5) || !TextUtils.isEmpty(curSkinName)){
                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, "");
                 restoreDefaultTheme();
+                changeDefaultIcon();
             }
             action1.call(null);
             return;
         }
         Activity activity = SheepApp.getInstance().getCurrentActivity();
-        SheepPluginUtil.checkAndRunPlugin(activity, curPlugin)
+        SheepPluginUtil.checkAndRunPlugin(activity, willLoadPlugin)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new AbsObserver<Plugin>() {
@@ -80,9 +86,10 @@ public class SkinUtil {
                             return;
                         }
                         String md5 = Md5Util.getFileMD5(file);
-                        String skinName = SheepPluginUtil.getFileName(curPlugin);
+                        String skinName = SheepPluginUtil.getFileName(willLoadPlugin);
                         String curSkinName = SkinPreference.getInstance().getSkinName();
                         if(curSkinMd5 != null && TextUtils.equals(md5, curSkinMd5) && TextUtils.equals(skinName, curSkinName)){//已经加载皮肤
+                            curPlugin = willLoadPlugin;
                             action1.call(null);
                             return;
                         }
@@ -96,6 +103,9 @@ public class SkinUtil {
                             @Override
                             public void onSuccess() {
                                 LogUtil.println(SkinUtil.class.getSimpleName(), "changeSkin", "loadSkin", skinName, "onSuccess");
+                                curPlugin = willLoadPlugin;
+                                if(isLoadNewYearSkin())
+                                    changeIcon();
                                 PreferenceUtils.setPrefString(SheepApp.getInstance(), KEY_CUR_SKIN_MD5, md5);
                                 action1.call(null);
                             }
@@ -141,4 +151,68 @@ public class SkinUtil {
     public static String getSkinPath(String skinName) {
         return SheepPluginUtil.getFileByName(skinName, curPlugin).getAbsolutePath();
     }
+
+    public static void changeIcon() {
+        //拿到我们注册的MainActivity组件
+        ComponentName defaultComponent = new ComponentName(SheepApp.getInstance(), SplashAct.class.getName());  //拿到默认的组件
+        //拿到我注册的别名test组件
+        ComponentName testComponent = new ComponentName(SheepApp.getInstance(), BuildConfig.APPLICATION_ID + ".NewYearSplashAct");
+        if(!TestUtil.isDev())
+            disableComponent(defaultComponent);
+        enableComponent(testComponent);
+    }
+
+    public static void changeDefaultIcon() {
+        //拿到我们注册的MainActivity组件
+        ComponentName defaultComponent = new ComponentName(SheepApp.getInstance(), SplashAct.class.getName());  //拿到默认的组件
+        //拿到我注册的别名test组件
+        ComponentName testComponent = new ComponentName(SheepApp.getInstance(), BuildConfig.APPLICATION_ID + ".NewYearSplashAct");
+        enableComponent(defaultComponent);
+        disableComponent(testComponent);
+    }
+    /**
+     * 启用组件
+     *
+     * @param componentName
+     */
+    private static void enableComponent(ComponentName componentName) {
+        PackageManager packageManager = SheepApp.getInstance().getPackageManager();
+        int state = packageManager.getComponentEnabledSetting(componentName);
+        if (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
+            //已经启用
+            return;
+        }
+        packageManager.setComponentEnabledSetting(componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP);
+    }
+
+    /**
+     * 禁用组件
+     *
+     * @param componentName
+     */
+    private static void disableComponent(ComponentName componentName) {
+        PackageManager packageManager = SheepApp.getInstance().getPackageManager();
+        int state = packageManager.getComponentEnabledSetting(componentName);
+        if (state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            //已经禁用
+            return;
+        }
+        packageManager.setComponentEnabledSetting(componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
+    //获取应用图标
+    public static int getAppIcon(){
+        return isLoadNewYearSkin() ? R.mipmap.icon_new_year : R.mipmap.icon;
+    }
+
+    /**
+     * 是否加载的是春节皮肤
+     * @return
+     */
+    public static boolean isLoadNewYearSkin(){
+        return curPlugin == Plugin.skin_new_year;
+    }
 }

app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java

@@ -13,6 +13,7 @@ import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.activity.MiddleAct;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -159,9 +160,9 @@ public class SheepJpushReceiver extends BroadcastReceiver {
 
             notificationBuilder
                     //下拉显示的大图标
-    //                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.icon))
+    //                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), SkinUtil.getAppIcon()))
     //                .setSmallIcon(R.mipmap.remenyx)//系统状态栏显示的小图标 remenyx
-                    .setSmallIcon(R.drawable.icon)
+                    .setSmallIcon(SkinUtil.getAppIcon())
                     .setTicker(title)
                     .setDefaults(Notification.DEFAULT_VIBRATE)
                     .setWhen(System.currentTimeMillis())

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

@@ -2802,7 +2802,8 @@ public class Jump2View {
                         Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
                         if(gameGroup.getFirstApplications() != null)
                             intent.putExtra("id", gameGroup.getFirstApplications().getId());
-                        DataUtil.putObject(intent, gameGroup);
+                        if(ListUtil.size(gameGroup.getApplications()) > 1)//有多个游戏时才添加游戏组数据
+                            DataUtil.putObject(intent, gameGroup);
                         activity.startActivity(intent);
                     }
 
@@ -2837,4 +2838,14 @@ public class Jump2View {
             Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), webParams);
         });
     }
+
+    /**
+     * 小绵羊3.4.10新增 -- 跳转新春活动 界面
+     */
+    public void goNewSpringActivitys() {
+        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_NEW_SPRING_ACTIVITIES_URL, url -> {
+            WebParams webParams = new WebParams(url, "新春活动");
+            Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), webParams);
+        });
+    }
 }

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

@@ -2,12 +2,11 @@ package com.sheep.gamegroup.util;
 
 import android.support.v4.app.Fragment;
 
-import com.sheep.gamegroup.module.plugin.model.Plugin;
+import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
 import com.sheep.gamegroup.view.fragment.FgtFind;
-import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
@@ -53,7 +52,7 @@ public enum MainTab {
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
         public Fragment getFragment() {
-            return SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
+            return SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
         }
 
         @Override

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

@@ -844,7 +844,7 @@ public class TestUtil {
      * umen 分享
      */
     private void testUmen(Activity context) {
-        UMImage umImage = new UMImage(context, R.mipmap.icon);
+        UMImage umImage = new UMImage(context, SkinUtil.getAppIcon());
         new ShareAction(context)
                 .withText("hehe")
                 .withMedia(umImage)

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

@@ -85,6 +85,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.game.fragment.FgtMyGameList;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsResp;
 import com.sheep.gamegroup.util.glide.RoundedCornersTransformation;
@@ -182,7 +183,7 @@ public class ViewUtil {
 
         GlideImageLoader.saveAndSetRqImageDisHardConfig(iv_qr, link, 800);
         Glide.with(activity)
-                .load(R.drawable.icon)
+                .load(SkinUtil.getAppIcon())
                 .apply(new RequestOptions().disallowHardwareConfig().override(G.WIDTH / 8))
                 .into(iv_qr_small);
 
@@ -852,7 +853,7 @@ public class ViewUtil {
      */
     private static void shareAction(Activity activity, String title, String content, String url, SHARE_MEDIA media, final ShareCallback callback) {
         /* 缩略图 */
-        UMImage image = new UMImage(activity, R.drawable.icon);
+        UMImage image = new UMImage(activity, SkinUtil.getAppIcon());
         /* URL */
         UMWeb web = new UMWeb(url);
         /* 标题 */
@@ -1712,7 +1713,7 @@ public class ViewUtil {
     public static void centerImage(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1738,7 +1739,7 @@ public class ViewUtil {
     public static void setBlur(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1753,7 +1754,7 @@ public class ViewUtil {
             if(object instanceof String) {
                 String pictures = object.toString();
                 if (TextUtils.isEmpty(pictures)) {
-                    imageView.setImageResource(R.mipmap.icon);
+                    imageView.setImageResource(SkinUtil.getAppIcon());
                 } else {
                     if (pictures.contains(";")) {
                         pictures = pictures.split(";")[0];
@@ -1769,7 +1770,7 @@ public class ViewUtil {
     public static void setViewWH(ImageView imageView, String pictures, int width) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1823,7 +1824,7 @@ public class ViewUtil {
     public static void setImagePath(ImageView imageView, String paths) {
         if (imageView != null) {
             if (TextUtils.isEmpty(paths)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (paths.contains(";")) {
                     paths = paths.split(";")[0];
@@ -1836,7 +1837,7 @@ public class ViewUtil {
     public static void setImagePath(ImageView imageView, String paths, int radio) {
         if (imageView != null) {
             if (TextUtils.isEmpty(paths)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (paths.contains(";")) {
                     paths = paths.split(";")[0];
@@ -1849,7 +1850,7 @@ public class ViewUtil {
     public static void setImageLoading(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1862,7 +1863,7 @@ public class ViewUtil {
     public static void setImage(ImageView imageView, String pictures, int radius) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1871,11 +1872,23 @@ public class ViewUtil {
             }
         }
     }
+    public static void roundedCornersImage1(ImageView imageView, String pictures, int radius) {
+        if (imageView != null) {
+            if (TextUtils.isEmpty(pictures)) {
+                imageView.setImageResource(SkinUtil.getAppIcon());
+            } else {
+                if (pictures.contains(";")) {
+                    pictures = pictures.split(";")[0];
+                }
+                GlideImageLoader.roundedCornersImage1(imageView, pictures, radius);
+            }
+        }
+    }
 
     public static void setGameImage(ImageView imageView, String pictures) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -1888,7 +1901,7 @@ public class ViewUtil {
     public static void setGameImage(ImageView imageView, String pictures, int radius) {
         if (imageView != null) {
             if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
+                imageView.setImageResource(SkinUtil.getAppIcon());
             } else {
                 if (pictures.contains(";")) {
                     pictures = pictures.split(";")[0];
@@ -2276,7 +2289,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/util/share/ShareLinkConfig.java

@@ -15,6 +15,7 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.StringUtils;
@@ -263,7 +264,7 @@ public class ShareLinkConfig {
             } else if(iconResId > 0){
                 umImage = new UMImage(SheepApp.getInstance(), iconResId);
             } else {
-                umImage = new UMImage(SheepApp.getInstance(), R.mipmap.icon);
+                umImage = new UMImage(SheepApp.getInstance(), SkinUtil.getAppIcon());
             }
             umWeb = new UMWeb(realUrl);
             umWeb.setTitle(title);

app/src/main/java/com/sheep/gamegroup/util/string/SpannableSb.java

@@ -22,15 +22,18 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
  */
 public class SpannableSb {
     private SpannableStringBuilder ssb = new SpannableStringBuilder();
+    private String appendText;
     private int start;
     private int end;
 
     public SpannableSb append(Object object) {
         String text = object.toString();
         if(TextUtils.isEmpty(text)){
+            appendText = null;
             return this;
         }
         ssb.append(text);
+        appendText = text;
         start = end;
         end += text.length();
         return this;
@@ -49,6 +52,9 @@ public class SpannableSb {
     }
 
     public SpannableSb setTextSize(@DimenRes int textSize) {
+        if(appendText == null){//无效添加
+            return this;
+        }
         //AbsoluteSizeSpan 参数 dip: size单位为px，true；size单位为dip（默认为false）。
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(ResourceUtils.getXmlDef(textSize), true);
         ssb.setSpan(absoluteSizeSpan, start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
@@ -56,18 +62,27 @@ public class SpannableSb {
     }
 
     public SpannableSb setTextColor(String textColor) {
+        if(appendText == null){//无效添加
+            return this;
+        }
         ForegroundColorSpan colorSpan = new ForegroundColorSpan(Color.parseColor(textColor));
         ssb.setSpan(colorSpan, start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         return this;
     }
     //设置字体样式: NORMAL正常，BOLD粗体，ITALIC斜体，BOLD_ITALIC粗斜体  如： android.graphics.Typeface.BOLD
     public SpannableSb setTextStyle(int textStyle) {
+        if(appendText == null){//无效添加
+            return this;
+        }
         StyleSpan colorSpan = new StyleSpan(textStyle);
         ssb.setSpan(colorSpan, start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         return this;
     }
     //设置样式
     public SpannableSb setTextSpan(ParcelableSpan span) {
+        if(appendText == null){//无效添加
+            return this;
+        }
         ssb.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         return this;
     }
@@ -85,6 +100,7 @@ public class SpannableSb {
     public SpannableSb appendDrawable(int drawableId) {
         String text = "★";
         ssb.append(text);
+        appendText = text;
         start = end;
         end += text.length();
         ImageSpan imageSpan = new ImageSpan(SheepApp.getInstance(), drawableId);

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/activity/ActCommentGameApp.java

@@ -47,27 +47,12 @@ public class ActCommentGameApp extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, "写评价")
-                .setEndTv(this, "发表", 0xFF2EBEF2, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        int progress = act_comment_game_app_score.getProgress();
-                        String content = act_comment_game_app_input_comment.getText().toString();
-                        commitUserGameComment(progress, content);
-                    }
+                .setEndTv(this, "发表", 0xFF2EBEF2, view -> {
+                    int progress = act_comment_game_app_score.getProgress();
+                    String content = act_comment_game_app_input_comment.getText().toString();
+                    commitUserGameComment(progress, content);
                 })
                 .setTitleFinish(this);
-//
-//        Observable.just(1).delay(100L, TimeUnit.MILLISECONDS)
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(new Action1<Integer>() {
-//                    @Override
-//                    public void call(Integer integer) {
-//                        act_comment_game_app_input_comment.setFocusable(true);
-//                        act_comment_game_app_input_comment.setFocusableInTouchMode(true);
-//                        act_comment_game_app_input_comment.requestFocus();
-//                    }
-//                });
     }
 
     //评论游戏
@@ -86,12 +71,9 @@ public class ActCommentGameApp extends BaseActivity {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         act_comment_game_app_input_comment.setText("");
-                        DialogSuccessUtil.showSuccess(ActCommentGameApp.this, "发表成功", new DialogInterface.OnDismissListener() {
-                            @Override
-                            public void onDismiss(DialogInterface dialogInterface) {
-                                setResult(RESULT_OK);
-                                finish();
-                            }
+                        DialogSuccessUtil.showSuccess(ActCommentGameApp.this, "发表成功", dialogInterface -> {
+                            setResult(RESULT_OK);
+                            finish();
                         });
                     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -37,6 +37,7 @@ import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.PictureInvitationEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.transformer.ScaleTransformer;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
@@ -229,6 +230,7 @@ public class ActInvitation extends BaseUMActivity {
             final ImageView image_bottom = itemView.findViewById(R.id.image_bottom);
             final ImageView image_logo = itemView.findViewById(R.id.image_logo);
             final TextView image_tip = itemView.findViewById(R.id.image_tip);
+            image_logo.setImageResource(SkinUtil.getAppIcon());
             final RequestListener<Drawable> listener = new RequestListener<Drawable>() {
                 @Override
                 public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {

app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -54,6 +54,7 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -132,6 +133,8 @@ public class ActMain extends BaseActYmPermissionCheck {
     RelativeLayout main_layout;
     @BindView(R.id.person_center_red_dot)
     View person_center_red_dot;
+    @BindView(R.id.home_new_spring_activitys_drl)
+    View home_new_spring_activitys_drl;
 
     @Override
     protected int getLayoutId() {
@@ -168,6 +171,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     private long lastClickTime = 0;
 
     private void initFragments() {
+        changeVisible(-1, lastPosition);
         //小绵羊3.4.10新增 判断用户是否是游戏用户，是的话默认打开游戏界面
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.isGameUser()) {
@@ -234,9 +238,14 @@ public class ActMain extends BaseActYmPermissionCheck {
             lFragment.setUserVisibleHint(false);
             cFragment.setUserVisibleHint(true);
         }
+        changeVisible(lastPosition, position);
         lastPosition = position;
     }
 
+    private void changeVisible(int lastPosition, int position) {
+        ViewUtil.setVisibility(home_new_spring_activitys_drl, position != MainTab.FgtSmallSheep.ordinal());
+    }
+
     /**
      * 统计
      *
@@ -472,4 +481,9 @@ public class ActMain extends BaseActYmPermissionCheck {
         ViewUtil.setVisibility(person_center_red_dot, false);
     }
 
+    //跳转新春活动
+    @OnClick(R.id.home_new_spring_activitys_drl)
+    public void goNewSpringActivitys(View v) {
+        Jump2View.getInstance().goNewSpringActivitys();
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -5,7 +5,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyNewYear;
@@ -36,7 +35,7 @@ public class AskGetMoneyAct extends BaseUMActivity{
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if(fragment == null){
-            fragment = SkinUtil.curPlugin == Plugin.skin_new_year ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
+            fragment = SkinUtil.isLoadNewYearSkin() ? new FgtAskGetMoneyNewYear() : new FgtAskGetMoney();
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();
         }else {

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
@@ -158,7 +159,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
         Glide.with(SheepApp.getInstance())
                 .load(taskEty.getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon())
                         .dontAnimate())
                 .into(iconIv);
 

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

@@ -67,36 +67,30 @@ public class AdpArticleComment extends BaseQuickAdapter<UserComment, BaseViewHol
         TextViewUtil.initIntroView(helper.itemView, item.getShowAll());
         ViewUtil.setVisibility(article_comment_num1, hasCommentDetail);
         if(hasCommentDetail) {
-            article_comment_num1.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    //跳转评论详情界面
-                    Jump2View.getInstance().goActAppCommentDetail(item.getId());
-                }
+            article_comment_num1.setOnClickListener(view -> {
+                //跳转评论详情界面
+                Jump2View.getInstance().goActAppCommentDetail(item.getId());
             });
         }
 
-        article_comment_num2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ViewUtil.showUpGifDialog(SheepApp.getInstance().getCurrentActivity());
-                article_comment_num2.setEnabled(false);
-                ApiUtil.postGameUserUserGameCommentLike(item.getId(), new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+        article_comment_num2.setOnClickListener(view -> {
+            ViewUtil.showUpGifDialog(SheepApp.getInstance().getCurrentActivity());
+            article_comment_num2.setEnabled(false);
+            ApiUtil.postGameUserUserGameCommentLike(item.getId(), new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        G.showToast("操作成功");
-                        item.plusLike();
-                        ViewUtil.setText(article_comment_num2, item.getLike());
-                        article_comment_num2.setEnabled(true);
-                    }
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast("操作失败");
-                        article_comment_num2.setEnabled(true);
-                    }
-                });
-            }
+                @Override
+                public void onNext(BaseMessage baseMessage) {
+                    G.showToast("操作成功");
+                    item.plusLike();
+                    ViewUtil.setText(article_comment_num2, item.getLike());
+                    article_comment_num2.setEnabled(true);
+                }
+                @Override
+                public void onError(BaseMessage baseMessage) {
+                    G.showToast("操作失败");
+                    article_comment_num2.setEnabled(true);
+                }
+            });
         });
         if(article_comment_num3 != null) {
             article_comment_num3.setOnClickListener(new View.OnClickListener() {

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

@@ -1,76 +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.ViewUtil;
-import com.sheep.jiuyan.samllsheep.R;
-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;
-    private Context context;
-
-    public AdpHomeListGrideview(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_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(context)
-                .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/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/adapter/AdpTitleInfoList.java

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.GameInfoList;
 import com.sheep.gamegroup.model.entity.TitleInfoList;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -24,15 +25,18 @@ public class AdpTitleInfoList extends BaseQuickAdapter<TitleInfoList, BaseViewHo
         super(R.layout.item_title_info_list, list);
     }
 
+
     @Override
     public void convert(BaseViewHolder viewHolder, final TitleInfoList itemList) {
+        int position = viewHolder.getAdapterPosition();
+
         View item_title_info_list_top = viewHolder.itemView.findViewById(R.id.item_title_info_list_top);
         View item_title_info_list_bottom = viewHolder.itemView.findViewById(R.id.item_title_info_list_bottom);
         TextView item_title_info_list_tv = viewHolder.itemView.findViewById(R.id.item_title_info_list_tv);
         RecyclerView recyclerView = viewHolder.itemView.findViewById(R.id.item_title_info_list_rv);
 
-        ViewUtil.setVisibility(item_title_info_list_top, itemList.isShowTopLine());
-        ViewUtil.setVisibility(item_title_info_list_bottom, itemList.isShowBottomLine());
+        ViewUtil.setVisibility(item_title_info_list_top, isShowTopLine(itemList, position));
+        ViewUtil.setVisibility(item_title_info_list_bottom, isShowBottomLine(itemList, position));
         ViewUtil.setText(item_title_info_list_tv, itemList.getName());
 
         recyclerView.setHasFixedSize(true);
@@ -40,4 +44,13 @@ public class AdpTitleInfoList extends BaseQuickAdapter<TitleInfoList, BaseViewHo
         recyclerView.setLayoutManager(itemList.getLayoutManager());
         recyclerView.setAdapter(itemList.getAdapter());
     }
+
+    private boolean isShowBottomLine(TitleInfoList itemList, int position) {
+        TitleInfoList nextItem = ListUtil.getItem(getData(), position + 1);
+        return nextItem != null && nextItem.getAdapter() != null && nextItem.getAdapter().getItemCount() > 0;
+    }
+
+    private boolean isShowTopLine(TitleInfoList itemList, int position) {
+        return false;
+    }
 }

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/adapter/AdpVideo.java

@@ -37,8 +37,8 @@ public class AdpVideo extends RecyclerViewAdapter<DiscoveryVideo> {
         ImageView item_video_cover = viewHolder.itemView.findViewById(R.id.item_video_cover);
         TextView item_video_play_no_tv = viewHolder.itemView.findViewById(R.id.item_video_play_no_tv);
         TextView item_video_time_tv = viewHolder.itemView.findViewById(R.id.item_video_time_tv);
-//        ViewUtil.setViewWH(item_video_cover, item.getCover(), width);
-        ViewUtil.setImageWH(item_video_cover, item.getCover(), width, G.getRealPix(5));
+        ViewUtil.setViewWH(item_video_cover, width, 1920 / 1080.f);
+        ViewUtil.roundedCornersImage1(item_video_cover, item.getCover(), G.getRealPix(5));
         ViewUtil.setVisibility(item_video_play_no_tv, item.getPlay() > 0);
         ViewUtil.setText(item_video_play_no_tv, String.format(Locale.CHINA, "%s次播放", NumberFormatUtils.getText(item.getPlay())));
         ViewUtil.setText(item_video_time_tv, TimeUtil.getDurationText(item.getDuration()));

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

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
@@ -62,7 +63,7 @@ public class NewbieTaskAdp extends BaseAdapter {
         return 0;
     }
 
-    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.icon, R.drawable.newbie_task_6};
+    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, SkinUtil.getAppIcon(), R.drawable.newbie_task_6};
 
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {

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

@@ -26,11 +26,9 @@ import java.util.List;
  */
 
 public class PlayGameItemAdapter extends AdbCommonRecycler<GameEntity> {
-    private Context activity;
 
     public PlayGameItemAdapter(Context context, List<GameEntity> list) {
         super(context, list);
-        activity = context;
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -101,7 +102,7 @@ public class TaskListItemAdp extends BaseAdapter {
         setTaskStatusText(ety, holder.detail_task_tv,holder.desc_tv);
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
-                .apply(new RequestOptions().placeholder(R.mipmap.icon))
+                .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon()))
                 .into(holder.icon_iv);
         return convertView;
     }

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

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.Release_task;
+import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
@@ -401,7 +402,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
                 Glide.with(context)
                         .load(item.getIcon())
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon))
+                        .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon()))
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
 
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogSuccessUtil.java

@@ -28,14 +28,11 @@ public class DialogSuccessUtil {
                 .create();
         TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
         final View close = dialog_parent.findViewById(R.id.dialog_close);
-        close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                try {
-                    dialog.dismiss();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+        close.setOnClickListener(view -> {
+            try {
+                dialog.dismiss();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         });
         dialog_title.setText(msg);
@@ -47,7 +44,7 @@ public class DialogSuccessUtil {
         }
 
         //3秒后自动消失
-        Observable.just(1).delay(3, TimeUnit.SECONDS)
+        Observable.just(1).delay(1, TimeUnit.SECONDS)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new AbsObserver<Integer>() {

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.annotation.NonNull;
@@ -8,7 +7,6 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -75,7 +73,7 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
 
     @Override
     public int getLayoutId() {
-        return R.layout.net_empty_smart_refresh_rv;
+        return R.layout.net_empty_smart_refresh_rv_input;
     }
 
     @BindView(R.id.refresh)
@@ -95,15 +93,12 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
         TitleBarUtils.getInstance().setTitle(getActivity(), "详情")
                 .setTitleFinish(getActivity())
                 .setShowOrHide(getActivity(), true)
-                .setRightImgBotton(getActivity(), R.mipmap.share, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        FIND_SHARE.onEvent("find_id", article_id);
-                        if (article == null) {
-                            Jump2View.getInstance().tryShare(activity, "find_share_url", "find_id", article_id);
-                        } else {
-                            Jump2View.getInstance().tryShare(activity, "find_share_url", "find_id", article_id, article.getTitle());
-                        }
+                .setRightImgBotton(getActivity(), R.mipmap.share, view -> {
+                    FIND_SHARE.onEvent("find_id", article_id);
+                    if (article == null) {
+                        Jump2View.getInstance().tryShare(activity, "find_share_url", "find_id", article_id);
+                    } else {
+                        Jump2View.getInstance().tryShare(activity, "find_share_url", "find_id", article_id, article.getTitle());
                     }
                 });
         smartRefreshLayout = refresh;
@@ -123,14 +118,11 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
         //头部view
         initHeaderView();
         //底部可发表评论
-        LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.include_input_comment, bottom);
+//        LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.include_input_comment, bottom);
         input_comment_input = bottom.findViewById(R.id.input_comment_input);
-        bottom.findViewById(R.id.input_comment_commit).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String content = input_comment_input.getText().toString();
-                commitContent(content);
-            }
+        bottom.findViewById(R.id.input_comment_commit).setOnClickListener(view -> {
+            String content = input_comment_input.getText().toString();
+            commitContent(content);
         });
         EventBus.getDefault().register(this);
 
@@ -158,12 +150,7 @@ public class FgtArticleComment extends BaseListFragment3<UserComment> implements
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         input_comment_input.setText("");
-                        DialogSuccessUtil.showSuccess(getContext(), "发表成功", new DialogInterface.OnDismissListener() {
-                            @Override
-                            public void onDismiss(DialogInterface dialogInterface) {
-                                refreshData();
-                            }
-                        });
+                        DialogSuccessUtil.showSuccess(getContext(), "发表成功", dialogInterface -> refreshData());
                         JSONObject json = new JSONObject();
                         json.put("act", 7);
                         SheepApp.getInstance().getNetComponent().getApiService()

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

@@ -2,18 +2,31 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.widget.TextView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DiscoveryVideo;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdpVideo;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ApiKey;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import butterknife.BindView;
 import io.reactivex.Observable;
 
 /**
@@ -22,18 +35,47 @@ import io.reactivex.Observable;
  * 小绵羊3.4.5新增 -- 发现视频列表
  */
 public class FgtArticleVideo extends BaseListFragment5<DiscoveryVideo> {
+
+    @BindView(R.id.tab_list)
+    protected RecyclerView tab_list;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.net_empty_xrecycler_rv;
+    }
+
+    private List<String> sortNameList = new ArrayList<>();
+    private int curPosition;//排序的位置
+    public static final String[] SORT_NAMES = {"最热", "最新"};
+    public static final int[] SORT_ID = {1, 2};
+     // @Param   sort        query   int true       "排序 1:最热 2:最新"
     @Override
     public void initView() {
         super.initView();
-        view_list.setPadding(G.getRealPix(8), G.getRealPix(14), G.getRealPix(8), G.getRealPix(14));
+        Collections.addAll(sortNameList, SORT_NAMES);
+        tab_list.setLayoutManager(new GridLayoutManager(SheepApp.getInstance(), 2));
+        BaseQuickAdapter<String, BaseViewHolder> baseQuickAdapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_tab, sortNameList) {
+            @Override
+            protected void convert(BaseViewHolder helper, String item) {
+                int position = helper.getAdapterPosition();
+                TextView textView = helper.getView(R.id.item_tab_tv);
+                ViewUtil.setColorMapText(textView, item, item, curPosition == position ? "#2ebef2" : "#AFAFAF");
+            }
+        };
+        baseQuickAdapter.bindToRecyclerView(tab_list);
+        baseQuickAdapter.setOnItemClickListener((adapter, view, position) -> {
+            curPosition = position;
+            baseQuickAdapter.notifyDataSetChanged();
+            refreshData();
+        });
+        view_list.setPadding(G.getRealPix(8), 0, G.getRealPix(8), G.getRealPix(14));
     }
 
     @Override
     protected RecyclerView.LayoutManager getLayoutManager() {
-        StaggeredGridLayoutManager layoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
-//        layoutManager.setItemPrefetchEnabled(true);
-//        layoutManager.setMeasurementCacheEnabled(true);
-        return layoutManager;
+//        StaggeredGridLayoutManager layoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
+//        return layoutManager;
+        return new GridLayoutManager(SheepApp.getInstance(), 2);
     }
 
     @Override
@@ -43,12 +85,15 @@ public class FgtArticleVideo extends BaseListFragment5<DiscoveryVideo> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return ApiKey.pageKeyUrl2(ApiKey.getVideoList, page, per_page);
+        return ApiKey.pageKeyUrl2(ApiKey.getVideoList, page, per_page) + "sort=" + getCurSort();
     }
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getVideoList(page, per_page);
+        return apiService.getVideoList(page, per_page, getCurSort());
+    }
+    private int getCurSort(){
+        return SORT_ID[curPosition % SORT_ID.length];
     }
 
     @Override

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

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Friend;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
@@ -54,7 +53,7 @@ public class FgtAskGetMoneyFriend extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_friend : R.layout.fgt_askgetmoney_friend;
+        return SkinUtil.isLoadNewYearSkin() ? R.layout.new_year_fgt_askgetmoney_friend : R.layout.fgt_askgetmoney_friend;
     }
 
     @Override

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

@@ -16,7 +16,6 @@ import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
@@ -72,7 +71,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
 
     @Override
     public int getLayoutId() {
-        return SkinUtil.curPlugin == Plugin.skin_new_year ? R.layout.new_year_fgt_askgetmoney_rank : R.layout.fgt_askgetmoney_rank;
+        return SkinUtil.isLoadNewYearSkin() ? R.layout.new_year_fgt_askgetmoney_rank : R.layout.fgt_askgetmoney_rank;
     }
 
     @Override

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

@@ -3,13 +3,16 @@ package com.sheep.gamegroup.view.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.adapter.WelfareAdapter;
+import com.sheep.jiuyan.samllsheep.R;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -24,6 +27,20 @@ import rx.functions.Action1;
  * realicing@sina.com
  */
 public class FgtDownloadWelfareList extends BaseListFragment2<Release_task> implements Action1<Integer> {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_download_welfare_list;
+    }
+
+    @Override
+    public void initView() {
+        super.initView();
+//        wc_gift_center_title_container = findViewById(R.id.wc_gift_center_title_container);
+        View wc_all_gift = findViewById(R.id.wc_all_gift);
+        wc_all_gift.setOnClickListener(view -> Jump2View.getInstance().goMyWelfare(getActivity()));
+    }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -72,32 +72,23 @@ public class FgtFind extends BaseFragment {
         ViewUtil.setVisibility(add_article_iv, false);
         ViewUtil.setVisibility(add_article_camera, false);
         ViewUtil.setVisibility(add_article_pic, false);
-        add_article.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (onlyChooseVideo) {
-                    Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO);
-                } else {
-                    changeAddArticle(add_article_iv.getVisibility() == View.VISIBLE);
-                }
+        add_article.setOnClickListener(view -> {
+            if (onlyChooseVideo) {
+                Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO);
+            } else {
+                changeAddArticle(add_article_iv.getVisibility() == View.VISIBLE);
             }
         });
         if (!onlyChooseVideo) {
-            add_article_camera.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
+            add_article_camera.setOnClickListener(view -> {
 //                changeAddArticle(true);
 //                G.showToast("添加视频");
-                    Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO);
-                }
+                Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO);
             });
-            add_article_pic.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
+            add_article_pic.setOnClickListener(view -> {
 //                changeAddArticle(true);
 //                G.showToast("添加图片");
-                    Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE);
-                }
+                Jump2View.getInstance().gotoActPublishArticle(MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE);
             });
         }
     }

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -17,10 +16,11 @@ import com.kfzs.android.view.tag.TagFlowLayout;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.model.api.ApiService;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Applications;
 import com.sheep.gamegroup.model.entity.Article;
 import com.sheep.gamegroup.model.entity.ArticleTag;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
@@ -29,9 +29,11 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import org.afinal.simplecache.ApiKey;
@@ -58,6 +60,12 @@ public class FgtFindChild extends BaseListFragment5<Article> {
     private int type;
 
     @Override
+    public void initView() {
+        super.initView();
+        LayoutParamsUtil.resetLayoutParams(view_list, new Lp(G.DENSITY).setTopMargin(4));
+    }
+
+    @Override
     protected RecyclerView.Adapter getAdapter() {
         return new CommonRecycler(ArticleAd.showAd ? allList : list);
     }
@@ -392,12 +400,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
                 };
                 find_item_tags.setAdapter(adapter);
             }
-            rootConvertView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    onClickItem(item);
-                }
-            });
+            rootConvertView.setOnClickListener(view -> onClickItem(item));
         }
     }
 
@@ -412,12 +415,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ViewUtil.setText(find_item_name, item.getTitle());
             ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");
             ViewUtil.setImage(find_item_iv, item.getPictures());
-            rootConvertView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    onClickItem(item);
-                }
-            });
+            rootConvertView.setOnClickListener(view -> onClickItem(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

@@ -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;
@@ -20,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;
@@ -34,7 +34,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;
@@ -45,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;
@@ -65,11 +65,11 @@ 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;
 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;
@@ -77,14 +77,11 @@ 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;
@@ -96,11 +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.AdpHomeListListview;
 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;
@@ -131,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,49 +135,18 @@ 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)
-    View newbie_task;
     @BindView(R.id.refresh)
     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_list_rv)
+    RecyclerView home_list_rv;
+    @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)
-    ImageView bg_newbie_task;
-    @BindView(R.id.view_rob_duty)
-    View viewRobDuty;
-    @BindView(R.id.iv_rob_duty)
-    ImageView ivDuty;
     @BindView(R.id.viewpager_act_game_details)
     ViewPager mViewPager;
     @BindView(R.id.tabLayout)
@@ -233,16 +194,12 @@ 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 List<HomeListEntity> homeListList = new ArrayList<>();
+    private AdpHomeList<HomeListEntity> adpHomeList;
     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 +208,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 +689,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 +785,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,23 +821,24 @@ 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(full_home_list_rv, false);
+            ViewUtil.setVisibility(home_list_rv, false);
         } else {
-            ViewUtil.setVisibility(home_list_gridview_layout, true);
+            ViewUtil.setVisibility(home_list_rv, true);
+            homeListEntitys.clear();
+            homeListList.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));
+                homeListList.add(homeListEntitys.get(i));
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                     isShowQB = !isShowQB;
                 }
@@ -914,11 +850,20 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             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());
+            adpHomeList.notifyDataSetChanged();
+        }
+        checkFullHomeList();
+    }
+
+    //fullHomeList有数据时，要让fullHomeList上下遮盖相邻组件
+    private void checkFullHomeList() {
+        if (/*SkinUtil.curPlugin == Plugin.skin_new_year && */!fullHomeList.isEmpty()) {
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp(G.DENSITY).setTopMargin(-8).setBottomMargin(-4));
+            LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp().setTopMargin(0));
+        } else {
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(0).setBottomMargin(0));
+            LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp(G.DENSITY).setTopMargin(12));
         }
-        refreshData();
     }
 
     /**
@@ -1004,25 +949,23 @@ 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);
+        adpHomeList = new AdpHomeList<>(homeListList);
 
-        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, "首页");
-                }
+        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(item.getId());
+            if ("-2".equals(item.getJump())) {
+                setValueList(!item.isSelect());
+            } else {
+                CommonUtil.getInstance().goWhere(activity, item, "首页");
             }
         });
     }
@@ -1044,49 +987,25 @@ 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.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 +1023,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
-        mHandler.sendEmptyMessage(WHAT_LOAD_USER_INFO);
     }
 
     @Override
@@ -1256,49 +1174,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_rv, !homeListList.isEmpty());
+        ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
     }
 
     private int onResumeCount = 0;
@@ -1306,21 +1189,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++;
@@ -1661,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));
@@ -1682,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);
@@ -1705,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/gamegroup/view/fragment/FgtUserCommentDetail.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -41,8 +40,8 @@ import java.util.Locale;
 import butterknife.BindView;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
 import io.reactivex.schedulers.Schedulers;
+import rx.functions.Action1;
 
 /**
  * Created by realicing on 2018/11/2.
@@ -53,7 +52,7 @@ public class FgtUserCommentDetail extends BaseListFragment3<UserCommentReply> im
 
     @Override
     public int getLayoutId() {
-        return R.layout.net_empty_smart_refresh_rv_exp;
+        return R.layout.net_empty_smart_refresh_rv_exp_input;
     }
 
     @BindView(R.id.refresh)
@@ -99,23 +98,14 @@ public class FgtUserCommentDetail extends BaseListFragment3<UserCommentReply> im
         //尾部，在无数据时显示
         footerView = LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.footer_user_comment_detail, null);
         //底部可发表评论
-        LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.include_input_comment_exp, bottom);
+//        LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.include_input_comment_exp, bottom);
         input_comment_reply = bottom.findViewById(R.id.input_comment_reply);
         input_comment_input = bottom.findViewById(R.id.input_comment_input);
         input_comment_exp = bottom.findViewById(R.id.input_comment_exp);
-        input_comment_reply.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                call(getUserCommentReply());
-            }
-        });
-        bottom.findViewById(R.id.input_comment_commit).setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                String content = input_comment_input.getText().toString();
-                commitContent(content);
-            }
+        input_comment_reply.setOnClickListener(view -> call(getUserCommentReply()));
+        bottom.findViewById(R.id.input_comment_commit).setOnClickListener(view -> {
+            String content = input_comment_input.getText().toString();
+            commitContent(content);
         });
         //初始化 表情键盘协调工具
         initEmotionKeyboard();
@@ -141,12 +131,7 @@ public class FgtUserCommentDetail extends BaseListFragment3<UserCommentReply> im
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         input_comment_input.setText("");
-                        DialogSuccessUtil.showSuccess(getContext(),"发表成功", new DialogInterface.OnDismissListener() {
-                            @Override
-                            public void onDismiss(DialogInterface dialogInterface) {
-                                refreshData();
-                            }
-                        });
+                        DialogSuccessUtil.showSuccess(getContext(),"发表成功", dialogInterface -> refreshData());
                     }
 
                     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -43,5 +43,7 @@ public class Config {
     public static final String KEY_DIRECTIONAL_LOTTERY_URL = "directional_lottery_url";
     //代金券列表地址 key
     public static final String KEY_DIRECTIONAL_RECHARGE_URL = "directional_recharge_url";
+    //新春活动地址 key
+    public static final String KEY_NEW_SPRING_ACTIVITIES_URL = "new_spring_activities_url";
 
 }

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/java/com/sheep/jiuyan/samllsheep/utils/G.java

@@ -69,6 +69,9 @@ public class G {
      * @param duration 显示的时长
      */
     public static void showToast(String msg, int duration) {
+        if(TextUtils.isEmpty(msg)){
+            return;
+        }
         Toast.makeText(SheepApp.getInstance(), msg, duration).show();
 //        if (mToast == null) {
 //            mToast = Toast.makeText(SheepApp.getInstance(), msg, duration);

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

@@ -186,16 +186,8 @@
 
                     <TextView
                         android:id="@+id/gc_game_app_detail_bt3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
+                        style="@style/style_vip_td_tv"
                         android:layout_marginStart="30dp"
-                        android:background="@drawable/shape_vip_gradient_rectangle_15"
-                        android:gravity="center"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="10dp"
-                        android:text="会员通道"
-                        android:textColor="#714E36"
-                        android:textSize="14sp"
                         app:layout_constraintBottom_toBottomOf="@id/gc_game_app_comment_score"
                         app:layout_constraintStart_toEndOf="@id/gc_game_app_detail_bt1" />
 

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

@@ -118,4 +118,23 @@
         android:layout_height="1px"
         android:layout_above="@+id/tab_container"
         android:background="#AAe2e2e2" />
+
+    <com.kfzs.duanduan.view.DragRelativeLayout
+        android:id="@+id/home_new_spring_activitys_drl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:gravity="end"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingBottom="@dimen/content_padding_10">
+
+        <ImageView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@mipmap/ic_act_new_year" />
+    </com.kfzs.duanduan.view.DragRelativeLayout>
 </RelativeLayout>

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/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/fgt_download_welfare_list.xml

@@ -0,0 +1,44 @@
+<?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:background="@color/white"
+    android:fitsSystemWindows="true">
+
+    <include
+        android:id="@+id/check_net_ll"
+        layout="@layout/check_net_view"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <RelativeLayout
+        android:id="@+id/wc_gift_center_title_container"
+        style="@style/style_wc_rl"
+        android:layout_below="@+id/check_net_ll">
+
+        <TextView
+            style="@style/style_wc_line_title"
+            android:text="礼包中心" />
+
+        <TextView
+            android:id="@+id/wc_all_gift"
+            style="@style/style_wc_more"
+            android:text="我的礼包" />
+    </RelativeLayout>
+    <include
+        android:id="@+id/empty_view"
+        layout="@layout/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/wc_gift_center_title_container" />
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/view_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/wc_gift_center_title_container"
+        android:descendantFocusability="blocksDescendants"/>
+
+</RelativeLayout>

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

@@ -3,14 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
+
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/skin_drawable_selector_bg_home_search"/>
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/skin_drawable_selector_bg_home_search" />
+
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        android:layout_marginTop="20dp"
-        style="@style/style_tab_2"/>
+        style="@style/style_tab_2"
+        android:layout_marginTop="20dp" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -3,10 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
+
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:src="@drawable/skin_drawable_selector_bg_home_search"/>
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/skin_drawable_selector_bg_home_search" />
+
     <RelativeLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
@@ -56,13 +60,13 @@
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/content_padding_36"
-            android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
             android:background="@color/translate"
             android:gravity="center_vertical|end"
             android:lines="1"
-            android:paddingEnd="17dp"
             android:paddingStart="17dp"
+            android:paddingEnd="17dp"
             android:text="我的礼包"
             android:textColor="@color/tc_home_search_2"
             android:textSize="12sp"
@@ -73,7 +77,7 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
-        android:layout_below="@+id/top_bar" />
+        android:layout_below="@+id/top_bar"
+        android:background="@color/white" />
 
 </RelativeLayout>

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

@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/find_item_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
 
-    <RelativeLayout
-        android:id="@+id/find_item_container"
+    <TextView
+        android:id="@+id/find_item_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/content_padding_10">
+        android:layout_toStartOf="@+id/find_item_iv"
+        android:ellipsize="end"
+        android:maxLines="3"
+        android:minLines="2"
+        android:text="abcab"
+        android:textColor="@color/black_6_3"
+        android:textSize="15sp" />
 
-        <TextView
-            android:id="@+id/find_item_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/find_item_iv"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:minLines="2"
-            android:text="abcab"
-            android:textColor="@color/black_6_3"
-            android:textSize="15sp" />
-
-        <TextView
-            android:id="@+id/find_item_time"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/find_item_name"
-            android:layout_marginTop="5dp"
-            android:layout_toLeftOf="@+id/find_item_iv"
-            android:text="@string/app_name"
-            android:textColor="#9B9B9B"
-            android:textSize="11sp" />
+    <TextView
+        android:id="@+id/find_item_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/find_item_name"
+        android:layout_marginTop="5dp"
+        android:layout_toStartOf="@+id/find_item_iv"
+        android:text="@string/app_name"
+        android:textColor="#9B9B9B"
+        android:textSize="11sp" />
 
-        <ImageView
-            android:id="@+id/find_item_iv"
-            android:layout_width="106dp"
-            android:layout_height="60dp"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="@dimen/content_padding_10"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/icon" />
+    <ImageView
+        android:id="@+id/find_item_iv"
+        android:layout_width="106dp"
+        android:layout_height="60dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/icon" />
 
-    </RelativeLayout>
+    <View
+        android:id="@+id/item_bottom_line"
+        style="@style/style_item_line_full"
+        android:layout_marginTop="16dp"
+        android:layout_below="@+id/find_item_iv"/>
 
 </RelativeLayout>

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

@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -28,7 +27,6 @@
                 android:id="@+id/password_box"
                 android:layout_weight="1"
                 style="@style/login_edit_style"
-                android:layout_below="@+id/user_name_box"
                 android:hint="输入密码(6-16位)"
                 android:inputType="textPassword"
                 android:lines="1"
@@ -44,6 +42,30 @@
         </LinearLayout>
 
         <View style="@style/login_separetor_line_style" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/password_box2"
+                android:layout_weight="1"
+                style="@style/login_edit_style"
+                android:hint="确认密码"
+                android:inputType="textPassword"
+                android:lines="1"
+                android:maxLength="16" />
+            <ImageView
+                android:id="@+id/show_hide_pwd_btn2"
+                android:src="@mipmap/pwd_hide"
+                android:layout_marginTop="26dp"
+                android:tint="@color/bg_line"
+                android:padding="7dp"
+                android:layout_width="30dp"
+                android:layout_height="30dp" />
+        </LinearLayout>
+
+        <View style="@style/login_separetor_line_style" />
     </LinearLayout>
 
     <Button
@@ -52,4 +74,25 @@
         android:layout_marginTop="50dp"
         android:text="注册" />
 
+    <LinearLayout
+        android:id="@+id/tel_agreement_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="40dp"
+        android:gravity="center">
+        <android.support.v7.widget.AppCompatCheckBox
+            android:id="@+id/tel_agreement_cb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@drawable/drawable_selector_check"/>
+        <TextView
+            android:id="@+id/tel_agreement_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="我已阅读并同意《小绵羊平台用户协议》"
+            android:textColor="@color/G"
+            android:textSize="12sp"/>
+    </LinearLayout>
 </LinearLayout>

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

@@ -26,39 +26,44 @@
             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"
+                    android:id="@+id/home_list_rv"
                     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:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    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 +83,23 @@
                         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:layout_below="@id/home_list_rv" />
                 <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,33 +120,12 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </RelativeLayout>
 
         </android.support.v4.widget.NestedScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout
-        android:id="@+id/newbie_task"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/content_padding_10"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:gravity="center"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/bg_newbie_task"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY" />
-    </com.kfzs.duanduan.view.DragRelativeLayout>
-
-    <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/view_rob_duty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -158,8 +139,8 @@
 
         <ImageView
             android:id="@+id/iv_rob_duty"
-            android:layout_width="wrap_content"
-            android:layout_height="60dp"
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
             android:src="@mipmap/red_package_floatbtn" />

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>

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

@@ -9,15 +9,7 @@
 
     <TextView
         android:id="@+id/item_gggc_vip_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:background="@drawable/shape_vip_gradient_rectangle_15"
-        android:gravity="center"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:text="会员通道"
-        android:textColor="#714E36"
-        android:textSize="14sp"
+        style="@style/style_vip_td_tv"
         app:layout_constraintBottom_toBottomOf="@id/item_gggc_ll2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/item_gggc_ll1"

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

@@ -1,8 +1,7 @@
 <?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="wrap_content"
-    android:padding="8dp">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/image"

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

@@ -3,47 +3,37 @@
     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">
 
-    <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_marginEnd="5dp"
+        android:layout_height="53dp"
+        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:layout_marginEnd="5dp"
+        android:singleLine="true"
+        android:gravity="center"
+        android:text="试玩赚钱"
+        android:textColor="@color/black_6_3"
+        android:textSize="13sp" />
 
     <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:layout_marginEnd="5dp"
         android:gravity="center"
         android:text="试玩"
         android:textColor="@color/black_6_3"

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_tab_tv"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="6dp"
+    android:paddingTop="5dp"
+    android:paddingBottom="5dp"
+    android:gravity="center"
+    android:text="最热"
+    android:textColor="#2ebef2"
+    android:textSize="14sp" />

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

@@ -24,10 +24,11 @@
             layout="@layout/empty_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/check_net_ll" />
+            android:layout_below="@id/check_net_ll" />
 
-        <RelativeLayout
+        <include
             android:id="@+id/bottom"
+            layout="@layout/include_input_comment_exp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true" />
@@ -37,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@id/bottom"
-            android:layout_below="@+id/check_net_ll">
+            android:layout_below="@id/check_net_ll">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/view_list"

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

@@ -9,8 +9,7 @@
         android:id="@+id/check_net_ll"
         layout="@layout/check_net_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/title" />
+        android:layout_height="wrap_content" />
 
     <include
         android:id="@+id/empty_view"
@@ -20,8 +19,9 @@
         android:visibility="gone"
         android:layout_below="@+id/check_net_ll" />
 
-    <RelativeLayout
+    <include
         android:id="@+id/bottom"
+        layout="@layout/include_input_comment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />

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

@@ -0,0 +1,34 @@
+<?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:background="@color/white"
+    android:fitsSystemWindows="true">
+
+    <include
+        android:id="@+id/check_net_ll"
+        layout="@layout/check_net_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+    <include
+        android:id="@+id/empty_view"
+        layout="@layout/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/check_net_ll" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/tab_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/check_net_ll" />
+
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/view_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/tab_list"
+        android:descendantFocusability="blocksDescendants" />
+</RelativeLayout>

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

@@ -31,48 +31,19 @@
 
             <TextView
                 android:id="@+id/ask_act_rule"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:text="活动规则"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_rule_tv"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/ask_act_code"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="10dp"
-                android:text="我的邀请码：976873"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_code_tv"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/ask_act_code_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_right_radius_12"
-                android:gravity="center"
-                android:paddingStart="7dp"
-                android:paddingEnd="10dp"
-                android:text="复制"
-                android:textColor="#ffffffff"
-                android:textSize="10sp"
+                style="@style/style_agm_act_code_copy_tv"
                 app:layout_constraintStart_toEndOf="@id/ask_act_code"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -226,7 +197,7 @@
 
                     <TextView
                         android:id="@+id/ask_invite_tv"
-                        style="@style/style_button_purple"
+                        style="@style/style_new_year_button_purple"
                         android:text="立即邀请" />
 
                 </LinearLayout>

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

@@ -43,8 +43,10 @@
             android:layout_height="70dp"
             android:layout_marginStart="@dimen/content_padding"
             android:orientation="vertical"
-            app:layout_constraintEnd_toStartOf="@+id/task_type_tv"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/detail_task_tv_center"
+            app:layout_constraintStart_toEndOf="@id/item_icon_iv">
 
             <TextView
                 android:id="@+id/item_name_tv"
@@ -109,9 +111,18 @@
             android:layout_centerInParent="true"
             android:text="@string/task_cancel"
             android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
+            app:layout_constraintBottom_toTopOf="@id/detail_task_tv_center2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/detail_task_tv_center2"
+            style="@style/style_vip_td_tv2"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="@id/item_icon_iv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/detail_task_tv_center" />
 
     </android.support.constraint.ConstraintLayout>
 

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

@@ -161,46 +161,19 @@
 
             <TextView
                 android:id="@+id/ask_act_rule"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
+                style="@style/style_agm_act_rule_tv"
                 android:layout_alignParentEnd="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_left_radius_12"
-                android:gravity="center"
-                android:paddingEnd="6dp"
-                android:paddingStart="10dp"
-                android:text="活动规则"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                android:layout_alignParentTop="true" />
             <TextView
                 android:id="@+id/ask_act_code"
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
-                android:layout_marginTop="28dp"
-                android:background="@drawable/sp_bg_purple_right_radius_12"
-                android:gravity="center"
-                android:paddingEnd="10dp"
-                android:paddingStart="6dp"
-                android:text="我的邀请码：976873"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                style="@style/style_agm_act_code_tv"/>
             <TextView
                 android:id="@+id/ask_act_code_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp"
                 android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/selector_button_orange"
-                android:gravity="center"
-                android:paddingEnd="12dp"
-                android:paddingStart="12dp"
-                android:text="复制"
-                android:textColor="#ffffffff"
-                android:textSize="10sp" />
+                android:layout_toEndOf="@id/ask_act_code"
+                style="@style/style_agm_act_code_copy_tv"/>
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>