layout update

app/src/main/AndroidManifest.xml

@@ -261,7 +261,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"
             android:screenOrientation="portrait"
-            android:theme="@style/AppActionTheme" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.WithdrawalAct"
             android:launchMode="singleTask"

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

@@ -69,20 +69,15 @@ public class FgtGameCenter extends BaseFragment {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
-    @BindView(R.id.back_btn)
-    ImageView backBtn;
     @BindView(R.id.download_btn)
     ImageView downloadBtn;
     @BindView(R.id.search_btn)
     ImageView searchBtn;
-    @BindView(R.id.my_walfare_btn)
-    Button myWalfareBtn;
     @BindView(R.id.fgt_gc_hb_500_yuan_drl)
     View fgt_gc_hb_500_yuan_drl;
 
 
     private void initView() {
-        ViewUtil.setVisibility(myWalfareBtn, false);
 //        backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
         TitleFragmentListAdapter mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
         mAdapter.add(new FgtPlayGame(), "玩转游戏");
@@ -159,11 +154,6 @@ public class FgtGameCenter extends BaseFragment {
         super.onResume();
     }
 
-    @OnClick(R.id.back_btn)
-    public void doBack(View v) {
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
-    }
-
     @OnClick(R.id.download_btn)
     public void doDownload(View v) {
         Jump2View.getInstance().goActDownloadManager(getActivity());
@@ -174,11 +164,6 @@ public class FgtGameCenter extends BaseFragment {
         Jump2View.getInstance().goActSearch(getActivity());
     }
 
-    @OnClick(R.id.my_walfare_btn)
-    public void doGoMyWalfare(View v) {
-        Jump2View.getInstance().goMyWelfare(getActivity());
-    }
-
     @OnClick(R.id.fgt_gc_hb_500_yuan_drl)
     public void goGet500YuanHb(View v) {
         Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_MONEY_REWARD_LIST)).setTitle(Config.NAME_WELFARE_MONEY_REWARD_LIST));

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

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 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.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -118,6 +119,7 @@ public class FgtPlayGame extends BaseFragment {
         LinearLayout.LayoutParams bannerLayoutParams = (LinearLayout.LayoutParams) banner.getLayoutParams();
         bannerLayoutParams.height = G.WIDTH * 25 / 72;
         banner.setLayoutParams(bannerLayoutParams);
+        banner.setPadding(G.getRealPix(8), G.getRealPix(8), G.getRealPix(8), G.getRealPix(8));
 
         //玩转游戏  游戏福利专区入口
         mHpRefreshWelfareHelper = new HpRefreshWelfareHelper(hp_refresh_welfare_box);
@@ -284,7 +286,8 @@ public class FgtPlayGame extends BaseFragment {
             @Override
             public void displayImage(Context context, Object o, ImageView imageView) {
                 if (o instanceof SlideshowEty)
-                    Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
+                    Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(8)))).into(imageView);
+//                    Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
             }
         })
                 .setDelayTime(4000)

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtHome.java

@@ -0,0 +1,230 @@
+package com.sheep.gamegroup.module.home.fragment;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+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.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActMsg;
+import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
+import com.sheep.gamegroup.view.fragment.FgtFind;
+import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
+import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+public class FgtHome extends BaseFragment {
+
+    @BindView(R.id.iv_user_face)
+    ImageView iv_user_face;
+    @BindView(R.id.tv_nickname)
+    TextView tv_nickname;
+    @BindView(R.id.tv_user_asset)
+    TextView tv_user_asset;
+    @BindView(R.id.tv_msg_count)
+    TextView tv_msg_count;
+    @BindView(R.id.iv_flag_vip)
+    ImageView iv_flag_vip;
+    @BindView(R.id.tip_news)
+    View tip_news;
+    @BindView(R.id.v_red_dot)
+    View v_red_dot;
+    @BindView(R.id.tv_recommend)
+    TextView tv_recommend;
+    @BindView(R.id.tv_news)
+    TextView tv_news;
+    @BindView(R.id.line_recommend)
+    View line_recommend;
+    @BindView(R.id.line_news)
+    View line_news;
+
+    private UserEntity user;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_home;
+    }
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onViewCreated() {
+        getUnReadMessageCounts();
+        ViewUtil.setVisibility(v_red_dot, SpUtils.isVoucherFirst());
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        configFragments(savedInstanceState);
+        user = DataUtil.getInstance().getUserEntity();
+        GlideImageLoader.setAvatar(iv_user_face, user.getAvatar(), Color.argb(128, 255, 255, 255));
+        ViewUtil.setVisibility(iv_flag_vip, user.isVIP());
+        tv_user_asset.setText(String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(user.getBalance())));
+        ViewUtil.setText(tv_nickname, user.getNickname());
+    }
+
+    @OnClick(R.id.iv_user_face)
+    public void onFaceClick() {
+        Jump2View.getInstance().goPersonnalCenterView(getActivity(), null);
+    }
+
+    @OnClick(R.id.iv_msg)
+    public void onMsgClick() {
+        startActivity(new Intent(getActivity(), ActMsg.class));
+    }
+
+    @OnClick(R.id.iv_download)
+    public void onDownloadClick() {
+        Jump2View.getInstance().goActDownloadManager(getActivity());
+    }
+
+    @OnClick(R.id.iv_search)
+    public void onSearchClick() {
+        Jump2View.getInstance().goActSearch(getActivity());
+    }
+
+    @OnClick(R.id.mall_btn)
+    public void onMallClick() {
+        Jump2View.getInstance().gotoYfShop(getActivity());
+    }
+
+    @OnClick({R.id.recommend_btn, R.id.news_btn})
+    public void onTabClick(View v) {
+        boolean isRecommend = v.getId() == R.id.recommend_btn;
+        switchFragment(isRecommend ? 0 : 1);
+        tv_recommend.setAlpha(isRecommend ? 1 : 0.8f);
+        line_recommend.setVisibility(isRecommend ? View.VISIBLE : View.GONE);
+        tv_news.setAlpha(!isRecommend ? 1 : 0.8f);
+        line_news.setVisibility(!isRecommend ? View.VISIBLE : View.GONE);
+    }
+
+    private void configFragments(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            Fragment fragment0 = new FgtSmallSheep();
+            Fragment fragment1 = new FgtFind();
+            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+            transaction.add(R.id.fragment_container, fragment1, "fragment_tab_1").hide(fragment1);
+            transaction.add(R.id.fragment_container, fragment0, "fragment_tab_0").show(fragment0);
+            transaction.commitAllowingStateLoss();
+        } else {
+            Fragment fragment0 = getChildFragmentManager().findFragmentByTag("fragment_tab_0");
+            Fragment fragment1 = getChildFragmentManager().findFragmentByTag("fragment_tab_1");
+            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+            transaction.hide(fragment1);
+            transaction.show(fragment0);
+            transaction.commitAllowingStateLoss();
+        }
+    }
+
+    private void switchFragment(int position) {
+        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        Fragment fragment0 = getChildFragmentManager().findFragmentByTag("fragment_tab_0");
+        Fragment fragment1 = getChildFragmentManager().findFragmentByTag("fragment_tab_1");
+        if (fragment0 != null) {
+            if (position == 0) {
+                transaction.show(fragment0);
+                fragment0.setUserVisibleHint(true);
+            } else {
+                transaction.hide(fragment0);
+                fragment0.setUserVisibleHint(false);
+            }
+        }
+        if (fragment1 != null) {
+            if (position == 1) {
+                transaction.show(fragment1);
+                fragment1.setUserVisibleHint(true);
+            } else {
+                transaction.hide(fragment1);
+                fragment1.setUserVisibleHint(false);
+            }
+        }
+        transaction.commitAllowingStateLoss();
+    }
+
+    /**
+     * 获取是否有未读消息并更新图标
+     */
+    private void getUnReadMessageCounts() {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getMessageUnReadNum(DataUtil.getInstance().getUserId())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        MessageUnReadEntity entity = baseMessage.getData(MessageUnReadEntity.class);
+                        if (entity != null && entity.getNum() > 0) {
+                            ViewUtil.setVisibility(tv_msg_count, true);
+                            ViewUtil.setText(tv_msg_count, entity.getNum());
+                            DialogNotificationOfArrival.checkNotificationOfArrivalList(getActivity());
+                        } else {
+                            ViewUtil.setVisibility(tv_msg_count, false);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                    }
+                });
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case FGT_SHEEP_HOME_MESSAGE_COUNT:
+                if (getActivity() != null) {
+                    getActivity().runOnUiThread(() -> getUnReadMessageCounts());
+                }
+                break;
+        }
+    }
+
+    public static final String KEY_HAS_APPOINT_TASK = "hasAppointTask";
+
+    @Subscribe
+    public void whenPersonVoucherClick(FgtPersonalCenter.PersonVoucherClickEvent ev) {
+        ViewUtil.setVisibility(v_red_dot, DataUtil.getAsBoolean(KEY_HAS_APPOINT_TASK, false));
+    }
+
+}

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

