[修改]UI优化

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

@@ -146,7 +146,7 @@ public class ActMyMoney extends BaseActivity {
 //        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
 //        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[1], true)));
 //        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
-//        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
+//        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));`
         indicator.setupWithViewPager(viewPager);
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager) {
             @Override

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

@@ -2,9 +2,9 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.widget.LinearLayoutManager;
@@ -26,7 +26,6 @@ import com.sheep.gamegroup.module.home.adapter.AdpHomeList;
 import com.sheep.gamegroup.util.*;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
-import com.sheep.gamegroup.view.activity.ReNameActivity;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -34,6 +33,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.uuzuche.lib_zxing.DisplayUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import org.afinal.simplecache.ACache;
@@ -77,10 +77,12 @@ public class FgtPersonalCenter extends BaseFragment {
     View pc_mm_red_dot_v;
     @BindView(R.id.personalcenter_item_price_tv)
     TextView personalcenter_item_price_tv;
-    @BindView(R.id.version_item_tv)
+    @BindView(R.id.indicator)
+    SeekBar seekBar_indicator;
+    /*@BindView(R.id.version_item_tv)
     TextView version_item_tv;
     @BindView(R.id.personal_center_version_new)
-    View personal_center_version_new;
+    View personal_center_version_new;*/
     @BindView(R.id.iv_redpackage)
     ImageView ivRedpackage;
     @BindView(R.id.ibtn_baseactivity_right)
@@ -195,30 +197,30 @@ public class FgtPersonalCenter extends BaseFragment {
 
     private void initData() {
         //代理
-//        CommonUtil.getInstance().getAgencyState(activity, new Action1<BaseMessage>() {
-//            @Override
-//            public void call(BaseMessage baseMessage) {
-//                try {
-//                    if (baseMessage != null) {
-//                        AgentEntity agentEntity = baseMessage.getData(AgentEntity.class);
-//                        if (agentEntity != null && agentEntity.getIs_banned() == 0) {
-//                            //设置是否显示代理服务
-//                            proxy_service_layout_line.setVisibility(View.VISIBLE);
-//                            proxy_service_layout.setVisibility(View.VISIBLE);
-//                        }
+// CommonUtil.getInstance().getAgencyState(activity, new Action1<BaseMessage>() {
+//     @Override
+//     public void call(BaseMessage baseMessage) {
+//         try {
+//             if (baseMessage != null) {
+//                 AgentEntity agentEntity = baseMessage.getData(AgentEntity.class);
+//                 if (agentEntity != null && agentEntity.getIs_banned() == 0) {
+//                     //设置是否显示代理服务
+//                     proxy_service_layout_line.setVisibility(View.VISIBLE);
+//                     proxy_service_layout.setVisibility(View.VISIBLE);
+//                 }
 //
-//                    }
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        });
+//             }
+//         } catch (Exception e) {
+//             e.printStackTrace();
+//         }
+//     }
+// });
         initUserInfo();
         String newVersionUrl = ACache.get(SheepApp.getInstance()).getAsString("version_url");
-        personal_center_version_new.setVisibility(TextUtils.isEmpty(newVersionUrl) ? View.GONE : View.VISIBLE);
+        //personal_center_version_new.setVisibility(TextUtils.isEmpty(newVersionUrl) ? View.GONE : View.VISIBLE);
         String appVersionName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
-        version_item_tv.setText("小绵羊V");
-        version_item_tv.append(appVersionName);
+        /*version_item_tv.setText("小绵羊V");
+        version_item_tv.append(appVersionName);*/
         //获取未查看的任务成功或失败的记录
         SheepApp.getInstance().getNetComponent().getApiService().getUserTaskExistsNew()
                 .subscribeOn(Schedulers.io())
@@ -249,6 +251,58 @@ public class FgtPersonalCenter extends BaseFragment {
         //ViewUtil.setVisibility(fgt_pc_item_my_card_v, true);
     }
 
+    private void initSeekBar() {
+        seekBar_indicator.setThumbOffset(0);
+        seekBar_indicator.setProgress(0);
+        //GradientDrawable gradientDrawable =(GradientDrawable) seekBar.getThumb();
+        //gradientDrawable.setSize(1440/(strings.size()/2),5);
+        //final GradientDrawable mGroupDrawable = (GradientDrawable) seekBar.getThumb();
+        //mGroupDrawable.setSize(1000,5);
+        //显示区域的高度。
+        int extent = moduleList.computeHorizontalScrollExtent();
+        //整体的高度，注意是整体，包括在显示区域之外的。
+        int range = moduleList.computeHorizontalScrollRange();
+        //已经向下滚动的距离，为0时表示已处于顶部。
+        int offset = moduleList.computeHorizontalScrollOffset();
+        //int screenWidth = this.getWindowManager().getDefaultDisplay().getWidth();
+        //int tt =screenWidth/2;
+        //seekBar.setMax(tt+100);
+        moduleList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                //显示区域的高度。
+                int extent = moduleList.computeHorizontalScrollExtent();
+                //整体的高度，注意是整体，包括在显示区域之外的。
+                int range = moduleList.computeHorizontalScrollRange();
+                //已经向下滚动的距离，为0时表示已处于顶部。
+                int offset = moduleList.computeHorizontalScrollOffset();
+                //Log.i("dx------",range+"****"+extent+"****"+offset);
+                //此处获取seekbar的getThumb，就是可以滑动的小的滚动游标
+                GradientDrawable gradientDrawable =(GradientDrawable) seekBar_indicator.getThumb();
+                //根据列表的个数，动态设置游标的大小，设置游标的时候，progress进度的颜色设置为和seekbar的颜色设置的一样的，所以就不显示进度了。
+                //gradientDrawable.setSize(extent/(userCenterModuleList.size()/2),5);
+                //设置可滚动区域
+                seekBar_indicator.setMax(range-extent);
+                if (dx==0){
+                    seekBar_indicator.setProgress(0);
+                }else if (dx>0){
+//                    int ss = (int)(tt/2.3f);
+                    //Log.i("dx------","右滑");
+                    seekBar_indicator.setProgress(offset);
+                }else if (dx<0){
+                    //Log.i("dx------","左滑");
+                    seekBar_indicator.setProgress(offset);
+                }
+            }
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+            }
+
+        });
+    }
+
     private void initMyPetState() {
         SheepApp.getInstance().getNetComponent().getApiService().missionGetinfo(5, 3)
                 .subscribeOn(Schedulers.io())
@@ -281,7 +335,7 @@ public class FgtPersonalCenter extends BaseFragment {
         moduleList.setNestedScrollingEnabled(false);
         moduleList.setLayoutManager(manager);
         if (itemCount > 4) itemCount = 4;
-        int w = (ScreenUtil.getScreenWidth(getActivity()) / itemCount);
+        int w = ((ScreenUtil.getScreenWidth(getActivity()) - DisplayUtil.dip2px(getContext(),32))/ itemCount);
         AdpHomeList<UserCenterModule> adapter = new AdpHomeList<>(R.layout.item_my_list_but3, w, userCenterModuleList);
         adapter.bindToRecyclerView(moduleList);
         adapter.setOnItemClickListener((adapter1, view, position) -> CommonUtil.getInstance().goNative(SheepApp.getInstance().getCurrentActivity(), ListUtil.getItem(userCenterModuleList, position), "个人中心"));
@@ -298,6 +352,7 @@ public class FgtPersonalCenter extends BaseFragment {
         if (!ListUtil.isEmpty(newList)) {
             userCenterModuleList.clear();
             userCenterModuleList.addAll(newList);
+            initSeekBar();
             initUserModuleItemView(userCenterModuleList.size());
             ViewUtil.notifyDataSetChanged(moduleList);
             ViewUtil.setVisibility(moduleLayout, true);
@@ -336,7 +391,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 if (userEntity != null) {
                     FgtPersonalCenter.this.userEntity = userEntity;
                     //3.4.5个人中心隐藏邀请码相关功能
-//                    ivRedpackage.setVisibility(userEntity.isKfzsPackageUser() ? View.GONE : View.VISIBLE);
+//             ivRedpackage.setVisibility(userEntity.isKfzsPackageUser() ? View.GONE : View.VISIBLE);
                     initWidget();
                 }
             }
@@ -377,7 +432,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-//                        LogUtil.logI("0------" + new Gson().toJson(baseMessage));
+//                 LogUtil.logI("0------" + new Gson().toJson(baseMessage));
                         G.showToast(baseMessage.getMsg());
                     }
 
@@ -476,7 +531,7 @@ public class FgtPersonalCenter extends BaseFragment {
             R.id.version_layout, R.id.order_layout, R.id.audit_activity_cl, R.id.audit_success_cl,
             R.id.audit_failed_cl, R.id.fgt_person_center_cart, R.id.iv_redpackage, R.id.voucher_layout,
             R.id.my_card_layout, R.id.vip_layout, R.id.login_name_tv,
-            R.id.my_game_layout,R.id.fgt_person_center_my_focus
+            R.id.my_game_layout, R.id.fgt_person_center_my_focus
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -508,7 +563,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 Jump2View.getInstance().goPersionInfo(activity, null);
                 break;
             /*case R.id.my_pet_layout://我的宠物
-//                Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_MY_PET), "我的宠物");
+//         Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_MY_PET), "我的宠物");
                 break;*/
             case R.id.my_game_layout://我的游戏
                 Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_GAME_SHOP_MY_GAME), "我的游戏");

app/src/main/res/drawable/bg_corner_10dp_bottom.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp"/>
+</shape>

app/src/main/res/drawable/bg_corner_10dp_top.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>
+</shape>

app/src/main/res/drawable/bg_thumb_personal_scroll_bar.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp"/>
+    <solid android:color="#C3EEFE"/>
+</shape>

app/src/main/res/drawable/thumb_personal_scroll_bar.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp"/>
+    <solid android:color="#2EBEF2"/>
+    <size android:width="14dp" android:height="2dp"/>
+</shape>

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

@@ -1,273 +1,275 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#f5f5f5"
-    tools:context="com.sheep.gamegroup.view.activity.ActMyMoney">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#f5f5f5"
+                tools:context="com.sheep.gamegroup.view.activity.ActMyMoney">
 
     <ImageView
-        android:id="@+id/act_my_money_bg_iv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@mipmap/bg_person" />
+            android:id="@+id/act_my_money_bg_iv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@mipmap/bg_person"/>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/refresh"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/scrollView"
+            android:id="@+id/refresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="fill_vertical"
-            android:fillViewport="true"
-            android:scrollbars="none"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            android:layout_height="match_parent">
 
-            <LinearLayout
+        <android.support.v4.widget.NestedScrollView
+                android:id="@+id/scrollView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:layout_gravity="fill_vertical"
+                android:fillViewport="true"
+                android:scrollbars="none"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <android.support.constraint.ConstraintLayout
+            <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="match_parent"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
+
+                <android.support.constraint.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
 
                     <ImageView
-                        android:id="@+id/img_baseactivity_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="?attr/actionBarSize"
-                        android:layout_marginTop="@dimen/status_bar_height"
-                        android:gravity="center_vertical"
-                        android:paddingStart="@dimen/content_padding_20"
-                        android:paddingEnd="@dimen/content_padding_20"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/narrow_back_white"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            android:id="@+id/img_baseactivity_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="?attr/actionBarSize"
+                            android:layout_marginTop="@dimen/status_bar_height"
+                            android:gravity="center_vertical"
+                            android:paddingStart="@dimen/content_padding_20"
+                            android:paddingEnd="@dimen/content_padding_20"
+                            android:scaleType="centerInside"
+                            android:src="@drawable/narrow_back_white"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
                     <TextView
-                        android:id="@+id/txt_baseactivity_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="?attr/actionBarSize"
-                        android:layout_centerInParent="true"
-                        android:gravity="center"
-                        android:text="@string/app_name"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/text_size_4"
-                        app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+                            android:id="@+id/txt_baseactivity_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="?attr/actionBarSize"
+                            android:layout_centerInParent="true"
+                            android:gravity="center"
+                            android:text="@string/app_name"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/text_size_4"
+                            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title"/>
 
                     <ImageView
-                        android:id="@+id/ico_baseactivity_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="?attr/actionBarSize"
-                        android:layout_marginTop="@dimen/status_bar_height"
-                        android:gravity="center_vertical"
-                        android:paddingStart="@dimen/content_padding_20"
-                        android:paddingEnd="@dimen/content_padding_20"
-                        android:scaleType="centerInside"
-                        android:src="@mipmap/question"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            android:id="@+id/ico_baseactivity_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="?attr/actionBarSize"
+                            android:layout_marginTop="@dimen/status_bar_height"
+                            android:gravity="center_vertical"
+                            android:paddingStart="@dimen/content_padding_20"
+                            android:paddingEnd="@dimen/content_padding_20"
+                            android:scaleType="centerInside"
+                            android:src="@mipmap/question"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
                     <android.support.v7.widget.CardView
-                        android:id="@+id/my_money_card_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginRight="15dp"
-                        app:cardBackgroundColor="@color/white"
-                        app:cardCornerRadius="5dp"
-                        app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title">
+                            android:id="@+id/my_money_card_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginEnd="16dp"
+                            app:cardBackgroundColor="@color/white"
+                            app:cardCornerRadius="8dp"
+                            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title">
 
                         <RelativeLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
                             <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginTop="20dp"
-                                android:text="可用余额(元)"
-                                android:textColor="#393939"
-                                android:textSize="12sp" />
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerHorizontal="true"
+                                    android:layout_marginTop="20dp"
+                                    android:text="可用余额(元)"
+                                    android:textColor="#393939"
+                                    android:textSize="12sp"/>
 
                             <TextView
-                                android:id="@+id/my_money_recharge_amount"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginTop="36dp"
-                                android:text="00.00"
-                                android:textColor="#2ebff3"
-                                android:textSize="30sp" />
+                                    android:id="@+id/my_money_recharge_amount"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerHorizontal="true"
+                                    android:layout_marginTop="36dp"
+                                    android:text="00.00"
+                                    android:textColor="#2ebff3"
+                                    android:textSize="30sp"/>
 
                             <LinearLayout
-                                android:id="@+id/my_money_assets_layout"
-                                android:layout_below="@+id/my_money_recharge_amount"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="20dp"
-                                android:orientation="horizontal">
-
-                                <LinearLayout
+                                    android:id="@+id/my_money_assets_layout"
+                                    android:layout_below="@+id/my_money_recharge_amount"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_weight="4"
-                                    android:gravity="center"
-                                    android:orientation="vertical">
-                                    <TextView
-                                        android:layout_width="wrap_content"
+                                    android:layout_marginTop="20dp"
+                                    android:orientation="horizontal">
+
+                                <LinearLayout
+                                        android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:layout_centerHorizontal="true"
-                                        android:text="可提现余额(元)"
-                                        android:textColor="#999999"
-                                        android:textSize="12sp" />
+                                        android:layout_weight="4"
+                                        android:gravity="center"
+                                        android:orientation="vertical">
                                     <TextView
-                                        android:id="@+id/my_money_available_amount"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_centerHorizontal="true"
-                                        android:text="00.00"
-                                        android:textColor="#000000"
-                                        android:textSize="18sp" />
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_centerHorizontal="true"
+                                            android:text="可提现余额(元)"
+                                            android:textColor="#999999"
+                                            android:textSize="12sp"/>
+                                    <TextView
+                                            android:id="@+id/my_money_available_amount"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_centerHorizontal="true"
+                                            android:textStyle="bold"
+                                            android:text="00.00"
+                                            android:textColor="#000000"
+                                            android:textSize="18sp"/>
                                 </LinearLayout>
                                 <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="4"
-                                    android:gravity="center"
-                                    android:orientation="vertical">
-                                    <TextView
-                                        android:layout_width="wrap_content"
+                                        android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:layout_centerHorizontal="true"
-                                        android:text="虚拟绵羊币(元)"
-                                        android:textColor="#999999"
-                                        android:textSize="12sp" />
+                                        android:layout_weight="4"
+                                        android:gravity="center"
+                                        android:orientation="vertical">
                                     <TextView
-                                        android:id="@+id/my_money_total_money"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_centerHorizontal="true"
-                                        android:text="00.00"
-                                        android:textColor="#000000"
-                                        android:textSize="18sp" />
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_centerHorizontal="true"
+                                            android:text="虚拟绵羊币(元)"
+                                            android:textColor="#999999"
+                                            android:textSize="12sp"/>
+                                    <TextView
+                                            android:id="@+id/my_money_total_money"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:textStyle="bold"
+                                            android:layout_centerHorizontal="true"
+                                            android:text="00.00"
+                                            android:textColor="#000000"
+                                            android:textSize="18sp"/>
                                 </LinearLayout>
                             </LinearLayout>
                             <LinearLayout
-                                android:orientation="horizontal"
-                                android:layout_marginTop="30dp"
-                                android:layout_marginLeft="12dp"
-                                android:layout_marginRight="12dp"
-                                android:layout_marginBottom="18dp"
-                                android:layout_below="@+id/my_money_assets_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
+                                    android:orientation="horizontal"
+                                    android:layout_marginTop="30dp"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginRight="12dp"
+                                    android:layout_marginBottom="18dp"
+                                    android:layout_below="@+id/my_money_assets_layout"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
                                 <TextView
-                                    android:id="@+id/my_money_withdraw_tv"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_weight="1"
-                                    android:layout_marginRight="6dp"
-                                    android:background="@drawable/shape_grey_stroke_withe_radius_5"
-                                    android:text="转出"
-                                    android:gravity="center"
-                                    android:textColor="#2ebff3"
-                                    android:textSize="15sp" />
+                                        android:id="@+id/my_money_withdraw_tv"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="48dp"
+                                        android:layout_weight="1"
+                                        android:layout_marginRight="6dp"
+                                        android:background="@drawable/shape_grey_stroke_withe_radius_5"
+                                        android:text="转出"
+                                        android:gravity="center"
+                                        android:textColor="#2ebff3"
+                                        android:textSize="15sp"/>
                                 <TextView
-                                    android:id="@+id/my_money_recharge_tv"
-                                    android:layout_weight="1"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="6dp"
-                                    android:background="@drawable/shape_blue_stroke_withe_radius_5"
-                                    android:gravity="center"
-                                    android:text="转入"
-                                    android:textColor="#ffffff"
-                                    android:textSize="15sp" />
+                                        android:id="@+id/my_money_recharge_tv"
+                                        android:layout_weight="1"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="48dp"
+                                        android:layout_marginLeft="6dp"
+                                        android:background="@drawable/shape_blue_stroke_withe_radius_5"
+                                        android:gravity="center"
+                                        android:text="转入"
+                                        android:textColor="#ffffff"
+                                        android:textSize="15sp"/>
                             </LinearLayout>
                         </RelativeLayout>
                     </android.support.v7.widget.CardView>
 
                     <LinearLayout
-                        app:layout_constraintTop_toBottomOf="@+id/my_money_card_layout"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="24dp"
-                        android:layout_height="wrap_content">
+                            app:layout_constraintTop_toBottomOf="@+id/my_money_card_layout"
+                            android:orientation="vertical"
+                            android:layout_width="match_parent"
+                            android:background="@drawable/bg_corner_8dp"
+                            android:backgroundTint="@color/white"
+                            android:layout_marginTop="24dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_height="wrap_content">
                         <LinearLayout
-                            android:id="@+id/my_money_dingxiang_tag"
-                            style="@style/style_item_container"
-                            android:background="@color/white">
+                                android:id="@+id/my_money_dingxiang_tag"
+                                style="@style/style_item_container">
                             <TextView
-                                style="@style/style_item_label"
-                                android:text="定向福利币" />
+                                    style="@style/style_item_label"
+                                    android:text="定向福利币"/>
                             <TextView
-                                android:id="@+id/my_money_dingxiang_amount"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="#333333"
-                                android:textSize="15sp"
-                                android:text="00.00"
-                                />
-                            <TextView style="@style/style_item_end_next" />
+                                    android:id="@+id/my_money_dingxiang_amount"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="#333333"
+                                    android:textSize="15sp"
+                                    android:text="00.00"
+                            />
+                            <TextView style="@style/style_item_end_next"/>
                         </LinearLayout>
-                        <View style="@style/style_item_line" />
+                        <View style="@style/style_item_line"/>
                         <LinearLayout
-                            android:id="@+id/my_money_activity_tag"
-                            style="@style/style_item_container"
-                            android:background="@color/white">
+                                android:id="@+id/my_money_activity_tag"
+                                style="@style/style_item_container">
                             <TextView
-                                style="@style/style_item_label"
-                                android:text="活动币" />
+                                    style="@style/style_item_label"
+                                    android:text="活动币"/>
                             <TextView
-                                android:id="@+id/my_money_activity_amount"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="#333333"
-                                android:textSize="15sp"
-                                android:text="00.00"
-                                />
-                            <TextView style="@style/style_item_end_next" />
+                                    android:id="@+id/my_money_activity_amount"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="#333333"
+                                    android:textSize="15sp"
+                                    android:text="00.00"
+                            />
+                            <TextView style="@style/style_item_end_next"/>
                         </LinearLayout>
-                        <View style="@style/style_item_line" />
+                        <View style="@style/style_item_line"/>
                         <LinearLayout
-                            android:id="@+id/my_money_game_coupon_tag"
-                            style="@style/style_item_container"
-                            android:background="@color/white">
+                                android:id="@+id/my_money_game_coupon_tag"
+                                style="@style/style_item_container">
 
                             <TextView
-                                style="@style/style_item_label"
-                                android:text="游戏代金券" />
+                                    style="@style/style_item_label"
+                                    android:text="游戏代金券"/>
 
-                            <TextView style="@style/style_item_end_next" />
+                            <TextView style="@style/style_item_end_next"/>
 
                         </LinearLayout>
-                        <View style="@style/style_item_line" />
+                        <View style="@style/style_item_line"/>
                         <LinearLayout
-                            android:id="@+id/my_money_mall_coupon_tag"
-                            style="@style/style_item_container"
-                            android:visibility="gone"
-                            android:background="@color/white">
+                                android:id="@+id/my_money_mall_coupon_tag"
+                                style="@style/style_item_container"
+                                android:visibility="gone">
 
                             <TextView
-                                style="@style/style_item_label"
-                                android:text="商城代金券" />
+                                    style="@style/style_item_label"
+                                    android:text="商城代金券"/>
 
-                            <TextView style="@style/style_item_end_next" />
+                            <TextView style="@style/style_item_end_next"/>
 
                         </LinearLayout>
                     </LinearLayout>
@@ -275,30 +277,36 @@
                 </android.support.constraint.ConstraintLayout>
 
                 <View
-                    android:background="#f5f5f5"
-                    android:layout_width="match_parent"
-                    android:layout_height="20dp"/>
+                        android:background="#f5f5f5"
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"/>
 
                 <android.support.design.widget.TabLayout
-                    android:id="@+id/indicator"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@color/white"
-                    app:tabGravity="center"
-                    app:tabIndicatorColor="#4bc1fe"
-                    app:tabIndicatorHeight="4dp"
-                    app:tabMode="fixed"
-                    app:tabSelectedTextColor="#4bc1fe"
-                    app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
-                    app:tabTextColor="#333333" />
+                        android:id="@+id/indicator"
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:background="#f5f5f5"
+                        app:tabGravity="center"
+                        app:tabIndicatorColor="#4bc1fe"
+                        app:tabIndicatorHeight="4dp"
+                        app:tabMode="fixed"
+                        app:tabSelectedTextColor="#4bc1fe"
+                        app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
+                        app:tabTextColor="#333333"/>
+
+                <View android:layout_width="match_parent"
+                      android:layout_height="16dp"
+                      android:background="#f5f5f5"/>
 
                 <com.kfzs.android.view.widget.WrapContentHeightViewPager
-                    android:id="@+id/pager"
-                    android:background="#f5f5f5"
-                    android:minHeight="200dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dip"
-                    android:layout_weight="1" />
+                        android:id="@+id/pager"
+                        android:background="#f5f5f5"
+                        android:minHeight="200dp"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="16dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dip"
+                        android:layout_weight="1"/>
             </LinearLayout>
         </android.support.v4.widget.NestedScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>

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

@@ -1,254 +1,270 @@
 <?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"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:background="@mipmap/home_blue_bg">
-
-    <android.support.constraint.ConstraintLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:orientation="vertical">
+
+    <ImageView
             android:layout_width="match_parent"
-            android:layout_height="180dp">
+            android:layout_height="220dp"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/home_blue_bg"/>
 
-        <RelativeLayout
-                android:id="@+id/layout_navigationBar"
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toTopOf="parent">
+                android:layout_height="180dp">
+
+            <RelativeLayout
+                    android:id="@+id/layout_navigationBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                        android:id="@+id/img_baseactivity_title"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentBottom="true"
+                        android:foreground="@drawable/selector_forground_circle_white"
+                        tools:ignore="UnusedAttribute"
+                        android:gravity="center_vertical"
+                        android:minWidth="?attr/actionBarSize"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/narrow_back_white"
+                        android:visibility="visible"/>
+
+                <TextView
+                        android:id="@+id/txt_baseactivity_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_centerInParent="true"
+                        android:gravity="center"
+                        android:text="@string/personal_center"
+                        android:textColor="@color/white"
+                        android:textSize="18sp"
+                        android:visibility="gone"/>
+
+                <ImageButton
+                        android:id="@+id/ibtn_baseactivity_right"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:scaleType="centerInside"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentBottom="true"
+                        android:foreground="@drawable/selector_forground_circle_white"
+                        tools:ignore="UnusedAttribute"
+                        android:layout_marginEnd="16dp"
+                        android:background="@color/translate"
+                        android:src="@mipmap/setting"/>
+
+                <include
+                        layout="@layout/title_bottom_line"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
+            </RelativeLayout>
 
             <ImageView
-                    android:id="@+id/img_baseactivity_title"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentBottom="true"
-                    android:foreground="@drawable/selector_forground_circle_white"
-                    tools:ignore="UnusedAttribute"
-                    android:gravity="center_vertical"
-                    android:minWidth="?attr/actionBarSize"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/narrow_back_white"
-                    android:visibility="visible"/>
+                    android:id="@+id/icon_img_iv"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:layout_marginTop="16dp"
+                    android:src="@drawable/logo"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                    android:id="@+id/txt_baseactivity_title"
+                    android:id="@+id/name_tv"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/personal_center"
-                    android:textColor="@color/white"
-                    android:textSize="18sp"
-                    android:visibility="gone"/>
-
-            <ImageButton
-                    android:id="@+id/ibtn_baseactivity_right"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentBottom="true"
-                    android:foreground="@drawable/selector_forground_circle_white"
-                    tools:ignore="UnusedAttribute"
-                    android:layout_marginEnd="16dp"
-                    android:background="@color/translate"
-                    android:src="@mipmap/setting"/>
-
-            <include
-                    layout="@layout/title_bottom_line"
-                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:visibility="gone"/>
-        </RelativeLayout>
+                    android:layout_marginTop="4dp"
+                    android:text="Billyyoyo"
+                    android:textColor="@color/txt_white"
+                    android:textSize="15sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icon_img_iv"/>
 
-        <ImageView
-                android:id="@+id/icon_img_iv"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:layout_marginTop="16dp"
-                android:src="@drawable/logo"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <TextView
-                android:id="@+id/name_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="Billyyoyo"
-                android:textColor="@color/txt_white"
-                android:textSize="15sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/icon_img_iv"/>
-
-        <ImageView
-                android:id="@+id/vip_flag_view"
-                android:layout_width="wrap_content"
-                android:layout_height="16dp"
-                android:layout_marginTop="56dp"
-                android:adjustViewBounds="true"
-                android:src="@mipmap/level_vip"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <TextView
-                android:id="@+id/vertical_seperator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="|"
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_11"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_goneMarginLeft="8dp"
-                app:layout_goneMarginRight="8dp"
-                app:layout_constraintTop_toTopOf="@+id/login_name_tv"
-                app:layout_constraintBottom_toBottomOf="@+id/login_name_tv"/>
-
-        <TextView
-                android:id="@+id/sheep_num_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="绵羊号："
-                android:layout_marginEnd="@dimen/content_padding_10"
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_11"
-                app:layout_constraintEnd_toStartOf="@+id/vertical_seperator"
-                app:layout_constraintTop_toTopOf="@+id/vertical_seperator" app:layout_constraintBottom_toBottomOf="@+id/vertical_seperator"/>
-
-        <TextView
-                android:id="@+id/login_name_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="16dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="4dp"
-                android:layout_marginStart="@dimen/content_padding_10"
-                android:text="登录账号："
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_11"
-                app:layout_constraintStart_toEndOf="@+id/vertical_seperator"
-                app:layout_constraintTop_toBottomOf="@+id/name_tv"/>
-
-    </android.support.constraint.ConstraintLayout>
-
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <RelativeLayout
-                android:id="@+id/vip_layout"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
-                android:background="@mipmap/bg_vip"
-                android:layout_width="match_parent"
-                android:layout_height="80dp">
             <ImageView
-                    android:id="@+id/iv_crown"
-                    android:src="@mipmap/crown"
-                    android:layout_marginTop="14dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_width="23dp"
-                    android:layout_height="20dp"/>
-            <TextView
-                    android:text="VIP特权"
-                    android:layout_marginLeft="8dp"
-                    android:textSize="15sp"
-                    android:textColor="#f9c85d"
-                    android:gravity="center"
-                    android:layout_alignTop="@+id/iv_crown"
-                    android:layout_toRightOf="@+id/iv_crown"
+                    android:id="@+id/vip_flag_view"
                     android:layout_width="wrap_content"
-                    android:layout_height="20dp"/>
+                    android:layout_height="16dp"
+                    android:layout_marginTop="56dp"
+                    android:adjustViewBounds="true"
+                    android:src="@mipmap/level_vip"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                    android:id="@+id/sale_words"
-                    android:text="省钱福利多, 你不了解一下"
-                    android:layout_marginRight="20dp"
-                    android:textSize="13sp"
-                    android:textColor="#f9c85d"
-                    android:gravity="center"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="8dp"
+                    android:id="@+id/vertical_seperator"
                     android:layout_width="wrap_content"
-                    android:layout_height="20dp"/>
+                    android:layout_height="wrap_content"
+                    android:text="|"
+                    android:textColor="@color/txt_white"
+                    android:textSize="@dimen/text_size_11"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_goneMarginLeft="8dp"
+                    app:layout_goneMarginRight="8dp"
+                    app:layout_constraintTop_toTopOf="@+id/login_name_tv"
+                    app:layout_constraintBottom_toBottomOf="@+id/login_name_tv"/>
 
             <TextView
-                    android:id="@+id/tip_vip"
-                    android:layout_alignLeft="@+id/sale_words"
-                    android:layout_below="@+id/sale_words"
-                    android:text="VIP有效期: 2019-06-03到期"
-                    android:textSize="10sp"
-                    android:textColor="#cfbf9c"
-                    android:visibility="gone"
-                    android:layout_marginTop="3dp"
+                    android:id="@+id/sheep_num_tv"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="绵羊号："
+                    android:layout_marginEnd="@dimen/content_padding_10"
+                    android:textColor="@color/txt_white"
+                    android:textSize="@dimen/text_size_11"
+                    app:layout_constraintEnd_toStartOf="@+id/vertical_seperator"
+                    app:layout_constraintTop_toTopOf="@+id/vertical_seperator" app:layout_constraintBottom_toBottomOf="@+id/vertical_seperator"/>
 
             <TextView
-                    android:id="@+id/be_vip_btn"
-                    android:text="升级成为VIP"
-                    android:textColor="#1c1819"
-                    android:textSize="10sp"
-                    android:layout_alignLeft="@id/sale_words"
-                    android:layout_below="@id/sale_words"
-                    android:layout_marginTop="3dp"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    android:background="@drawable/yellow_btn"
+                    android:id="@+id/login_name_tv"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:paddingEnd="16dp"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
+                    android:layout_marginStart="@dimen/content_padding_10"
+                    android:text="登录账号："
+                    android:textColor="@color/txt_white"
+                    android:textSize="@dimen/text_size_11"
+                    app:layout_constraintStart_toEndOf="@+id/vertical_seperator"
+                    app:layout_constraintTop_toBottomOf="@+id/name_tv"/>
 
-        </RelativeLayout>
-        <LinearLayout
-                android:id="@+id/personalcenter_price_layout"
+        </android.support.constraint.ConstraintLayout>
+
+        <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_marginTop="40dp"
-                android:paddingTop="35dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:background="@mipmap/baise">
+                android:layout_height="wrap_content">
+            <RelativeLayout
+                    android:id="@+id/vip_layout"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@mipmap/bg_vip"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp">
+                <ImageView
+                        android:id="@+id/iv_crown"
+                        android:src="@mipmap/crown"
+                        android:layout_marginTop="14dp"
+                        android:layout_marginLeft="20dp"
+                        android:layout_width="23dp"
+                        android:layout_height="20dp"/>
+                <TextView
+                        android:text="VIP特权"
+                        android:layout_marginLeft="8dp"
+                        android:textSize="15sp"
+                        android:textColor="#f9c85d"
+                        android:gravity="center"
+                        android:layout_alignTop="@+id/iv_crown"
+                        android:layout_toRightOf="@+id/iv_crown"
+                        android:layout_width="wrap_content"
+                        android:layout_height="20dp"/>
 
-            <ImageView
-                    android:id="@+id/personalcenter_item_price_ic"
-                    style="@style/style_item_img"
-                    android:src="@mipmap/my_assets"/>
+                <TextView
+                        android:id="@+id/sale_words"
+                        android:text="省钱福利多, 你不了解一下"
+                        android:layout_marginRight="20dp"
+                        android:textSize="13sp"
+                        android:textColor="#f9c85d"
+                        android:gravity="center"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="8dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="20dp"/>
+
+                <TextView
+                        android:id="@+id/tip_vip"
+                        android:layout_alignLeft="@+id/sale_words"
+                        android:layout_below="@+id/sale_words"
+                        android:text="VIP有效期: 2019-06-03到期"
+                        android:textSize="10sp"
+                        android:textColor="#cfbf9c"
+                        android:visibility="gone"
+                        android:layout_marginTop="3dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                <TextView
+                        android:id="@+id/be_vip_btn"
+                        android:text="升级成为VIP"
+                        android:textColor="#1c1819"
+                        android:textSize="10sp"
+                        android:layout_alignLeft="@id/sale_words"
+                        android:layout_below="@id/sale_words"
+                        android:layout_marginTop="3dp"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
+                        android:background="@drawable/yellow_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                    android:id="@+id/personalcenter_price_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_marginTop="40dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingTop="35dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:background="@mipmap/baise">
+
+                <ImageView
+                        android:id="@+id/personalcenter_item_price_ic"
+                        style="@style/style_item_img"
+                        android:src="@mipmap/my_assets"/>
+
+                <TextView
+                        android:id="@+id/personalcenter_item_price_tag"
+                        style="@style/style_item_label"
+                        android:textSize="15sp"
+                        android:textColor="#333333"
+                        android:text="我的资产"/>
+
+                <View
+                        android:id="@+id/pc_mm_red_dot_v"
+                        android:layout_width="8dp"
+                        android:layout_height="8dp"
+                        android:layout_marginEnd="2dp"
+                        android:background="@drawable/shape_oval_red"
+                        android:visibility="gone"/>
+                <TextView
+                        android:id="@+id/personalcenter_item_price_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0.00元"
+                        android:textColor="#ff2ebff3"
+                        android:textSize="15sp"/>
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
 
-            <TextView
-                    android:id="@+id/personalcenter_item_price_tag"
-                    style="@style/style_item_label"
-                    android:textSize="15sp"
-                    android:textColor="#333333"
-                    android:text="我的资产"/>
-
-            <View
-                    android:id="@+id/pc_mm_red_dot_v"
-                    android:layout_width="8dp"
-                    android:layout_height="8dp"
-                    android:layout_marginEnd="2dp"
-                    android:background="@drawable/shape_oval_red"
-                    android:visibility="gone"/>
-            <TextView
-                    android:id="@+id/personalcenter_item_price_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0.00元"
-                    android:textColor="#ff2ebff3"
-                    android:textSize="15sp"/>
-        </LinearLayout>
-    </RelativeLayout>
 
-</LinearLayout>
+</FrameLayout>

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

@@ -2,10 +2,13 @@
 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:padding="8dp"
             android:columnCount="3"
             android:rowCount="4"
-            android:background="@color/white">
+            android:background="@drawable/bg_corner_8dp"
+            android:backgroundTint="@color/white">
 
     <LinearLayout
             android:id="@+id/account_detail_layout"
@@ -120,26 +123,37 @@
                 android:layout_height="20dp"
                 android:src="@mipmap/voucher"/>
 
-        <TextView
-                android:id="@+id/voucher_label"
+
+        <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_toRightOf="@+id/voucher_icon"
-                android:text="我的福利"
-                android:textColor="@color/black_444444"
-                android:textSize="14sp"/>
+                android:gravity="center"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:id="@+id/voucher_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/voucher_icon"
+                    android:text="我的福利"
+                    android:textColor="@color/black_444444"
+                    android:textSize="14sp"/>
+
+            <TextView
+                    android:id="@+id/voucher_red_dot"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:background="@drawable/shape_red_solid_rectangle_18"
+                    android:padding="2dp"
+                    android:rotation="-20"
+                    android:text="new"
+                    android:textColor="@android:color/white"
+                    android:textSize="6sp"/>
+
+        </LinearLayout>
 
-        <TextView
-                android:id="@+id/voucher_red_dot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_red_solid_rectangle_18"
-                android:padding="2dp"
-                android:rotation="-20"
-                android:text="new"
-                android:textColor="@android:color/white"
-                android:textSize="6sp"/>
 
     </LinearLayout>
 
@@ -216,4 +230,131 @@
 
     </LinearLayout>
 
+    <LinearLayout
+            android:id="@+id/faq_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_gravity="fill"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:gravity="center"
+            android:padding="16dp"
+            android:orientation="vertical">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/faq"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/black_444444"
+                android:text="FAQ帮助"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/recommend_friend_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_gravity="fill"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:gravity="center"
+            android:padding="16dp"
+            android:orientation="vertical">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/personalc_ic_recommend_friend"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/black_444444"
+                android:text="推荐给好友"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+            android:id="@+id/feedbook_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_gravity="fill"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:gravity="center"
+            android:padding="16dp"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/personalc_ic_feedback"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/black_444444"
+                android:text="意见反馈"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/version_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_gravity="fill"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:gravity="center"
+            android:padding="16dp"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/personalc_ic_version"/>
+
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black_444444"
+                    android:text="更新版本"/>
+
+            <TextView
+                    android:id="@+id/personal_center_version_new"
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:background="@drawable/shape_red_solid_rectangle"
+                    android:gravity="center"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:text="new"
+                    android:textColor="@color/white"
+                    android:textSize="9sp"/>
+
+        </LinearLayout>
+
+        <TextView
+                android:id="@+id/version_item_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/black_444444"/>
+
+    </LinearLayout>
+
 </GridLayout>

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

@@ -1,112 +1,116 @@
 <?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"
-    android:background="@color/white"
-    android:orientation="horizontal">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/bg_corner_8dp"
+              android:backgroundTint="@color/white"
+              android:orientation="horizontal">
 
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/audit_activity_cl"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
+            android:id="@+id/audit_activity_cl"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp">
 
         <TextView
-            android:id="@+id/audit_activity"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lineSpacingExtra="7dp"
-            android:text="@string/audit_activity"
-            android:textColor="@color/black_444444"
-            android:textSize="14sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+                android:id="@+id/audit_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:lineSpacingExtra="7dp"
+                android:text="@string/audit_activity"
+                android:textColor="@color/black_444444"
+                android:textSize="14sp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
 
         <View
-            android:id="@+id/audit_activity_oval"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:background="@drawable/shape_oval_red"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/audit_activity" />
+                android:id="@+id/audit_activity_oval"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:background="@drawable/shape_oval_red"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/audit_activity"/>
     </android.support.constraint.ConstraintLayout>
 
     <View
-        android:layout_width="1dp"
-        android:layout_height="22dp"
-        android:layout_gravity="center_vertical" />
+            android:layout_width="1dp"
+            android:layout_height="22dp"
+            android:background="#F0F0F0"
+            android:layout_gravity="center_vertical"/>
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/audit_success_cl"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
+            android:id="@+id/audit_success_cl"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp">
 
         <TextView
-            android:id="@+id/audit_success"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lineSpacingExtra="7dp"
-            android:text="@string/audit_success"
-            android:textColor="@color/black_444444"
-            android:textSize="14sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+                android:id="@+id/audit_success"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:lineSpacingExtra="7dp"
+                android:text="@string/audit_success"
+                android:textColor="@color/black_444444"
+                android:textSize="14sp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
 
         <View
-            android:id="@+id/audit_success_oval"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:background="@drawable/shape_oval_red"
-            app:layout_constraintTop_toTopOf="parent"
-            android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/audit_success" />
+                android:id="@+id/audit_success_oval"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:background="@drawable/shape_oval_red"
+                app:layout_constraintTop_toTopOf="parent"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/audit_success"/>
+
     </android.support.constraint.ConstraintLayout>
 
     <View
-        android:layout_width="1dp"
-        android:layout_height="22dp"
-        android:layout_gravity="center_vertical" />
+            android:layout_width="1dp"
+            android:layout_height="22dp"
+            android:background="#F0F0F0"
+            android:layout_gravity="center_vertical"/>
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/audit_failed_cl"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
+            android:id="@+id/audit_failed_cl"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp">
 
         <TextView
-            android:id="@+id/audit_failed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lineSpacingExtra="7dp"
-            android:text="@string/audit_failed"
-            android:textColor="@color/black_444444"
-            android:textSize="14sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+                android:id="@+id/audit_failed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:lineSpacingExtra="7dp"
+                android:text="@string/audit_failed"
+                android:textColor="@color/black_444444"
+                android:textSize="14sp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
 
         <View
-            android:id="@+id/audit_failed_oval"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:background="@drawable/shape_oval_red"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/audit_failed" />
+                android:id="@+id/audit_failed_oval"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:background="@drawable/shape_oval_red"
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/audit_failed"/>
     </android.support.constraint.ConstraintLayout>
 </LinearLayout>

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

@@ -1,112 +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="wrap_content"
-    android:layout_marginTop="@dimen/content_padding_13"
-    android:layout_marginBottom="@dimen/content_padding_15"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <View
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/feedbook_layout"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_feedback" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="意见反馈" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/faq_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/faq" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="FAQ帮助" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:id="@+id/recommend_friend_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_recommend_friend" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="推荐给好友" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/version_layout"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_version" />
-
-        <TextView
-            style="@style/style_item_label_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="更新版本" />
-
-        <TextView
-            android:id="@+id/personal_center_version_new"
-            android:layout_width="wrap_content"
-            android:layout_height="14dp"
-            android:layout_marginStart="@dimen/content_padding"
-            android:background="@drawable/shape_red_solid_rectangle"
-            android:gravity="center"
-            android:paddingStart="6dp"
-            android:paddingEnd="6dp"
-            android:text="new"
-            android:textColor="@color/white"
-            android:textSize="9sp" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/version_item_tv"
-            style="@style/style_item_end" />
-
-    </LinearLayout>
-
-</LinearLayout>

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

@@ -1,61 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/scroll_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="none">
+            xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="none">
 
     <LinearLayout
-        android:id="@+id/root_4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <include layout="@layout/fgt_personacenter_item_top"/>
-        <include
-            layout="@layout/fgt_personalcenter_item_audit"
+            android:id="@+id/root_4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="13dp" />
+            android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/my_module_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone">
+        <include layout="@layout/fgt_personacenter_item_top"/>
 
-            <View
+        <include
+                layout="@layout/fgt_personalcenter_item_audit"
                 android:layout_width="match_parent"
-                android:layout_height="11dp" />
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="13dp"/>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/my_module_list"
+        <LinearLayout
+                android:id="@+id/my_module_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
-                tools:listitem="@layout/item_my_list_but" />
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="@drawable/bg_corner_8dp"
+                android:backgroundTint="@color/white"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
 
-        </LinearLayout>
+            <android.support.v7.widget.RecyclerView
+                    android:id="@+id/my_module_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    tools:layout_height="100dp"
+                    tools:listitem="@layout/item_my_list_but"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="11dp" />
+            <SeekBar
+                    android:id="@+id/indicator"
+                    android:layout_width="24dp"
+                    android:layout_height="2dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
+                    android:thumb="@drawable/thumb_personal_scroll_bar"
+                    android:progressDrawable="@drawable/bg_thumb_personal_scroll_bar"
+                    android:background="@drawable/bg_thumb_personal_scroll_bar"
+                    android:layout_marginBottom="8dp"
+                    android:layout_gravity="center"/>
 
-        <include layout="@layout/fgt_personal_center_item_center_one" />
+        </LinearLayout>
 
-        <include layout="@layout/fgt_personalcenter_item_center_two" />
+        <include layout="@layout/fgt_personal_center_item_center_one"/>
 
         <ImageView
-            android:id="@+id/iv_redpackage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="20dp"
-            android:src="@mipmap/invition_redpackage"
-            android:visibility="invisible" />
+                android:id="@+id/iv_redpackage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="30dp"
+                android:layout_marginTop="20dp"
+                android:src="@mipmap/invition_redpackage"
+                android:visibility="invisible"/>
     </LinearLayout>
 
 

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

@@ -1,54 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/type_toggle_layout"
-    android:layout_width="match_parent"
-    android:layout_height="40dp"
-    android:gravity="left|center_vertical"
-    android:background="#f5f5f5"
-    android:orientation="horizontal">
+            android:id="@+id/type_toggle_layout"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="left|center_vertical"
+            android:background="@drawable/bg_corner_10dp_top"
+            android:backgroundTint="@color/white"
+            android:orientation="horizontal">
 
     <RadioButton
-        android:id="@+id/all_radio"
-        android:button="@null"
-        android:text="全部"
-        android:checked="true"
-        android:textColor="@color/selector_color_my_money_toggle"
-        android:textSize="12sp"
-        android:layout_marginLeft="20dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+            android:id="@+id/all_radio"
+            android:button="@null"
+            android:text="全部"
+            android:checked="true"
+            android:textColor="@color/selector_color_my_money_toggle"
+            android:textSize="12sp"
+            android:layout_marginLeft="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     <View
-        android:background="#cccccc"
-        android:layout_marginLeft="10dp"
-        android:layout_width="1dp"
-        android:layout_height="10dp"/>
+            android:background="#cccccc"
+            android:layout_marginLeft="10dp"
+            android:layout_width="1dp"
+            android:layout_height="10dp"/>
 
     <RadioButton
-        android:id="@+id/income_radio"
-        android:button="@null"
-        android:text="收入"
-        android:layout_marginLeft="10dp"
+            android:id="@+id/income_radio"
+            android:button="@null"
+            android:text="收入"
+            android:layout_marginLeft="10dp"
 
-        android:textColor="@color/selector_color_my_money_toggle"
-        android:textSize="12sp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+            android:textColor="@color/selector_color_my_money_toggle"
+            android:textSize="12sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     <View
-        android:layout_marginLeft="10dp"
-        android:background="#cccccc"
-        android:layout_width="1dp"
-        android:layout_height="10dp"/>
+            android:layout_marginLeft="10dp"
+            android:background="#cccccc"
+            android:layout_width="1dp"
+            android:layout_height="10dp"/>
 
     <RadioButton
-        android:id="@+id/output_radio"
-        android:button="@null"
-        android:text="支出"
-        android:layout_marginLeft="10dp"
-        android:textColor="@color/selector_color_my_money_toggle"
-        android:textSize="12sp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+            android:id="@+id/output_radio"
+            android:button="@null"
+            android:text="支出"
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/selector_color_my_money_toggle"
+            android:textSize="12sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
 </RadioGroup>

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

@@ -1,27 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list_rv"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                android:id="@+id/list_rv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#f5f5f5">
 
     <include
-        android:id="@+id/check_net_ll"
-        layout="@layout/check_net_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+            android:id="@+id/check_net_ll"
+            layout="@layout/check_net_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
     <include
-        android:id="@+id/empty_view"
-        layout="@layout/empty_view"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/check_net_ll" />
+            android:id="@+id/empty_view"
+            layout="@layout/empty_view"
+            android:visibility="gone"
+            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/view_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/check_net_ll"
-        android:descendantFocusability="blocksDescendants"/>
+            android:id="@+id/view_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/bg_corner_10dp_bottom"
+            android:backgroundTint="@color/white"
+            android:layout_below="@+id/check_net_ll"
+            android:descendantFocusability="blocksDescendants"/>
 </RelativeLayout>

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

@@ -1,99 +1,100 @@
 <?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <RelativeLayout
-        android:id="@+id/my_money_item_center"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:padding="@dimen/content_padding_10"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:id="@+id/item_desc"
+            android:id="@+id/my_money_item_center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/my_money_item_recharge_status"
-            android:layout_marginRight="12dp"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-            <TextView
-                android:id="@+id/my_money_item_recharge_amount"
-                android:layout_width="wrap_content"
+            android:gravity="center_vertical"
+            android:padding="@dimen/content_padding_10"
+            android:orientation="horizontal">
+
+        <LinearLayout
+                android:id="@+id/item_desc"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="start"
-                android:ellipsize="end"
-                android:text="充值金额100.00元"
-                android:textColor="#282828"
-                android:textSize="14sp" />
+                android:layout_toLeftOf="@+id/my_money_item_recharge_status"
+                android:layout_marginRight="12dp"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+            <TextView
+                    android:id="@+id/my_money_item_recharge_amount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="start"
+                    android:ellipsize="end"
+                    android:text="充值金额100.00元"
+                    android:textColor="#282828"
+                    android:textSize="14sp"/>
 
             <ImageView
-                android:id="@+id/my_money_item_recharge_amount_iv"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:src="@mipmap/myprice_on"
-                android:layout_marginLeft="@dimen/content_padding_1"
-                android:visibility="invisible"/>
+                    android:id="@+id/my_money_item_recharge_amount_iv"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:src="@mipmap/myprice_on"
+                    android:layout_marginLeft="@dimen/content_padding_1"
+                    android:visibility="invisible"/>
             <TextView
-                android:id="@+id/btn_exchange_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:textColor="@android:color/white"
-                android:textSize="10sp"
-                android:text="兑换"
-                android:background="@drawable/selector_button_full_main"/>
+                    android:id="@+id/btn_exchange_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    android:text="兑换"
+                    android:background="@drawable/selector_button_full_main"/>
         </LinearLayout>
 
         <TextView
-            android:id="@+id/my_money_item_recharge_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:singleLine="true"
-            android:layout_alignParentRight="true"
-            android:text="充值成功"
-            android:textColor="#333333"
-            android:textSize="18sp" />
+                android:id="@+id/my_money_item_recharge_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:singleLine="true"
+                android:layout_alignParentRight="true"
+                android:text="充值成功"
+                android:textColor="#333333"
+                android:textSize="18sp"/>
 
         <TextView
-            android:id="@+id/my_money_item_recharge_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/item_desc"
-            android:gravity="end"
-            android:singleLine="true"
-            android:text="2018/05/07 20:59"
-            android:textColor="#999999"
-            android:textSize="12sp" />
+                android:id="@+id/my_money_item_recharge_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/item_desc"
+                android:gravity="end"
+                android:singleLine="true"
+                android:text="2018/05/07 20:59"
+                android:textColor="#999999"
+                android:textSize="12sp"/>
 
     </RelativeLayout>
 
     <TextView
-        android:id="@+id/my_money_item_recharge_amount_2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="start"
-        android:singleLine="true"
-        android:text="充值金额100.00元"
-        android:textColor="#282828"
-        android:textSize="11sp"
-        android:padding="@dimen/content_padding_10"
-        android:layout_marginTop="@dimen/content_padding_1"
-        android:visibility="gone"/>
+            android:id="@+id/my_money_item_recharge_amount_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:singleLine="true"
+            android:text="充值金额100.00元"
+            android:textColor="#282828"
+            android:textSize="11sp"
+            android:padding="@dimen/content_padding_10"
+            android:layout_marginTop="@dimen/content_padding_1"
+            android:visibility="gone"/>
 
     <View
-        android:background="#e6e6e6"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"/>
+            android:background="#fff5f5f5"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="13dp"
+            android:layout_marginEnd="13dp"/>
 </LinearLayout>