[修改]UI优化

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

@@ -1,10 +1,13 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
+import android.support.graphics.drawable.Animatable2Compat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
@@ -12,6 +15,13 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.*;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.load.resource.gif.GifDrawable;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
@@ -52,11 +62,16 @@ import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.youmi.android.offer.BaseActYmPermissionCheck;
+import io.reactivex.Completable;
+import io.reactivex.functions.Action;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -74,7 +89,6 @@ import static com.sheep.gamegroup.module.task.fragments.FgtVideoTaskBase.KEY_REL
 import static com.sheep.gamegroup.util.Constant.REQUEST_CODE_GOT_REWARDS;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 
-
 /**
  * Created by realicing on 2018/9/6.
  * realicing@sina.com
@@ -90,7 +104,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     @BindView(R.id.tab_container)
     LinearLayout tab_container;
     @BindView(R.id.main_layout)
-    RelativeLayout main_layout;
+    ConstraintLayout main_layout;
     @BindView(R.id.main_header)
     View main_header;
 
@@ -165,6 +179,8 @@ public class ActMain extends BaseActYmPermissionCheck {
     @Override
     public void initView() {
         EventBus.getDefault().register(this);
+        resetBottomTabImage();
+        ((ImageView) (tab_container.getChildAt(0).findViewById(R.id.tab_1_iv))).setImageResource(R.drawable.shouye_c);
         initFragments();
         if (!TestUtil.isDev())
             CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
@@ -206,6 +222,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     private Fragment[] mFragments = new Fragment[3];
 
     private void initFragments() {
+
         changeVisible(-1, lastPosition);
         //小绵羊3.4.10新增 判断用户是否是游戏用户，是的话默认打开游戏界面
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
@@ -246,20 +263,37 @@ public class ActMain extends BaseActYmPermissionCheck {
 //                transaction.hide(mFragments[index]);
 //            }
             View view = tab_container.getChildAt(index);
-            if (view instanceof TextView) {
+            /*if (view instanceof TextView) {
                 ((TextView) view).setText(mainTab.getStringId());
                 Drawable[] drawables = ((TextView) view).getCompoundDrawables();
                 if (drawables[1] != null) {
                     drawables[1].setBounds(0, 0, iconSize, iconSize);
-                    ((TextView) view).setCompoundDrawables(drawables[0], drawables[1], drawables[2],
-                            drawables[3]);
+                    ((TextView) view).setCompoundDrawables(drawables[0], drawables[1], drawables[2], drawables[3]);
                 }
-            }
+            }*/
             tabs.add(view);
             final int position = index;
             view.setOnClickListener(v -> {
                 long currentTime = System.currentTimeMillis();
-                if (currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) {
+                if ((currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) && gifComplete) {
+                    int animResource = R.drawable.gif_bottom_home;
+                    int endResource = R.drawable.shouye_c;
+                    ImageView animTarget = view.findViewById(R.id.tab_1_iv);
+                    if (position == 0) {
+                        //首页
+                        animResource = R.drawable.gif_bottom_home;
+                        animTarget = view.findViewById(R.id.tab_1_iv);
+                        endResource = R.drawable.shouye_c;
+                    } else if (position == 1) {
+
+                    } else if (position == 2) {
+                        //游戏
+                        animResource = R.drawable.gif_bottom_game;
+                        animTarget = view.findViewById(R.id.tab_3_iv);
+                        endResource = R.drawable.youxi_c;
+                    }
+                    resetBottomTabImage();
+                    loadGifOnlyOnce(animResource, animTarget, endResource);
                     lastClickTime = currentTime;
                     switchFragment(position);
                     checkWhichPage(position);
@@ -267,10 +301,79 @@ public class ActMain extends BaseActYmPermissionCheck {
             });
             index++;
         }
+        findViewById(R.id.tab_2).setOnClickListener(v -> {
+            long currentTime = System.currentTimeMillis();
+            if ((currentTime - lastClickTime > MIN_CLICK_DELAY_TIME) && gifComplete) {
+                resetBottomTabImage();
+                playWXHBAnima((ImageView) v);
+                //loadGifOnlyOnce(R.drawable.gif_bottom_wxhb, (ImageView) v);
+                lastClickTime = currentTime;
+                switchFragment(1);
+                checkWhichPage(1);
+            }
+        });
         transaction.commitAllowingStateLoss();
         tabs.get(lastPosition).setActivated(true);
     }
 
+    AnimationDrawable animationDrawable;
+
+    //播放微信红包动画
+    private void playWXHBAnima(ImageView imageView) {
+        animationDrawable = (AnimationDrawable) imageView.getBackground();
+        animationDrawable.start();
+        Completable.timer(1400, TimeUnit.MILLISECONDS)
+                .doOnComplete(() -> animationDrawable.stop()).subscribe();
+    }
+
+    //GIF是否播放完成
+    boolean gifComplete = true;
+
+    //播放一次gif
+    private void loadGifOnlyOnce(int gifResource, ImageView targetView, int endResource) {
+        gifComplete = false;
+        Glide.with(ActMain.this)
+                .load(gifResource)
+                .skipMemoryCache(true)
+                .listener(new RequestListener<Drawable>() {
+                    @Override
+                    public boolean onLoadFailed(@Nullable @org.jetbrains.annotations.Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                        if (resource instanceof GifDrawable) {
+                            //加载一次
+                            ((GifDrawable) resource).setLoopCount(1);
+                            ((GifDrawable) resource).registerAnimationCallback(new Animatable2Compat.AnimationCallback() {
+                                @Override
+                                public void onAnimationStart(Drawable drawable) {
+                                    super.onAnimationStart(drawable);
+                                }
+
+                                @Override
+                                public void onAnimationEnd(Drawable drawable) {
+                                    super.onAnimationEnd(drawable);
+                                    targetView.setImageResource(endResource);
+                                    gifComplete = true;
+                                }
+                            });
+                        }
+                        return false;
+                    }
+                })
+                .into(targetView);
+    }
+
+    //重置底部tab图片
+    private void resetBottomTabImage() {
+        tab_container.getChildAt(0).setActivated(false);
+        tab_container.getChildAt(2).setActivated(false);
+        ((ImageView) (tab_container.getChildAt(0).findViewById(R.id.tab_1_iv))).setImageResource(R.drawable.shouye);
+        ((ImageView) (tab_container.getChildAt(2).findViewById(R.id.tab_3_iv))).setImageResource(R.drawable.youxi);
+    }
+
     public void switchFragment(int position) {
         frame_container.moveHook(position == 1 ? -1 : 1);
         View lastTab = ListUtil.getItem(tabs, lastPosition);
@@ -382,7 +485,6 @@ public class ActMain extends BaseActYmPermissionCheck {
         lastBackTime = System.currentTimeMillis();
     }
 
-
     private List<View> tabs = new ArrayList<>();
 
     private Container<Action1<Integer>> container = new Container<>();
@@ -551,7 +653,9 @@ public class ActMain extends BaseActYmPermissionCheck {
         CommonUtil.getInstance().onDestroy();
         if (container != null && container.getT() != null)
             container.setT(null);
-
+        if (null != animationDrawable && animationDrawable.isRunning()) {
+            animationDrawable.stop();
+        }
     }
 
     @Subscribe
@@ -610,4 +714,5 @@ public class ActMain extends BaseActYmPermissionCheck {
         return getSupportFragmentManager().findFragmentByTag("fragment_2");
     }
 
+
 }

app/src/main/java/com/sheep/gamegroup/view/customview/BottomTabLayout.java

@@ -0,0 +1,70 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.content.Context;
+import android.graphics.*;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
+import com.uuzuche.lib_zxing.DisplayUtil;
+
+public class BottomTabLayout extends LinearLayout {
+
+    private static final float CENTER_RADIUS = 30;
+
+    public BottomTabLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public BottomTabLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public BottomTabLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        GradientDrawable gradientDrawable = new GradientDrawable();
+        gradientDrawable.setColor(Color.TRANSPARENT);
+        setBackground(gradientDrawable);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        Paint paint = new Paint();
+        Path path = new Path();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            int backgroundColor = getBackgroundTintList().getDefaultColor();
+            paint.setColor(backgroundColor);
+        }
+        float radius = DisplayUtil.dip2px(getContext(), CENTER_RADIUS);
+        path.moveTo(0, radius);
+        path.lineTo(getWidth() / 2 - radius, radius);
+
+        /*RectF rectF = new RectF(getWidth() / 2 - radius, 0, getWidth() / 2 + radius, 2 * radius);
+        path.arcTo(rectF, 180, 180, false);*/
+
+        path.cubicTo(getWidth() / 2 - radius / 2, radius / 4, getWidth() / 2 + radius / 2, radius / 4, getWidth() / 2 + radius, radius);
+
+        path.moveTo(getWidth() / 2 + radius, radius);
+        path.lineTo(getWidth(), radius);
+        path.lineTo(getWidth(), getHeight());
+        path.lineTo(0, getHeight());
+        path.lineTo(0, radius);
+        path.close();
+        //连接的外边缘以圆弧的方式相交
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        //线条结束处绘制一个半圆
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeWidth(DisplayUtil.dip2px(getContext(), 2));
+        paint.setShadowLayer(2, 0f, 0f, Color.LTGRAY);
+        paint.setStyle(Paint.Style.FILL_AND_STROKE);
+        canvas.drawPath(path, paint);
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/customview/TouchFrameLayout.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.customview;
 
 import android.content.Context;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.view.MotionEventCompat;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -59,11 +60,11 @@ public class TouchFrameLayout extends FrameLayout {
     public void moveHook(float distance) {
         if (hookView != null) {
             if (distance > 0) {
-                ((RelativeLayout.LayoutParams) getLayoutParams()).topMargin = max;
+                ((ConstraintLayout.LayoutParams) getLayoutParams()).topMargin = max;
                 hookView.setVisibility(VISIBLE);
             } else {
                 hookView.setVisibility(GONE);
-                ((RelativeLayout.LayoutParams) getLayoutParams()).topMargin = min;
+                ((ConstraintLayout.LayoutParams) getLayoutParams()).topMargin = min;
             }
         }
     }
@@ -90,7 +91,7 @@ public class TouchFrameLayout extends FrameLayout {
                 veloctiy.computeCurrentVelocity(1000);
                 float distance = ev.getRawY() - startY;
                 if (distance > 0) {
-                    if (((RelativeLayout.LayoutParams) getLayoutParams()).topMargin == max) {
+                    if (((ConstraintLayout.LayoutParams) getLayoutParams()).topMargin == max) {
                         break;
                     } else {
 //                        if (Math.abs(startX - ev.getRawX()) < Math.abs(startY - ev.getRawY()) && Math.abs(veloctiy.getYVelocity()) > 5000) {
@@ -100,7 +101,7 @@ public class TouchFrameLayout extends FrameLayout {
                         }
                     }
                 } else {
-                    if (((RelativeLayout.LayoutParams) getLayoutParams()).topMargin == min) {
+                    if (((ConstraintLayout.LayoutParams) getLayoutParams()).topMargin == min) {
                         break;
                     } else {
                         if (Math.abs(startX - ev.getRawX()) < Math.abs(startY - ev.getRawY())) {

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

@@ -7,7 +7,6 @@ import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -28,7 +27,6 @@ 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.gamegroup.view.customview.RecyclerItemDecoration;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -36,7 +34,6 @@ 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;
@@ -80,10 +77,6 @@ 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.proxy_service_layout)
-    View proxy_service_layout;
-    @BindView(R.id.proxy_service_layout_line)
-    View proxy_service_layout_line;
     @BindView(R.id.version_item_tv)
     TextView version_item_tv;
     @BindView(R.id.personal_center_version_new)
@@ -110,14 +103,6 @@ public class FgtPersonalCenter extends BaseFragment {
     LinearLayout moduleLayout;
     @BindView(R.id.my_module_list)
     RecyclerView moduleList;
-    @BindView(R.id.fgt_person_center_my_focus_line)
-    View fgt_person_center_my_focus_line;
-    @BindView(R.id.fgt_person_center_my_focus)
-    View fgt_person_center_my_focus;
-    @BindView(R.id.fgt_pc_item_vip_v)
-    View fgt_pc_item_vip_v;
-    @BindView(R.id.fgt_pc_item_vip_ll)
-    View fgt_pc_item_vip_ll;
     @BindView(R.id.vip_flag_view)
     ImageView vipFlagView;
     @BindView(R.id.tip_vip)
@@ -126,24 +111,12 @@ public class FgtPersonalCenter extends BaseFragment {
     TextView beVipBtn;
     @BindView(R.id.voucher_red_dot)
     View voucher_red_dot;
-    @BindView(R.id.fgt_pc_item_my_pet_v)
-    View fgt_pc_item_my_pet_v;
-    @BindView(R.id.fgt_pc_item_my_game_v)
-    View fgt_pc_item_my_game_v;
-    @BindView(R.id.my_pet_layout)
-    View my_pet_layout;
     @BindView(R.id.my_game_layout)
     View my_game_layout;
-    @BindView(R.id.fgt_pc_item_my_card_v)
-    View fgt_pc_item_my_card_v;
     @BindView(R.id.my_card_layout)
     View my_card_layout;
     @BindView(R.id.login_name_tv)
     TextView loginNameTv;
-    @BindView(R.id.shop_assist_layout)
-    View shop_assist_layout;
-    @BindView(R.id.fgt_pc_item_shop_assist_v)
-    View fgt_pc_item_shop_assist_v;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -216,8 +189,8 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setText(audit_failed, getString(R.string.audit_failed, ViewUtil.INDENT));
         ViewUtil.setVisibilityBlock(audit_failed_oval, false);
         //是否显示我的关注
-        ViewUtil.setVisibility(fgt_person_center_my_focus_line, !TestUtil.isLTVersion3_4_5());
-        ViewUtil.setVisibility(fgt_person_center_my_focus, !TestUtil.isLTVersion3_4_5());
+        //ViewUtil.setVisibility(fgt_person_center_my_focus_line, !TestUtil.isLTVersion3_4_5());
+        //ViewUtil.setVisibility(fgt_person_center_my_focus, !TestUtil.isLTVersion3_4_5());
     }
 
     private void initData() {
@@ -273,7 +246,7 @@ public class FgtPersonalCenter extends BaseFragment {
         initUserModuleItem();
         initMyPetState();
         ViewUtil.setVisibility(my_card_layout, true);
-        ViewUtil.setVisibility(fgt_pc_item_my_card_v, true);
+        //ViewUtil.setVisibility(fgt_pc_item_my_card_v, true);
     }
 
     private void initMyPetState() {
@@ -285,14 +258,14 @@ public class FgtPersonalCenter extends BaseFragment {
                     public void onNext(BaseMessage baseMessage) {
                         Mission result = baseMessage.getData(Mission.class);
                         boolean hasPet = result != null && result.getId() > 0;
-                        ViewUtil.setVisibility(my_pet_layout, hasPet);
-                        ViewUtil.setVisibility(fgt_pc_item_my_pet_v, hasPet);
+                        //ViewUtil.setVisibility(my_pet_layout, hasPet);
+                        //ViewUtil.setVisibility(fgt_pc_item_my_pet_v, hasPet);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        ViewUtil.setVisibility(my_pet_layout, false);
-                        ViewUtil.setVisibility(fgt_pc_item_my_pet_v, false);
+                        //ViewUtil.setVisibility(my_pet_layout, false);
+                        //ViewUtil.setVisibility(fgt_pc_item_my_pet_v, false);
                     }
                 });
     }
@@ -307,7 +280,7 @@ public class FgtPersonalCenter extends BaseFragment {
         moduleList.setHasFixedSize(true);
         moduleList.setNestedScrollingEnabled(false);
         moduleList.setLayoutManager(manager);
-        if (itemCount > 5) itemCount = 5;
+        if (itemCount > 4) itemCount = 4;
         int w = (ScreenUtil.getScreenWidth(getActivity()) / itemCount);
         AdpHomeList<UserCenterModule> adapter = new AdpHomeList<>(R.layout.item_my_list_but3, w, userCenterModuleList);
         adapter.bindToRecyclerView(moduleList);
@@ -325,7 +298,6 @@ public class FgtPersonalCenter extends BaseFragment {
         if (!ListUtil.isEmpty(newList)) {
             userCenterModuleList.clear();
             userCenterModuleList.addAll(newList);
-            userCenterModuleList.addAll(newList);
             initUserModuleItemView(userCenterModuleList.size());
             ViewUtil.notifyDataSetChanged(moduleList);
             ViewUtil.setVisibility(moduleLayout, true);
@@ -372,8 +344,8 @@ public class FgtPersonalCenter extends BaseFragment {
     }
 
     private void initWidget() {
-        ViewUtil.setVisibility(shop_assist_layout, userEntity.isShopAssist());
-        ViewUtil.setVisibility(fgt_pc_item_shop_assist_v, userEntity.isShopAssist());
+        //ViewUtil.setVisibility(shop_assist_layout, userEntity.isShopAssist());
+        //ViewUtil.setVisibility(fgt_pc_item_shop_assist_v, userEntity.isShopAssist());
         ViewUtil.setText(personalcenter_item_price_tv, String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(userEntity.getBalance())));
         ViewUtil.setText(nameTv, userEntity.getNickname());
         ViewUtil.setText(sheepNumTv, String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
@@ -500,22 +472,20 @@ public class FgtPersonalCenter extends BaseFragment {
 
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_item_price_ic,
             R.id.personalcenter_item_price_tag, R.id.personalcenter_item_price_tv,
-            R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
-            R.id.recommend_friend_layout, R.id.faq_layout, R.id.fgt_pc_item_gift_ll,
-            R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_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.fgt_person_center_my_focus, R.id.fgt_pc_item_vip_ll,
-            R.id.voucher_layout, R.id.my_pet_layout, R.id.my_card_layout, R.id.vip_layout,
-            R.id.login_name_tv, R.id.edit_nickname_view, R.id.my_game_layout, R.id.shop_assist_layout
+            R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.faq_layout, R.id.fgt_pc_item_gift_ll,
+            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
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.edit_nickname_view://审核中心
+            /*case R.id.edit_nickname_view://个人信息
                 Intent i = new Intent(getActivity(), ReNameActivity.class);
                 i.putExtra("name", userEntity.getNickname());
                 startActivity(i);
                 USER_INFO_NAME.onEvent();
-                break;
+                break;*/
             case R.id.audit_activity_cl://审核中心
                 Jump2View.getInstance().goAuditTastList(activity, FgtMainAudit.POSITION_ACTIVITY);
                 break;
@@ -537,16 +507,16 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.account_detail_layout://个人资料
                 Jump2View.getInstance().goPersionInfo(activity, null);
                 break;
-            case R.id.my_pet_layout://我的宠物
+            /*case R.id.my_pet_layout://我的宠物
 //                Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_MY_PET), "我的宠物");
-                break;
+                break;*/
             case R.id.my_game_layout://我的游戏
                 Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_GAME_SHOP_MY_GAME), "我的游戏");
                 break;
             case R.id.my_card_layout://我的卡包
                 Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_MY_CARD), "我的卡包");
                 break;
-            case R.id.fgt_pc_item_vip_ll://VIP
+            //case R.id.fgt_pc_item_vip_ll://VIP
             case R.id.vip_layout://VIP
                 Jump2View.getInstance().gotoVip(activity);
                 break;
@@ -555,7 +525,7 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.personalcenter_item_price_tv://我的资产
                 Jump2View.getInstance().goMyMoney(activity, null);
                 break;
-            case R.id.account_task_layout://任务记录
+/*            case R.id.account_task_layout://任务记录
                 Jump2View.getInstance().goAuditTastList(activity, null);
                 break;
             case R.id.proxy_service_layout://代理
@@ -567,7 +537,7 @@ public class FgtPersonalCenter extends BaseFragment {
                         G.showToast(R.string.loading_data);
                 });
                 USER_AGENT.onEvent();
-                break;
+                break;*/
             case R.id.faq_layout://FAQ帮助
                 CommonUtil.getInstance().getConfigValue("faqurl", (url) -> {
                     faqUrl = url;
@@ -594,9 +564,9 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.order_layout://订单管理
                 Jump2View.getInstance().goGameTaskOrderList(activity);
                 break;
-            case R.id.proxy_game_account_layout://游戏账号
+            /*case R.id.proxy_game_account_layout://游戏账号
                 Jump2View.getInstance().goGameAccount(activity, null);
-                break;
+                break;*/
             case R.id.fgt_person_center_my_focus://我的关注
                 Jump2View.getInstance().goActMyFocus();
                 break;
@@ -615,9 +585,9 @@ public class FgtPersonalCenter extends BaseFragment {
                     G.shortToast("设置登录密码后不可修改登录名");
                 }
                 break;
-            case R.id.shop_assist_layout:
+            /*case R.id.shop_assist_layout:
                 Jump2View.getInstance().gotoYYShopAssist(getContext());
-                break;
+                break;*/
             case R.id.fgt_pc_item_gift_ll:
                 Jump2View.getInstance().goMyWelfare(getActivity(), true);
                 break;

app/src/main/res/color/selector_color_tab_home.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_enabled="false" android:color="@color/main_tab" />
-    <item android:state_activated="true" android:color="#fb8b01" />
+    <item android:state_activated="true" android:color="#2ebef2" />
     <item android:state_focused="true" android:color="#fb8b01" />
     <item android:state_checked="true" android:color="#fb8b01"/>
     <item android:state_selected="true" android:color="#fb8b01"/>

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="true">
+    <item android:drawable="@drawable/wxhb20000" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20001" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20002" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20003" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20004" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20005" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20006" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20007" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20008" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20009" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20010" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20011" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20012" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20013" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20014" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20015" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20016" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20017" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20018" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20019" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20020" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20021" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20022" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20023" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20024" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20025" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20026" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20027" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20028" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20029" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20030" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20031" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20032" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20033" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20034" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20035" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20036" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20037" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20038" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20039" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20040" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20041" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20042" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20043" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20044" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20045" android:duration="30"/>
+    <item android:drawable="@drawable/wxhb20046" android:duration="30"/>
+</animation-list>

app/src/main/res/drawable/fg_rect_black_default.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">
+    <solid android:color="#00FFFFFF"/>
+</shape>

app/src/main/res/drawable/fg_rect_black_press.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">
+    <solid android:color="#43000000"/>
+</shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/fg_circle_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/fg_circle_default" android:state_pressed="false"/>
+    <item android:drawable="@drawable/fg_circle_white_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/fg_circle_white_default" android:state_pressed="false"/>
 </selector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/fg_rect_black_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/fg_rect_black_default" android:state_pressed="false"/>
+</selector>

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

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/main_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false">
+<android.support.constraint.ConstraintLayout
+        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:id="@+id/main_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false">
 
     <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             android:adjustViewBounds="true"
             android:src="@mipmap/home_blue_bg"/>
 
@@ -16,82 +20,110 @@
             android:id="@+id/main_header"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:layout_marginTop="42dp">
-
-    </RelativeLayout>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="42dp"/>
 
     <include
+            android:id="@+id/frame_container"
             layout="@layout/main_frame_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="82dp"
-            android:layout_marginBottom="@dimen/bottom_height"/>
-
-
-    <View
-            android:id="@+id/tab_line"
-            android:layout_width="match_parent"
-            android:layout_height="2px"
-            android:layout_above="@id/tab_container"
-            android:background="#e6e6e6"/>
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="64dp"
+            android:layout_marginTop="82dp"/>
 
-    <RadioGroup
+    <com.sheep.gamegroup.view.customview.BottomTabLayout
             android:id="@+id/tab_container"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_height"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:background="@color/home_bottom"
-            android:gravity="end"
-            android:orientation="horizontal">
-
-        <RadioButton
+            android:layout_height="92dp"
+            android:backgroundTint="@color/white"
+            tools:backgroundTint="@color/black"
+            android:gravity="bottom"
+            android:clipChildren="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+        <LinearLayout
                 android:id="@+id/tab_1"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="#0000ffff"
-                android:button="@null"
-                android:drawableTop="@drawable/drawable_selector_task"
-                android:gravity="center"
-                android:paddingTop="@dimen/bottom_tab_pt"
-                android:text="@string/tab_viewpager_gamestore"
-                android:textColor="@color/selector_color_tab_home"
-                android:textSize="10sp"/>
-
-        <RadioButton
-                android:id="@+id/tab_2"
-                android:layout_width="75dp"
-                android:layout_height="68dp"
-                android:layout_marginBottom="7dp"
-                android:layout_gravity="bottom"
-                android:background="@drawable/tab_big_yq"
-                android:button="@null"
+                android:layout_marginTop="28dp"
                 android:gravity="center"
-                android:textSize="0sp"/>
+                android:orientation="vertical"
+                android:layout_weight="1">
+
+            <ImageView
+                    android:id="@+id/tab_1_iv"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    tools:src="@drawable/shouye"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+
+            <TextView
+                    android:id="@+id/tab_1_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="@id/tab_1_iv"
+                    app:layout_constraintEnd_toEndOf="@id/tab_1_iv"
+                    app:layout_constraintTop_toBottomOf="@id/tab_1_iv"
+                    android:text="首页"/>
+
+        </LinearLayout>
 
-        <RadioButton
+        <Space
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
+
+        <LinearLayout
                 android:id="@+id/tab_3"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="#000000ff"
-                android:button="@null"
-                android:drawableTop="@drawable/drawable_selector_game_center"
+                android:layout_marginTop="28dp"
+                android:orientation="vertical"
                 android:gravity="center"
-                android:paddingTop="@dimen/bottom_tab_pt"
-                android:text="@string/tab_viewpager_classification"
-                android:textColor="@color/selector_color_tab_game"
-                android:textSize="10sp"/>
-
-        <!--<com.airbnb.lottie.LottieAnimationView-->
-        <!--android:id="@+id/test_anim_view"-->
-        <!--app:lottie_fileName="data.json"-->
-        <!--app:lottie_loop="true"-->
-        <!--app:lottie_autoPlay="true"-->
-        <!--android:layout_width="50dp"-->
-        <!--android:layout_height="50dp" />-->
-
-    </RadioGroup>
-
-</RelativeLayout>
+                android:layout_weight="1">
+
+            <ImageView
+                    android:id="@+id/tab_3_iv"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    tools:src="@drawable/youxi"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+
+            <TextView
+                    android:id="@+id/tab_3_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/tab_3_iv"
+                    app:layout_constraintStart_toStartOf="@id/tab_3_iv"
+                    app:layout_constraintEnd_toEndOf="@id/tab_3_iv"
+                    android:text="游戏"/>
+
+        </LinearLayout>
+
+    </com.sheep.gamegroup.view.customview.BottomTabLayout>
+
+    <ImageView
+            android:id="@+id/tab_2"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginBottom="12dp"
+            android:scaleType="centerCrop"
+            android:layout_weight="1"
+            android:background="@drawable/anim_wxhb"
+            app:layout_constraintEnd_toEndOf="@+id/tab_container"
+            app:layout_constraintStart_toStartOf="@+id/tab_container"
+            app:layout_constraintBottom_toBottomOf="@+id/tab_container"/>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -15,7 +15,7 @@
                 android:id="@+id/layout_navigationBar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="16dp"
                 app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
@@ -70,7 +70,7 @@
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_marginTop="16dp"
-                android:src="@drawable/avatar"
+                android:src="@drawable/logo"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
@@ -81,7 +81,7 @@
                 android:id="@+id/name_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="4dp"
                 android:text="Billyyoyo"
                 android:textColor="@color/txt_white"
                 android:textSize="15sp"
@@ -90,17 +90,6 @@
                 app:layout_constraintTop_toBottomOf="@+id/icon_img_iv"/>
 
         <ImageView
-                android:id="@+id/edit_nickname_view"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
-                android:layout_marginTop="53dp"
-                android:layout_marginLeft="6dp"
-                android:adjustViewBounds="true"
-                android:src="@mipmap/edit"
-                app:layout_constraintBottom_toBottomOf="@+id/name_tv"
-                app:layout_constraintStart_toEndOf="@+id/name_tv"/>
-
-        <ImageView
                 android:id="@+id/vip_flag_view"
                 android:layout_width="wrap_content"
                 android:layout_height="16dp"
@@ -123,7 +112,9 @@
                 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"/>
+                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"
@@ -144,7 +135,6 @@
                 android:paddingTop="4dp"
                 android:paddingBottom="4dp"
                 android:layout_marginStart="@dimen/content_padding_10"
-                android:layout_marginTop="6dp"
                 android:text="登录账号："
                 android:textColor="@color/txt_white"
                 android:textSize="@dimen/text_size_11"

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

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:columnCount="3"
+            android:rowCount="4"
+            android:background="@color/white">
+
+    <LinearLayout
+            android:id="@+id/account_detail_layout"
+            android:layout_columnWeight="1"
+            android:layout_rowWeight="1"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:padding="16dp"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_gravity="fill">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/x_ic_account_secuity"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="个人资料"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/my_game_layout"
+            android:layout_columnWeight="1"
+            android:layout_rowWeight="1"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:padding="16dp"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_gravity="fill">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/ic_game"/>
+
+        <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/fgt_pc_item_gift_ll"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_columnWeight="1"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:padding="16dp"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_gravity="fill">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/ic_gift"/>
+
+        <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/my_card_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:padding="16dp"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_gravity="fill">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/x_ic_card_packet"/>
+
+        <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/voucher_layout"
+            android:layout_columnSpan="1"
+            android:layout_rowSpan="1"
+            android:layout_gravity="fill"
+            android:foreground="@drawable/selector_forground_rect_black"
+            android:padding="16dp"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+        <ImageView
+                android:id="@+id/voucher_icon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/voucher"/>
+
+        <TextView
+                android:id="@+id/voucher_label"
+                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"/>
+
+        <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>
+
+    <LinearLayout
+            android:id="@+id/order_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="visible">
+
+        <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@mipmap/ic_order"/>
+
+        <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/fgt_person_center_cart"
+            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/ic_cart"/>
+
+        <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/fgt_person_center_my_focus"
+            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/ic_focus"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/black_444444"
+                android:text="我的关注"/>
+
+    </LinearLayout>
+
+</GridLayout>

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

@@ -1,331 +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:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/shop_assist_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_assist" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="店员端" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_pc_item_shop_assist_v"
-        style="@style/style_item_line_new"
-        android:visibility="visible" />
-
-    <LinearLayout
-        android:id="@+id/account_detail_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/x_ic_account_secuity" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="个人资料" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_pc_item_my_game_v"
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/my_game_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_game" />
-
-        <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/fgt_pc_item_gift_ll"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_gift" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="我的礼包" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_pc_item_my_pet_v"
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-
-
-    <LinearLayout
-        android:id="@+id/my_pet_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_my_pet" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="我的宠物" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_pc_item_my_card_v"
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/my_card_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/x_ic_card_packet" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="我的卡包" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_pc_item_vip_v"
-        android:visibility="gone"
-        style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:visibility="gone"
-        android:id="@+id/fgt_pc_item_vip_ll"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_vip_pc_item" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="VIP" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/account_task_layout"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/x_ic_task_history" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="审核中心" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
-    <View style="@style/style_item_line_new" />
-
-    <RelativeLayout
-        android:id="@+id/voucher_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/content_padding_8"
-        android:paddingTop="@dimen/content_padding_16"
-        android:paddingEnd="@dimen/content_padding_30"
-        android:paddingBottom="@dimen/content_padding_16"
-        android:visibility="visible">
-
-        <ImageView
-            android:id="@+id/voucher_icon"
-            style="@style/style_item_img"
-            android:src="@mipmap/voucher" />
-
-        <TextView
-            android:id="@+id/voucher_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            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:layout_toRightOf="@+id/voucher_label"
-            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" />
-
-        <TextView
-            style="@style/style_item_end_next"
-            android:layout_alignParentEnd="true"
-            android:visibility="visible" />
-
-    </RelativeLayout>
-
-
-    <View style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:id="@+id/order_layout"
-        style="@style/style_item_container"
-        android:visibility="visible">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_order" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="商城订单" />
-
-        <TextView
-            style="@style/style_item_end_next"
-            android:visibility="visible" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/line_person_center_my_cart"
-        style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:id="@+id/fgt_person_center_cart"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_cart" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="购物车" />
-
-        <TextView
-            style="@style/style_item_end_next"
-            android:visibility="visible" />
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/fgt_person_center_my_focus_line"
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/fgt_person_center_my_focus"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/ic_focus" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="我的关注" />
-
-        <TextView
-            style="@style/style_item_end_next"
-            android:visibility="visible" />
-
-    </LinearLayout>
-
-
-    <View
-        android:id="@+id/proxy_service_layout_line"
-        style="@style/style_item_line_new"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/proxy_service_layout"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_proxy_service" />
-
-        <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/proxy_game_account_layout"
-        style="@style/style_item_container"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_game_account" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="游戏账号" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-</LinearLayout>

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

@@ -12,8 +12,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include layout="@layout/fgt_personacenter_item_top" />
-
+        <include layout="@layout/fgt_personacenter_item_top"/>
         <include
             layout="@layout/fgt_personalcenter_item_audit"
             android:layout_width="match_parent"
@@ -44,7 +43,7 @@
             android:layout_width="match_parent"
             android:layout_height="11dp" />
 
-        <include layout="@layout/fgt_personalcenter_item_center_one" />
+        <include layout="@layout/fgt_personal_center_item_center_one" />
 
         <include layout="@layout/fgt_personalcenter_item_center_two" />
 

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

@@ -25,6 +25,7 @@
         <EditText
             android:id="@+id/user_name_box"
             style="@style/login_edit_style_name"
+            android:background="@android:color/transparent"
             android:maxLength="20"
             android:hint="请输入登录名(唯一性)" />
 

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sheep.gamegroup.view.customview.TouchFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/frame_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<com.sheep.gamegroup.view.customview.TouchFrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>

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

@@ -1,268 +1,271 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:scrollbars="none"
-    android:background="@color/bg">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            android:scrollbars="none"
+            android:background="@color/bg">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_15"
-            android:layout_marginTop="@dimen/content_padding"
-            android:background="@color/white"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/content_padding_15"
+                android:layout_marginTop="@dimen/content_padding"
+                android:background="@color/white"
+                android:orientation="vertical">
+
             <LinearLayout
-                android:id="@+id/personal_info_avatar_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_avatar_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/header" />
+                        style="@style/style_item_label"
+                        android:text="@string/header"/>
 
 
                 <ImageView
-                    android:id="@+id/personal_info_avatar"
-                    android:layout_width="33dp"
-                    android:layout_height="33dp"
-                    android:src="@mipmap/icon" />
+                        android:id="@+id/personal_info_avatar"
+                        android:layout_width="33dp"
+                        android:layout_height="33dp"
+                        android:src="@mipmap/icon"/>
 
-                <TextView style="@style/style_item_end_next" />
+                <TextView style="@style/style_item_end_next"/>
 
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_loginname_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_loginname_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/loginname" />
+                        style="@style/style_item_label"
+                        android:text="@string/loginname"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_loginname"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_loginname"
+                        style="@style/style_item_end_next"/>
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_name_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_name_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/niker" />
+                        style="@style/style_item_label"
+                        android:text="@string/niker"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_name"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_name"
+                        style="@style/style_item_end_next"/>
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/sheep_id" />
+                        style="@style/style_item_label"
+                        android:text="@string/sheep_id"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_code"
-                    style="@style/style_item_end_next"
-                    android:textIsSelectable="true" />
+                        android:id="@+id/personal_info_code"
+                        style="@style/style_item_end_next"
+                        android:textIsSelectable="true"/>
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/llayout_sex"
-                style="@style/style_item_container">
+                    android:id="@+id/llayout_sex"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/sex" />
+                        style="@style/style_item_label"
+                        android:text="@string/sex"/>
 
 
                 <TextView
-                    android:id="@+id/tv_sex"
-                    style="@style/style_item_end_next"
-                    android:layout_width="150dp" />
+                        android:id="@+id/tv_sex"
+                        style="@style/style_item_end_next"
+                        android:layout_width="150dp"/>
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/llayout_birthday"
-                style="@style/style_item_container">
+                    android:id="@+id/llayout_birthday"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/birth_day" />
+                        style="@style/style_item_label"
+                        android:text="@string/birth_day"/>
 
 
                 <TextView
-                    android:id="@+id/tv_birthday"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/tv_birthday"
+                        style="@style/style_item_end_next"/>
 
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_qr_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_qr_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/my_qr" />
+                        style="@style/style_item_label"
+                        android:text="@string/my_qr"/>
 
                 <RelativeLayout
-                    android:layout_width="30dp"
-                    android:layout_height="30dp">
+                        android:layout_width="30dp"
+                        android:layout_height="30dp">
 
                     <ImageView
-                        android:id="@+id/personal_info_qr"
-                        android:layout_width="25dp"
-                        android:layout_height="25dp"
-                        android:layout_centerInParent="true"
-                        android:background="@null"
-                        android:src="@mipmap/icon" />
+                            android:id="@+id/personal_info_qr"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_centerInParent="true"
+                            android:background="@null"
+                            android:src="@mipmap/icon"/>
 
                     <ImageView
-                        android:layout_width="5dp"
-                        android:layout_height="5dp"
-                        android:layout_centerInParent="true"
-                        android:background="@null"
-                        android:src="@mipmap/icon" />
+                            android:layout_width="5dp"
+                            android:layout_height="5dp"
+                            android:layout_centerInParent="true"
+                            android:background="@null"
+                            android:src="@mipmap/icon"/>
 
                 </RelativeLayout>
 
-                <TextView style="@style/style_item_end_next" />
+                <TextView style="@style/style_item_end_next"/>
 
             </LinearLayout>
         </LinearLayout>
 
-        <View style="@style/style_item_line_3_0" />
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:background="@color/bg_line"/>
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_15"
-            android:layout_marginTop="@dimen/content_padding"
-            android:background="@color/white"
-            android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/content_padding_15"
+                android:layout_marginTop="@dimen/content_padding"
+                android:background="@color/white"
+                android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/personal_info_phone_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_phone_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/phone" />
+                        style="@style/style_item_label"
+                        android:text="@string/phone"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_phone"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_phone"
+                        style="@style/style_item_end_next"/>
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
             <LinearLayout
-                android:id="@+id/personal_info_addr_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_addr_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/my_addr_info" />
+                        style="@style/style_item_label"
+                        android:text="@string/my_addr_info"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_addr"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_addr"
+                        style="@style/style_item_end_next"/>
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_bind_tx_ali_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_bind_tx_ali_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/bind_tx_ali" />
+                        style="@style/style_item_label"
+                        android:text="@string/bind_tx_ali"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_bind_tx_ali"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_bind_tx_ali"
+                        style="@style/style_item_end_next"/>
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_bind_qq_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_bind_qq_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/bind_qq" />
+                        style="@style/style_item_label"
+                        android:text="@string/bind_qq"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_bind_qq"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_bind_qq"
+                        style="@style/style_item_end_next"/>
             </LinearLayout>
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_bind_wx_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_bind_wx_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/bind_wx" />
+                        style="@style/style_item_label"
+                        android:text="@string/bind_wx"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_bind_wx"
-                    style="@style/style_item_end_next" />
+                        android:id="@+id/personal_info_bind_wx"
+                        style="@style/style_item_end_next"/>
             </LinearLayout>
 
 
-            <View style="@style/style_item_line_3_0" />
+            <View style="@style/style_item_line_3_0"/>
 
             <LinearLayout
-                android:id="@+id/personal_info_authentication_container"
-                style="@style/style_item_container">
+                    android:id="@+id/personal_info_authentication_container"
+                    style="@style/style_item_container">
 
                 <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/auther" />
+                        style="@style/style_item_label"
+                        android:text="@string/auther"/>
 
 
                 <TextView
-                    android:id="@+id/personal_info_authentication"
-                    style="@style/style_item_end_next"
-                    android:text="未认证" />
+                        android:id="@+id/personal_info_authentication"
+                        style="@style/style_item_end_next"
+                        android:text="未认证"/>
             </LinearLayout>
 
 

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

@@ -9,7 +9,7 @@
     <!--app text view-->
     <color name="B">#000000</color>
     <color name="main_tab_activated">#32b2ed</color>
-    <color name="main_tab">#AFAFAF</color>
+    <color name="main_tab">#333333</color>
     <color name="white_40">#66ffffff</color>
 
 </resources>

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

@@ -327,10 +327,10 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@drawable/selector_forground_rect_black</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:paddingBottom">@dimen/content_padding_16</item>
-        <item name="android:paddingEnd">@dimen/content_padding_30</item>
+        <item name="android:paddingEnd">@dimen/content_padding_20</item>
         <item name="android:paddingStart">@dimen/content_padding_8</item>
         <item name="android:paddingTop">@dimen/content_padding_16</item>
     </style>
@@ -348,7 +348,8 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="style_item_label" parent="style_item_label_parent">
+    <style name="style_item_label"
+           parent="style_item_label_parent">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
     </style>