@@ -4,6 +4,7 @@ import android.support.v4.app.Fragment;
 
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
+import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
 import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
 import com.sheep.gamegroup.view.fragment.FgtFind;
@@ -22,7 +23,7 @@ public enum MainTab {
     FgtSmallSheep(R.string.main_tab_make_money) {
         @Override
         public Fragment getFragment() {
-            return new FgtSmallSheep();
+            return new FgtHome();
         }
 
         @Override
@@ -30,28 +31,6 @@ public enum MainTab {
             return R.drawable.drawable_selector_task;
         }
     },
-    //    FgtMainAudit(R.string.main_tab_audit) {
-//        @Override
-//        public Fragment getFragment() {
-//            return new FgtMainAudit();
-//        }
-//
-//        @Override
-//        public int getDrawableId() {
-//            return R.drawable.drawable_selector_audit;
-//        }
-//    },
-    FgtGameCenter(R.string.tab_viewpager_gamestore) {
-        @Override
-        public Fragment getFragment() {
-            return new FgtGameCenter();
-        }
-
-        @Override
-        public int getDrawableId() {
-            return R.drawable.drawable_selector_game_center;
-        }
-    },
     FgtMainAskGetMoney(R.string.main_tab_invite) {
         @Override
         public Fragment getFragment() {
@@ -68,40 +47,17 @@ public enum MainTab {
             return R.drawable.drawable_selector_askgetmoney;
         }
     },
-    Fgt_Find(R.string.main_tab_find) {
+    FgtGameCenter(R.string.tab_viewpager_gamestore) {
         @Override
         public Fragment getFragment() {
-            return new FgtFind();
+            return new FgtGameCenter();
         }
 
         @Override
         public int getDrawableId() {
-            return R.drawable.drawable_selector_find;
+            return R.drawable.drawable_selector_game_center;
         }
     },
-    FgtPersonnalCenter(R.string.personal_center) {
-        @Override
-        public Fragment getFragment() {
-            return new FgtPersonalCenter();
-        }
-
-        @Override
-        public int getDrawableId() {
-            return R.drawable.drawable_selector_personalcenter;
-        }
-    }
-//    ,
-    //    Bp(R.string.tab_viewpager_borrowplay) {
-//        @Override
-//        public Fragment getFragment() {
-//            return new FgtBorrowPlay();
-//        }
-//
-//        @Override
-//        public int getDrawableId() {
-//            return R.drawable.drawable_selector_bp;
-//        }
-//    },
     ;
     private int stringId;
 

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -118,9 +118,6 @@ public class KFZSJs {
     @JavascriptInterface
     public void gotoMain(int tab) {
         Class willClass = ActMain.class;
-        if (tab == MainTab.Fgt_Find.ordinal()) {
-            willClass = ActFind.class;
-        }
         Intent mainIntent = new Intent(activity, willClass);
         mainIntent.putExtra("SWITCH_TAB", tab);
         activity.startActivity(mainIntent);

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

@@ -108,7 +108,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        setSystemUiVisibility(true);
+        setSystemUiVisibility(false);
     }
 
     private void setSystemUiVisibility(boolean isDark) {
@@ -145,8 +145,6 @@ public class ActMain extends BaseActYmPermissionCheck {
     LinearLayout tab_container;
     @BindView(R.id.main_layout)
     RelativeLayout main_layout;
-    @BindView(R.id.person_center_red_dot)
-    View person_center_red_dot;
 
     @Override
     protected int getLayoutId() {
@@ -163,7 +161,6 @@ public class ActMain extends BaseActYmPermissionCheck {
 //        }
         if (!TestUtil.isDev())
             CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
-        ViewUtil.setVisibility(person_center_red_dot, SpUtils.isVoucherFirst());
     }
 
     @Override
@@ -214,9 +211,7 @@ public class ActMain extends BaseActYmPermissionCheck {
             if (view instanceof TextView) {
                 ((TextView) view).setText(mainTab.getStringId());
                 if (mainTab.getDrawableId() == R.drawable.drawable_selector_askgetmoney) {
-//                    166x137 204x170
                     new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId(), 150 / 170.0f).commit();
-//                    testView = view;
                 }
             }
             tabs.add(view);
@@ -234,27 +229,6 @@ public class ActMain extends BaseActYmPermissionCheck {
         transaction.commitAllowingStateLoss();
         tabs.get(lastPosition).setActivated(true);
     }
-//    private View testView;
-//
-//    @Override
-//    public boolean onKeyDown(int keyCode, KeyEvent event) {
-//        switch (event.getKeyCode()){
-//            case KeyEvent.KEYCODE_8:
-//                addTestViewH(1);
-//                break;
-//            case KeyEvent.KEYCODE_2:
-//                addTestViewH(-1);
-//                break;
-//        }
-//        return super.onKeyDown(keyCode, event);
-//    }
-//
-//    private int defaultTestViewH = 65;
-//    private void addTestViewH(int add) {
-//        defaultTestViewH += add;
-//        LayoutParamsUtil.resetLayoutParams(testView, new Lp(G.DENSITY).setHeight(defaultTestViewH).setWidth((int) (defaultTestViewH * 204 / 170.0f)));
-//        LogUtil.println("addTestViewH add =", defaultTestViewH);
-//    }
 
     private void switchFragment(int position) {
         View lastTab = ListUtil.getItem(tabs, lastPosition);
@@ -294,10 +268,10 @@ public class ActMain extends BaseActYmPermissionCheck {
     private void checkWhichPage(int position) {
         if (position == MainTab.FgtSmallSheep.ordinal()) {//赚钱
             UMConfigUtils.Event.TAB_SHEEP.onEvent();
-        } else if (position == MainTab.Fgt_Find.ordinal()) {//发现
-            UMConfigUtils.Event.TAB_FIND.onEvent();
-        } else if (position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
-            UMConfigUtils.Event.TAB_USER.onEvent();
+        } else if (position == MainTab.FgtGameCenter.ordinal()) {//发现
+            UMConfigUtils.Event.TAB_GAME.onEvent();
+//        } else if (position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
+//            UMConfigUtils.Event.TAB_USER.onEvent();
         }
     }
 
@@ -518,27 +492,19 @@ public class ActMain extends BaseActYmPermissionCheck {
 
     }
 
-
-    public static final String KEY_HAS_APPOINT_TASK = "hasAppointTask";
-
     @Subscribe
     public void onEventMainThread(ShowRedDot showRedDot) {
         switch (showRedDot.getWhere()) {
             case ShowRedDot.WHERE_PERSONAL_CENTER://个人中心是否显示红点
-                DataUtil.putAsBoolean(KEY_HAS_APPOINT_TASK, showRedDot.isShow());
-                ViewUtil.setVisibility(person_center_red_dot, showRedDot.isShow() || SpUtils.isVoucherFirst());
-                Fragment fragment = getSupportFragmentManager().findFragmentByTag("fragment_" + MainTab.FgtPersonnalCenter.ordinal());
-                if (fragment instanceof FgtPersonalCenter)
-                    ((FgtPersonalCenter) fragment).setPcMmRedDotVisible(showRedDot.isShow());
-                else if (TestUtil.isTest())
-                    G.showToast("测试：程序出错，设置个人中心我的资产小红点失败");
+//                DataUtil.putAsBoolean(KEY_HAS_APPOINT_TASK, showRedDot.isShow());
+//                ViewUtil.setVisibility(person_center_red_dot, showRedDot.isShow() || SpUtils.isVoucherFirst());
+//                Fragment fragment = getSupportFragmentManager().findFragmentByTag("fragment_" + MainTab.FgtPersonnalCenter.ordinal());
+//                if (fragment instanceof FgtPersonalCenter)
+//                    ((FgtPersonalCenter) fragment).setPcMmRedDotVisible(showRedDot.isShow());
+//                else if (TestUtil.isTest())
+//                    G.showToast("测试：程序出错，设置个人中心我的资产小红点失败");
                 break;
         }
     }
 
-    @Subscribe
-    public void whenPersonVoucherClick(FgtPersonalCenter.PersonVoucherClickEvent ev) {
-        ViewUtil.setVisibility(person_center_red_dot, DataUtil.getAsBoolean(KEY_HAS_APPOINT_TASK, false));
-    }
-
 }

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

@@ -25,6 +25,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtWithdraw;
@@ -112,7 +113,7 @@ public class ActMyMoney extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "我的资产")
                 .setTitleFinish(this);
-        ViewUtil.setVisibility(mm_at_red_dot_v, DataUtil.getAsBoolean(ActMain.KEY_HAS_APPOINT_TASK, false));
+        ViewUtil.setVisibility(mm_at_red_dot_v, DataUtil.getAsBoolean(FgtHome.KEY_HAS_APPOINT_TASK, false));
         //顶部背景添加弧度
         GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());

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

@@ -172,8 +172,8 @@ public class MiddleAct extends Activity {
                 Jump2View.getInstance().goSignCardAct(activity, null);
                 break;
             case GO_FIND_CENTER://跳转发现中心
-                ActionUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), MainTab.Fgt_Find);
-                Jump2View.getInstance().newTaskTopStartAct(activity, SplashAct.class, bundle);
+//                ActionUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), MainTab.Fgt_Find);
+//                Jump2View.getInstance().gofind(activity, SplashAct.class, bundle);
                 break;
             case IDConstant.JUMP_GMAE://游戏详情
                 Jump2View.getInstance().goPlayGameDetail(msg.getId());

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

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtWithdraw;
@@ -103,7 +104,7 @@ public class NewYearActMyMoney extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "我的资产")
                 .setTitleFinish(this);
-        ViewUtil.setVisibility(mm_at_red_dot_v, DataUtil.getAsBoolean(ActMain.KEY_HAS_APPOINT_TASK, false));
+        ViewUtil.setVisibility(mm_at_red_dot_v, DataUtil.getAsBoolean(FgtHome.KEY_HAS_APPOINT_TASK, false));
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
         mAdapter.add(new FgtRechargeBalanceLog(), tabNames[0]);
         mAdapter.add(new FgtWithdraw(), tabNames[1]);

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
+import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.jiuyan.samllsheep.R;
@@ -15,10 +16,15 @@ import com.sheep.jiuyan.samllsheep.R;
 
 public class PersonalCenterAct extends BaseActivity {
 
+    @Override
+    protected void onCreate(Bundle bundle){
+        StatusBarUtils.setTranslucent(this);
+        super.onCreate(bundle);
+    }
 
     @Override
     protected int getLayoutId() {
-        return R.layout.common_container;
+        return R.layout.main_frame_layout;
     }
 
     @Override
@@ -31,13 +37,12 @@ public class PersonalCenterAct extends BaseActivity {
             fragment = new FgtPersonalCenter();
             fragment.setArguments(bundle);
             transaction.add(R.id.frame_container, fragment, "tag");
-            transaction.commitAllowingStateLoss();
+            transaction.show(fragment);
         } else {
             fragment.setArguments(bundle);
             transaction.replace(R.id.frame_container, fragment);
-            transaction.commitAllowingStateLoss();
         }
-
+        transaction.commitAllowingStateLoss();
     }
 
 }

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

@@ -33,6 +33,7 @@ import com.sheep.gamegroup.util.SysAppUtil;
 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.ActMain;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
@@ -90,8 +91,6 @@ public class FgtPersonalCenter extends BaseFragment {
     ImageView ivRedpackage;
     @BindView(R.id.ibtn_baseactivity_right)
     View ibtn_baseactivity_right;
-    @BindView(R.id.txt_baseactivity_title)
-    View txt_baseactivity_title;
     @BindView(R.id.img_baseactivity_title)
     View img_baseactivity_title;
     @BindView(R.id.audit_activity)
@@ -146,6 +145,10 @@ public class FgtPersonalCenter extends BaseFragment {
     @Override
     public void onViewCreated() {
         activity = getActivity();
+        if (activity instanceof PersonalCenterAct) {
+            initViewOnVisibleToUser();
+            initDataOnVisibleToUser();
+        }
     }
 
     @Override
@@ -158,7 +161,6 @@ public class FgtPersonalCenter extends BaseFragment {
         });
 
         if (activity instanceof PersonalCenterAct) {
-            txt_baseactivity_title.setVisibility(View.VISIBLE);
             img_baseactivity_title.setVisibility(View.VISIBLE);
             img_baseactivity_title.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -168,7 +170,6 @@ public class FgtPersonalCenter extends BaseFragment {
             });
         } else {
             img_baseactivity_title.setVisibility(View.INVISIBLE);
-            txt_baseactivity_title.setVisibility(View.INVISIBLE);
         }
         ViewUtil.setText(audit_activity, getString(R.string.audit_activity, ViewUtil.INDENT));
         ViewUtil.setVisibility(audit_activity_oval, false);
@@ -240,23 +241,23 @@ public class FgtPersonalCenter extends BaseFragment {
 
     private void initMyPetState() {
         SheepApp.getInstance().getNetComponent().getApiService().missionGetinfo(5, 3)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                Mission result = baseMessage.getData(Mission.class);
-                                boolean hasPet = result != null && result.getId() > 0;
-                                ViewUtil.setVisibility(my_pet_layout, hasPet);
-                                ViewUtil.setVisibility(fgt_pc_item_my_pet_v, hasPet);
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                ViewUtil.setVisibility(my_pet_layout, false);
-                                ViewUtil.setVisibility(fgt_pc_item_my_pet_v, false);
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        Mission result = baseMessage.getData(Mission.class);
+                        boolean hasPet = result != null && result.getId() > 0;
+                        ViewUtil.setVisibility(my_pet_layout, hasPet);
+                        ViewUtil.setVisibility(fgt_pc_item_my_pet_v, hasPet);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        ViewUtil.setVisibility(my_pet_layout, false);
+                        ViewUtil.setVisibility(fgt_pc_item_my_pet_v, false);
+                    }
+                });
     }
 
 
@@ -566,7 +567,7 @@ public class FgtPersonalCenter extends BaseFragment {
         }
     }
 
-    public class PersonVoucherClickEvent{
+    public class PersonVoucherClickEvent {
 
     }
 

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

@@ -40,6 +40,7 @@ import android.widget.TextView;
 
 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.kfzs.duanduan.utils.NumberFormatUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -176,16 +177,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     TextView test_change_user;
     @BindView(R.id.list_title)
     LinearLayout listTitle;
-    @BindView(R.id.to_search_but_rl)
-    View to_search_but_rl;
-    @BindView(R.id.to_search_but)
-    LinearLayout to_search_but;
     @BindView(R.id.title_car)
     LinearLayout titleCardLayout;
     @BindView(R.id.home_award_container)
     View home_award_container;
-    @BindView(R.id.search_text_view)
-    TextView search_text_view;
     /* 记录滑动坐标的数组 */
     int[] locate = new int[2];
 
@@ -215,7 +210,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
     public static final int WHAT_LOAD_RUN_TASK = 1;//加载正在进行的任务列表
     public static final int WHAT_TRY_SHOW_HB = 7;//尝试显示红包
-    public static final int WHAT_REFRESH_MSG_COUNT = 8;//尝试显示红包
+
 
     public boolean needRefreshMsgCount = false;
 
@@ -243,9 +238,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 case WHAT_TRY_SHOW_HB:
                     isShowRedPackages(activity);
                     break;
-                case WHAT_REFRESH_MSG_COUNT:
-                    getUnReadMessageCounts();
-                    break;
             }
 
         }
@@ -317,21 +309,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         ivClose.setOnClickListener(view12 -> popupWindow.dismiss());
     }
 
-    @OnClick(R.id.to_search_but)
-    public void toSearchActivity() {
-        Jump2View.getInstance().goActSearch(getActivity());
-    }
-
-    @OnClick(R.id.home_search_sbd_iv)
-    public void toActWebX5Sbd() {
-        Jump2View.getInstance().goWeb(activity, new WebParams(Config.getUrlByPath(Config.PATH_SBD_HOME), Config.SBD_NAME));
-    }
-
-    @OnClick(R.id.home_search_msg_iv)
-    public void toActMsg() {
-        startActivity(new Intent(activity, ActMsg.class));
-    }
-
     /**
      * 兑换红包
      *
@@ -632,7 +609,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 //        bannerLayoutParams.height = G.WIDTH * 25 / 72;
 //        banner.setLayoutParams(bannerLayoutParams);
         LayoutParamsUtil.resetLayoutParams(banner, new Lp().setHeight(bannerHeight));
-
+        banner.setPadding(G.getRealPix(8), G.getRealPix(8), G.getRealPix(8), G.getRealPix(8));
         /**
          * tablayout
          */
@@ -707,8 +684,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 });
             }
         });
-        //上面的搜索
-        ViewUtil.setVisibility(home_search_msg_tv, false);
     }
 
     private int curPosition = 0;
@@ -920,8 +895,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 notifyDataSetChanged();
             }
         });
-        getUnReadMessageCounts();
-        getSearchHotKeyword();
         if (upview1 != null) {
             //停止滚动
             upview1.stopFlipping();
@@ -971,32 +944,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         isFirst = false;
     }
 
-    private void getSearchHotKeyword() {
-        SheepApp.getInstance().getNetComponent().getApiService().keywords()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<Keyword> hotKeywords = baseMessage.getDatas(Keyword.class);
-                        Iterator<Keyword> it = hotKeywords.iterator();
-                        while (it.hasNext()) {
-                            Keyword keyword = it.next();
-                            if (keyword.getPosition() == 2) {
-                                search_text_view.setText(keyword.getKeyword());
-                                break;
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-
-                    }
-
-                });
-    }
-
     private boolean isFirst = true;
 
     /**
@@ -1262,13 +1209,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         CommonUtil.getInstance().callActionWithUserInfo(item -> userEntity = item);
         if (onResumeCount > 0)
             refreshTaskList();
-        if (!hasShowSbd && activity instanceof ActMain && ((ActMain) activity).getLastPosition() == MainTab.FgtSmallSheep.ordinal()) {
-            hasShowSbd = true;
-            //延时显示随便打弹出框提示
-            PopupWindowUtil.delayShowLayout(activity, new PopupWindowUtil.PopupWindowParams(R.layout.pop_show_sbd_tip).setAnchor(to_search_but_rl)
-                    .setGravity(Gravity.BOTTOM).setXoff(G.getRealPix(16))
-                    .setDelay(100L).setShowTime(5000L).setOutsideTouchable(true).setFocusable(false));
-        }
         onResumeCount++;
     }
 
@@ -1326,9 +1266,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             case FGT_SHEEP_SHOW_NEW_USER_HONG_BAO:
                 mHandler.sendEmptyMessage(WHAT_TRY_SHOW_HB);
                 break;
-            case FGT_SHEEP_HOME_MESSAGE_COUNT:
-                mHandler.sendEmptyMessage(WHAT_REFRESH_MSG_COUNT);
-                break;
         }
     }
 
@@ -1365,10 +1302,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             @Override
             public void displayImage(Context context, Object o, ImageView imageView) {
                 try {
-                    if (o instanceof SlideshowEty && activity != null && !activity.isDestroyed())
-                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().centerCrop()).into(imageView);
-//                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(10)))).into(imageView);
-//                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().transform(new RoundedCornersTransformation(G.getRealPix(10), 0))).into(imageView);
+                    if (o instanceof SlideshowEty && activity != null && !activity.isDestroyed()) {
+//                        GlideImageLoader.roundedCornersImage(imageView, ((SlideshowEty) o).getUrl(), G.getRealPix(10));
+                        Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(8)))).into(imageView);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -1644,39 +1581,4 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
     }
 
-    @BindView(R.id.home_search_sbd_tv)
-    TextView home_search_sbd_tv;
-    @BindView(R.id.home_search_msg_tv)
-    TextView home_search_msg_tv;
-
-    /**
-     * 获取是否有未读消息并更新图标
-     */
-    private void getUnReadMessageCounts() {
-        SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .getMessageUnReadNum(DataUtil.getInstance().getUserId())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        MessageUnReadEntity entity = baseMessage.getData(MessageUnReadEntity.class);
-                        if (entity != null && entity.getNum() > 0) {
-                            ViewUtil.setVisibility(home_search_msg_tv, true);
-                            ViewUtil.setText(home_search_msg_tv, entity.getNum());
-                            DialogNotificationOfArrival.checkNotificationOfArrivalList(activity);
-                        } else {
-                            ViewUtil.setVisibility(home_search_msg_tv, false);
-                        }
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                    }
-                });
-
-    }
-
 }

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

@@ -5,6 +5,12 @@
     android:layout_height="match_parent"
     android:clipChildren="false">
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:src="@mipmap/home_blue_bg" />
+
     <include
         layout="@layout/main_frame_layout"
         android:layout_width="match_parent"
@@ -18,6 +24,7 @@
         android:layout_height="1px"
         android:layout_above="@id/tab_container"
         android:background="#e6e6e6" />
+
     <RadioGroup
         android:id="@+id/tab_container"
         android:layout_width="match_parent"
@@ -44,20 +51,6 @@
 
         <RadioButton
             android:id="@+id/tab_2"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="#000000ff"
-            android:button="@null"
-            android:drawableTop="@drawable/drawable_selector_game_center"
-            android:gravity="center"
-            android:paddingTop="@dimen/bottom_tab_pt"
-            android:text="@string/tab_viewpager_classification"
-            android:textColor="@color/selector_color_main_tab"
-            android:textSize="10sp" />
-
-        <RadioButton
-            android:id="@+id/tab_3"
             android:layout_width="0dip"
             android:layout_height="65dp"
             android:layout_gravity="bottom"
@@ -71,43 +64,19 @@
             android:textSize="10sp" />
 
         <RadioButton
-            android:id="@+id/tab_4"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="#00ffff00"
-            android:button="@null"
-            android:drawableTop="@drawable/drawable_selector_find"
-            android:gravity="center"
-            android:paddingTop="@dimen/bottom_tab_pt"
-            android:text="@string/main_tab_find"
-            android:textColor="@color/selector_color_main_tab"
-            android:textSize="10sp" />
-
-        <RadioButton
-            android:id="@+id/tab_5"
+            android:id="@+id/tab_3"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="#00ff0000"
+            android:background="#000000ff"
             android:button="@null"
-            android:drawableTop="@drawable/drawable_selector_personalcenter"
+            android:drawableTop="@drawable/drawable_selector_game_center"
             android:gravity="center"
             android:paddingTop="@dimen/bottom_tab_pt"
-            android:text="@string/personal_center"
+            android:text="@string/tab_viewpager_classification"
             android:textColor="@color/selector_color_main_tab"
             android:textSize="10sp" />
 
     </RadioGroup>
-    <View
-        android:id="@+id/person_center_red_dot"
-        android:visibility="gone"
-        android:layout_width="8dp"
-        android:layout_height="8dp"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginEnd="16dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/shape_oval_red" />
 
 </RelativeLayout>

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

@@ -4,6 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:src="@mipmap/home_blue_bg"
+        android:adjustViewBounds="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <include
         layout="@layout/main_frame_layout"
         android:layout_width="match_parent"
@@ -39,20 +45,7 @@
             android:layout_height="@dimen/tab_height"
             android:layout_weight="2" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_game_center"
-            android:gravity="center"
-            android:minWidth="@dimen/tab_width"
-            android:text="@string/tab_viewpager_classification"
-            android:textColor="@color/selector_color_main_tab"
-            android:textSize="10sp" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/tab_height"
-            android:layout_weight="2" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -64,20 +57,7 @@
             android:textColor="@color/selector_color_main_tab"
             android:textSize="10sp" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/tab_height"
-            android:layout_weight="2" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_find"
-            android:gravity="center"
-            android:minWidth="@dimen/tab_width"
-            android:text="@string/tab_viewpager_borrowplay"
-            android:textColor="@color/selector_color_main_tab"
-            android:textSize="10sp" />
 
         <View
             android:layout_width="0dp"
@@ -101,18 +81,6 @@
     </LinearLayout>
 
     <View
-        android:id="@+id/person_center_red_dot"
-        android:visibility="gone"
-        android:layout_width="8dp"
-        android:layout_height="8dp"
-        android:layout_marginBottom="@dimen/dp_40"
-        android:layout_marginRight="16dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/shape_oval_red" />
-
-
-    <View
         android:id="@+id/tab_line"
         android:layout_width="match_parent"
         android:layout_height="1px"

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

@@ -13,8 +13,7 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        style="@style/style_tab_2"
-        android:layout_marginTop="26dp" />
+        style="@style/style_tab_2" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -1,16 +1,8 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/bg">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/skin_drawable_selector_bg_home_search" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <RelativeLayout
         android:id="@+id/top_bar"
@@ -19,64 +11,53 @@
         android:layout_marginTop="26dp">
 
         <ImageView
-            android:id="@+id/back_btn"
-            android:layout_width="@dimen/content_padding_36"
-            android:layout_height="@dimen/content_padding_36"
-            android:scaleType="centerInside"
-            android:src="@drawable/narrow_back_black"
-            android:visibility="gone" />
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/indicator"
-            style="@style/style_tab_2"
-            android:layout_marginLeft="@dimen/content_padding_36"
-            android:layout_marginRight="@dimen/content_padding_36"
-            app:tabGravity="fill"
-            app:tabMode="fixed"/>
-
-        <ImageView
             android:id="@+id/download_btn"
             android:layout_width="@dimen/content_padding_36"
             android:layout_height="@dimen/content_padding_36"
-            android:padding="8dp"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:src="@drawable/drawable_selector_ic_home_download" />
+            android:padding="8dp"
+            android:layout_marginRight="16dp"
+            android:src="@drawable/drawable_selector_ic_home_download"
+            android:tint="@color/white" />
+
+        <TextView
+            android:text="玩转游戏"
+            android:textSize="16sp"
+            android:textColor="@color/white"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
         <ImageView
             android:id="@+id/search_btn"
             android:layout_width="@dimen/content_padding_36"
             android:layout_height="@dimen/content_padding_36"
-            android:padding="8dp"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:src="@drawable/drawable_selector_ic_home_search" />
+            android:padding="8dp"
+            android:layout_marginLeft="16dp"
+            android:src="@drawable/drawable_selector_ic_home_search"
+            android:tint="@color/white" />
 
-        <Button
-            android:id="@+id/my_walfare_btn"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/content_padding_36"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:background="@null"
-            android:gravity="center_vertical|end"
-            android:lines="1"
-            android:paddingStart="17dp"
-            android:paddingEnd="17dp"
-            android:text="我的礼包"
-            android:textColor="@color/tc_home_search_2"
-            android:textSize="12sp"
-            android:visibility="gone" />
     </RelativeLayout>
 
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        style="@style/style_tab_2"
+        android:layout_below="@+id/top_bar"
+        android:layout_marginLeft="@dimen/content_padding_36"
+        android:layout_marginRight="@dimen/content_padding_36"
+        android:layout_marginBottom="4dp"
+        app:tabGravity="fill"
+        app:tabMode="fixed" />
+
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/top_bar"
-        android:background="@color/white" />
+        android:layout_below="@+id/indicator" />
 
     <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/fgt_gc_hb_500_yuan_drl"

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

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginTop="26dp">
+
+        <ImageView
+            android:id="@+id/iv_user_face"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="@dimen/content_padding_16"
+            android:src="@drawable/avatar" />
+
+        <View
+            android:id="@+id/v_red_dot"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:layout_marginLeft="45dp"
+            android:background="@drawable/shape_oval_red"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/tv_nickname"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="2dp"
+            android:layout_toRightOf="@+id/iv_user_face"
+            android:text="七天的绵羊"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_coin_flag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/iv_user_face"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/iv_user_face"
+            android:text="绵羊币:"
+            android:textColor="@color/white"
+            android:textSize="11sp" />
+
+        <TextView
+            android:id="@+id/tv_user_asset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/iv_user_face"
+            android:layout_marginLeft="4dp"
+            android:layout_toRightOf="@+id/tv_coin_flag"
+            android:text="100"
+            android:textColor="@color/white"
+            android:textSize="11sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_flag_vip"
+            android:layout_width="22dp"
+            android:layout_height="9dp"
+            android:layout_marginLeft="@dimen/content_padding_4"
+            android:layout_marginTop="4dp"
+            android:layout_toRightOf="@+id/tv_nickname"
+            android:src="@mipmap/level_vip" />
+
+        <ImageView
+            android:id="@+id/iv_msg"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="8dp"
+            android:padding="10dp"
+            android:src="@mipmap/ic_msg"
+            android:tint="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_msg_count"
+            android:layout_width="wrap_content"
+            android:layout_height="14dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/shape_f81b5f_rec_7"
+            android:gravity="center"
+            android:minWidth="14dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="8dp"
+            android:text="0"
+            android:textColor="@color/white"
+            android:textSize="9sp" />
+
+        <ImageView
+            android:id="@+id/iv_download"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="40dp"
+            android:padding="10dp"
+            android:src="@drawable/drawable_selector_ic_home_download"
+            android:tint="@color/white" />
+
+        <ImageView
+            android:id="@+id/iv_search"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="74dp"
+            android:padding="10dp"
+            android:src="@drawable/drawable_selector_ic_home_search"
+            android:tint="@color/white" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:orientation="horizontal">
+
+        <RelativeLayout
+            android:id="@+id/recommend_btn"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/tv_recommend"
+                android:text="推荐"
+                android:textSize="15sp"
+                android:textColor="@color/white"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            <View
+                android:id="@+id/line_recommend"
+                android:layout_width="40dp"
+                android:layout_height="2dp"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/tv_recommend"
+                android:layout_marginTop="4dp"
+                android:background="@color/white"/>
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/news_btn"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/tv_news"
+                android:text="资讯"
+                android:textSize="15sp"
+                android:alpha="0.8"
+                android:textColor="@color/white"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            <View
+                android:id="@+id/line_news"
+                android:layout_width="40dp"
+                android:layout_height="2dp"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/tv_news"
+                android:layout_marginTop="4dp"
+                android:visibility="gone"
+                android:background="@color/white"/>
+            <ImageView
+                android:id="@+id/tip_news"
+                android:layout_alignRight="@+id/tv_news"
+                android:layout_marginRight="-20dp"
+                android:layout_marginTop="3dp"
+                android:src="@mipmap/tip_news"
+                android:adjustViewBounds="true"
+                android:layout_width="23dp"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/mall_btn"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/tv_mall"
+                android:text="购物商城"
+                android:textSize="15sp"
+                android:alpha="0.8"
+                android:textColor="@color/white"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            <ImageView
+                android:id="@+id/tip_discount"
+                android:layout_alignRight="@+id/tv_mall"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="3dp"
+                android:src="@mipmap/tip_discount"
+                android:adjustViewBounds="true"
+                android:layout_width="30dp"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </FrameLayout>
+</LinearLayout>

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

@@ -19,7 +19,8 @@
             android:focusableInTouchMode="true"
             android:orientation="vertical">
 
-            <include layout="@layout/homepage_item_banner" />
+            <include
+                layout="@layout/homepage_item_banner" />
 
             <include
                 android:id="@+id/play_game_focus"
@@ -31,9 +32,9 @@
 
             <LinearLayout
                 android:id="@+id/special_container"
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
                 android:orientation="vertical"></LinearLayout>
 
             <android.support.v7.widget.RecyclerView
@@ -43,6 +44,7 @@
                 android:layout_marginStart="2dp"
                 android:layout_marginEnd="2dp"
                 android:layout_marginBottom="10dp"
+                android:background="@color/bg"
                 android:visibility="gone" />
 
             <include
@@ -55,17 +57,20 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/play_game_act"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/bg" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/play_game_list_3_rv"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/bg" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/play_game_list_2_rv"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/bg" />
 
             <include
                 android:id="@+id/play_game_task"
@@ -74,16 +79,19 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/play_game_list_2_rv2"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/bg" />
 
             <include
                 android:id="@+id/play_game_promote_goods"
-                layout="@layout/item_game_promote_goods" />
+                layout="@layout/item_game_promote_goods"
+                android:background="@color/bg" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/play_game_list_x_rv"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/bg" />
 
 
         </LinearLayout>

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

@@ -4,18 +4,12 @@
     android:id="@+id/home_root_rl"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_home_color"
     android:clipChildren="true">
 
-    <include
-        android:id="@+id/to_search_but_rl"
-        layout="@layout/include_home_search" />
-
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/to_search_but_rl">
+        android:layout_height="wrap_content">
 
         <android.support.v4.widget.NestedScrollView
             android:id="@+id/scrollView"
@@ -69,6 +63,12 @@
                         android:visibility="gone" />
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="13dp"
+                    android:layout_below="@id/home_notice_ll"
+                    android:background="@android:color/white"/>
+
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/home_list_rv"
                     android:layout_width="match_parent"
@@ -77,11 +77,18 @@
                     android:layout_marginTop="13dp"
                     android:background="@android:color/white" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="18dp"
+                    android:layout_alignTop="@id/home_list_more_iv"
+                    android:background="@color/bg_home_color"/>
+
                 <!--超维对决HomeList-->
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/full_home_list_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/bg_home_color"
                     android:layout_below="@id/home_list_more_iv" />
 
                 <ImageView
@@ -93,6 +100,7 @@
                     android:layout_marginTop="-1dp"
                     android:src="@drawable/bg_to_bottom" />
 
+
                 <LinearLayout
                     android:id="@+id/home_award_container"
                     android:layout_width="match_parent"
@@ -196,7 +204,6 @@
         layout="@layout/view_float_title_card"
         android:visibility="gone"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/to_search_but_rl" />
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>

app/src/main/res/layout/include_home_search.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:background="@color/bg">
+    android:layout_height="wrap_content">
 
     <View
         android:id="@+id/home_search_top"

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

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/bg"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/notice_bar"
-        android:visibility="gone"
-        android:adjustViewBounds="true"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/hp_focus_tv1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/shape_solid_ffcad7_radius_4"
         android:paddingStart="5dp"
         android:paddingTop="4dp"
@@ -63,12 +64,12 @@
             android:id="@+id/item_focus_game_tags"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            android:layout_marginTop="5dp"
-            app:layout_constraintTop_toBottomOf="@+id/item_focus_name_tv"
             app:layout_constraintEnd_toEndOf="@id/item_focus_name_tv"
-            app:layout_constraintStart_toStartOf="@id/item_focus_name_tv" >
+            app:layout_constraintStart_toStartOf="@id/item_focus_name_tv"
+            app:layout_constraintTop_toBottomOf="@+id/item_focus_name_tv">
 
 
             <TextView
@@ -76,13 +77,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/shape_red_stroke_rectangle_3_corner"
+                android:paddingLeft="5dp"
                 android:paddingTop="3dp"
-                android:paddingBottom="3dp"
                 android:paddingRight="5dp"
-                android:paddingLeft="5dp"
+                android:paddingBottom="3dp"
                 android:textColor="@color/red_FD2D54"
-                android:visibility="gone"
-                android:textSize="9sp" />
+                android:textSize="9sp"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/item_focus_num_tv1"
@@ -90,10 +91,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/content_padding"
                 android:background="@drawable/shape_red_stroke_rectangle_3_corner"
+                android:paddingLeft="5dp"
                 android:paddingTop="3dp"
-                android:paddingBottom="3dp"
                 android:paddingRight="5dp"
-                android:paddingLeft="5dp"
+                android:paddingBottom="3dp"
                 android:singleLine="true"
                 android:text=""
                 android:textColor="@color/red_FD2D54"
@@ -104,12 +105,12 @@
                 android:id="@+id/item_focus_num_tv2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding"
                 android:background="@drawable/shape_red_stroke_rectangle_3_corner"
+                android:paddingLeft="5dp"
                 android:paddingTop="3dp"
-                android:paddingBottom="3dp"
                 android:paddingRight="5dp"
-                android:paddingLeft="5dp"
-                android:layout_marginStart="@dimen/content_padding"
+                android:paddingBottom="3dp"
                 android:singleLine="true"
                 android:text=""
                 android:textColor="@color/red_FD2D54"

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

@@ -2,7 +2,8 @@
 <RelativeLayout 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:layout_height="wrap_content"
+    android:background="@color/bg">
 
     <View
         android:layout_width="match_parent"
@@ -10,30 +11,29 @@
         android:background="@color/bg_home_color" />
 
     <View
-        android:background="@mipmap/recommend_italic"
-        android:layout_marginTop="10dp"
-        android:layout_alignParentRight="true"
         android:layout_width="50dp"
-        android:layout_height="40dp"/>
+        android:layout_height="40dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        android:background="@mipmap/recommend_italic" />
 
     <LinearLayout
         android:id="@+id/recommend_news_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
-        android:layout_marginLeft="10dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
+        android:orientation="vertical"
         android:paddingLeft="8dp"
-        android:orientation="vertical">
-    </LinearLayout>
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"></LinearLayout>
 
     <View
-        android:layout_below="@+id/recommend_news_layout"
         android:layout_width="match_parent"
         android:layout_height="10dp"
-        android:visibility="gone"
-        android:background="@color/bg_home_color" />
+        android:layout_below="@+id/recommend_news_layout"
+        android:background="@color/bg_home_color"
+        android:visibility="gone" />
 
 </RelativeLayout>

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg"
     android:orientation="vertical">
     <View
         android:layout_width="match_parent"

app/src/main/res/values/dd_styles.xml

@@ -402,12 +402,13 @@
         <item name="android:layout_height">36dp</item>
         <item name="tabBackground">@android:color/transparent</item>
         <item name="tabIndicatorHeight">2dp</item>
+        <item name="tabIndicatorFullWidth">false</item>
         <item name="tabGravity">center</item>
-        <item name="tabIndicatorColor">#2ebef2</item>
+        <item name="tabIndicatorColor">@color/white</item>
         <item name="tabMode">scrollable</item>
         <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearance2</item>
-        <item name="tabSelectedTextColor">#2ebef2</item>
-        <item name="tabTextColor">@android:color/darker_gray</item>
+        <item name="tabSelectedTextColor">@color/white</item>
+        <item name="tabTextColor">#90ffffff</item>
     </style>
 
     <style name="style_tab_askgetmoney">