[增加]UI优化

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -421,7 +421,7 @@ public class TaskHelper {
         ViewUtil.setColorMapText(textView, String.format(Locale.CHINA, "%s", taskReleaseEty.getCashOrWelfare()), taskReleaseEty.getCashOrWelfare(), "#FD2D54");
         textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
-        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
+        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_1);
         textView.setPadding(4 * padding, padding, 4 * padding, padding);
     }
 

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

@@ -155,8 +155,6 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
     View item_gc_game_app_list_bottom;
     @BindView(R.id.item_gc_game_app_list_rv)
     RecyclerView item_gc_game_app_list_rv;
-    @BindView(R.id.item_gc_game_app_list_top)
-    View item_gc_game_app_list_top;
     @BindView(R.id.item_gc_game_app_list_tv)
     TextView item_gc_game_app_list_tv;
 
@@ -206,7 +204,6 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
         boolean isGameGroupNull = gameGroup == null;
         ViewUtil.setVisibility(gc_game_app_detail_game_list, !isGameGroupNull);
         ViewUtil.setVisibility(item_gc_game_app_list_bottom, !isGameGroupNull);
-        ViewUtil.setVisibility(item_gc_game_app_list_top, isGameGroupNull);
         ViewUtil.setVisibility(gc_game_app_detail_bt2, isGameGroupNull);
         ViewUtil.setVisibility(gc_game_app_detail_line, isGameGroupNull);
         if (isGameGroupNull) {

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

@@ -80,8 +80,7 @@ public class SignInFgt extends AbsLoginFgt {
     TextView verifyBox;
     @BindView(R.id.captcha_code_view)
     ImageView verifyImageView;
-    @BindView(R.id.captcha_seperator)
-    View verifySeperator;
+
     @BindView(R.id.cb_remember_pwd)
     CheckBox cbRememberPwd;
 
@@ -223,7 +222,6 @@ public class SignInFgt extends AbsLoginFgt {
     public void getCaptchaImage() {
         verifyBox.setVisibility(View.VISIBLE);
         verifyImageView.setVisibility(View.VISIBLE);
-        verifySeperator.setVisibility(View.VISIBLE);
         SheepApp.getInstance().getNetComponent().getApiService().getImgCaptcha()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -50,13 +50,16 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.yalantis.ucrop.util.FileUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import butterknife.BindView;
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import okhttp3.Call;
+
 import static android.app.Activity.RESULT_OK;
 
 /**
@@ -232,10 +235,15 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         super.onDestroy();
     }
 
+    //消消乐游戏关键字
+    private static final String KEYWORD_XXL = "block_puzzle";
+
     public void onDetach() {
         if (mWebView != null) {
             try {
-                getGameUserInfo(false);
+                if (getWebUrl().contains(KEYWORD_XXL)) {
+                    getGameUserInfo(false);
+                }
                 if (mWebView.getParent() != null) {
                     ((ViewGroup) mWebView.getParent()).removeView(mWebView);
                 }
@@ -488,7 +496,9 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                     CookieSyncManager.getInstance().sync();
                 }
-                getGameUserInfo(true);
+                if (getWebUrl().contains(KEYWORD_XXL)) {
+                    getGameUserInfo(true);
+                }
                 loadJs();
             }
         });
@@ -667,7 +677,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 if (!s.equals("null")) {
                     SharedPreferencesUtil.putData(KEY_GAME_USER_INFO, s);
                 } else {
-                    if(shouldLoad){
+                    if (shouldLoad) {
                         String oldUserInfo = (String) SharedPreferencesUtil.getData(KEY_GAME_USER_INFO, "");
                         if (oldUserInfo != null && !oldUserInfo.isEmpty()) {
                             String jsUrl = "window.localStorage.setItem('userInfo','" + oldUserInfo + "')";

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

@@ -28,13 +28,11 @@ public class AdpGcGameAppInfoList extends BaseQuickAdapter<GameInfoList, BaseVie
 
     @Override
     public void convert(BaseViewHolder viewHolder, final GameInfoList itemList) {
-        View item_gc_game_app_list_top = viewHolder.itemView.findViewById(R.id.item_gc_game_app_list_top);
         View item_gc_game_app_list_bottom = viewHolder.itemView.findViewById(R.id.item_gc_game_app_list_bottom);
         TextView item_gc_game_app_list_tv = viewHolder.itemView.findViewById(R.id.item_gc_game_app_list_tv);
         TextView item_gc_game_app_list_more_tv = viewHolder.itemView.findViewById(R.id.item_gc_game_app_list_more_tv);
         RecyclerView recyclerView = viewHolder.itemView.findViewById(R.id.item_gc_game_app_list_rv);
 
-        ViewUtil.setVisibility(item_gc_game_app_list_top, itemList.isShowTopLine());
         ViewUtil.setVisibility(item_gc_game_app_list_bottom, itemList.isShowBottomLine());
         ViewUtil.setText(item_gc_game_app_list_tv, itemList.getName());
         itemList.setMoreViewOnClickListener(item_gc_game_app_list_more_tv);

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

@@ -0,0 +1,37 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class RecyclerItemDecoration extends RecyclerView.ItemDecoration {
+
+    private int itemSpaceLeft;
+    private int itemSpaceCenter;
+    private int itemNum;
+
+    public RecyclerItemDecoration(int itemSpaceLeft, int itemSpaceCenter, int itemNum) {
+        this.itemSpaceLeft = itemSpaceLeft;
+        this.itemSpaceCenter = itemSpaceCenter;
+        this.itemNum = itemNum;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        int position = parent.getResources().getDisplayMetrics().widthPixels;
+        //int position = parent.getChildAdapterPosition(view);
+        if (parent.getChildCount() > 0) {
+            if (position % itemNum == 0) {                  //最左边Item
+                outRect.left = itemSpaceLeft;
+                outRect.right = itemSpaceCenter / 5;
+            } else if (position % itemNum == itemNum - 1) { //最右边Item
+                outRect.left = itemSpaceCenter / 5;
+                outRect.right = itemSpaceLeft;
+            } else {                                        //中间Item
+                outRect.left = itemSpaceCenter / 5;
+                outRect.right = itemSpaceCenter / 5;
+            }
+        }
+    }
+}
+

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

@@ -7,6 +7,7 @@ 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;
@@ -27,6 +28,7 @@ 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;
@@ -34,6 +36,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;
@@ -212,7 +215,6 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setVisibilityBlock(audit_success_oval, false);
         ViewUtil.setText(audit_failed, getString(R.string.audit_failed, ViewUtil.INDENT));
         ViewUtil.setVisibilityBlock(audit_failed_oval, false);
-        initUserModuleItemView();
         //是否显示我的关注
         ViewUtil.setVisibility(fgt_person_center_my_focus_line, !TestUtil.isLTVersion3_4_5());
         ViewUtil.setVisibility(fgt_person_center_my_focus, !TestUtil.isLTVersion3_4_5());
@@ -300,12 +302,13 @@ public class FgtPersonalCenter extends BaseFragment {
     private List<UserCenterModule> userCenterModuleList = ListUtil.emptyList();
 
     //初始化用户中心模块界面
-    private void initUserModuleItemView() {
+    private void initUserModuleItemView(int itemCount) {
         LinearLayoutManager manager = new LinearLayoutManager(SheepApp.getInstance(), LinearLayoutManager.HORIZONTAL, false);
         moduleList.setHasFixedSize(true);
         moduleList.setNestedScrollingEnabled(false);
         moduleList.setLayoutManager(manager);
-        int w = (int) ((ScreenUtil.getScreenWidth(getActivity()) - ScreenUtil.dip2px(getContext(), 10)) / 4.5);
+        if (itemCount > 5) itemCount = 5;
+        int w = (ScreenUtil.getScreenWidth(getActivity()) / 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), "个人中心"));
@@ -322,6 +325,8 @@ 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);
         } else {

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#00FFFFFF"/>
+    <size android:width="8dp" android:height="8dp"/>
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#59FFFFFF"/>
+    <size android:width="8dp" android:height="8dp"/>
+</shape>

app/src/main/res/drawable/fg_rect_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_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="#59FFFFFF"/>
+</shape>

app/src/main/res/drawable/selector_forground_circle_white.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_circle_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/fg_circle_default" android:state_pressed="false"/>
+</selector>

app/src/main/res/drawable/selector_forground_rect_white.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_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/fg_rect_default" android:state_pressed="false"/>
+</selector>

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

@@ -27,6 +27,8 @@
                 android:id="@+id/img_baseactivity_title"
                 android:layout_width="wrap_content"
                 android:layout_height="?attr/actionBarSize"
+                android:foreground="@drawable/selector_forground_circle_white"
+                tools:ignore="UnusedAttribute"
                 android:layout_marginTop="24dp"
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/content_padding_20"

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

@@ -1,298 +1,297 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail"
-    android:background="@color/bg">
+                                             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"
+                                             tools:context="com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail"
+                                             android:background="@color/bg">
 
     <TextView
-        android:id="@+id/gc_game_app_detail_bt2"
-        style="@style/style_button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_line"
-        android:text="下载" />
+            android:id="@+id/gc_game_app_detail_bt2"
+            style="@style/style_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_line"
+            android:text="下载"/>
 
     <View
-        android:id="@+id/gc_game_app_detail_line"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/gc_game_app_detail_bt2"
-        app:layout_constraintTop_toBottomOf="@id/refresh"
-        android:background="#F2F2F2" />
+            android:id="@+id/gc_game_app_detail_line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/gc_game_app_detail_bt2"
+            app:layout_constraintTop_toBottomOf="@id/refresh"
+            android:background="#F2F2F2"/>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/refresh"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/gc_game_app_detail_line">
-
-        <android.support.v4.widget.NestedScrollView
+            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="0dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/gc_game_app_detail_line">
 
-            <LinearLayout
+        <android.support.v4.widget.NestedScrollView
                 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:maxHeight="300dp">
+                    android:layout_height="match_parent"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
 
-                    <ImageView
-                        android:id="@+id/gc_game_app_detail_iv"
+                <android.support.constraint.ConstraintLayout
                         android:layout_width="match_parent"
-                        android:layout_height="216dp"
-                        android:maxHeight="300dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/loading_01"
-                        app:layout_constraintTop_toTopOf="parent"/>
+                        android:layout_height="wrap_content"
+                        android:maxHeight="300dp">
 
                     <ImageView
-                        android:id="@+id/gc_game_app_detail_iv2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="100dp"
-                        android:maxHeight="300dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitXY"
-                        android:src="@drawable/loading_01"
-                        android:visibility="gone"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            android:id="@+id/gc_game_app_detail_iv"
+                            android:layout_width="match_parent"
+                            android:layout_height="216dp"
+                            android:maxHeight="300dp"
+                            android:scaleType="centerCrop"
+                            android:src="@drawable/loading_01"
+                            app:layout_constraintTop_toTopOf="parent"/>
+
+                    <ImageView
+                            android:id="@+id/gc_game_app_detail_iv2"
+                            android:layout_width="match_parent"
+                            android:layout_height="216dp"
+                            android:adjustViewBounds="true"
+                            android:scaleType="centerCrop"
+                            android:src="@drawable/loading_01"
+                            android:visibility="gone"
+                            app:layout_constraintTop_toTopOf="parent"/>
                     <com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
-                        android:id="@+id/detail_player"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="100dp"
-                        android:maxHeight="300dp"
-                        android:visibility="gone"
-                        app:layout_constraintTop_toTopOf="parent"/>
+                            android:id="@+id/detail_player"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:minHeight="100dp"
+                            android:maxHeight="300dp"
+                            android:visibility="gone"
+                            app:layout_constraintTop_toTopOf="parent"/>
                     <ImageView
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginTop="@dimen/status_bar_height"
-                        android:gravity="center_vertical"
-                        android:onClick="onClickBackImg"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/narrow_back_black"
-                        android:tint="@color/white"
-                        android:background="@drawable/shape_oval_black_trans_pad"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginTop="32dp"
+                            android:gravity="center_vertical"
+                            android:onClick="onClickBackImg"
+                            android:scaleType="centerInside"
+                            android:foreground="@drawable/selector_forground_circle_white"
+                            tools:ignore="UnusedAttribute"
+                            android:src="@drawable/narrow_back_black"
+                            android:tint="@color/white"
+                            android:background="@drawable/shape_oval_black_trans_pad"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
                     <ImageView
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="@dimen/status_bar_height"
-                        android:layout_marginRight="16dp"
-                        android:gravity="center_vertical"
-                        android:onClick="onClickShareImg"
-                        android:scaleType="centerInside"
-                        android:background="@drawable/shape_oval_black_trans_pad"
-                        android:tint="@color/white"
-                        android:src="@mipmap/share"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"/>
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginTop="32dp"
+                            android:layout_marginRight="16dp"
+                            android:gravity="center_vertical"
+                            android:onClick="onClickShareImg"
+                            android:scaleType="centerInside"
+                            android:foreground="@drawable/selector_forground_circle_white"
+                            tools:ignore="UnusedAttribute"
+                            android:background="@drawable/shape_oval_black_trans_pad"
+                            android:tint="@color/white"
+                            android:src="@mipmap/share"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
                     <ImageView
-                        android:id="@+id/gc_game_app_detail_play_iv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/ic_play_but_image"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"/>
+                            android:id="@+id/gc_game_app_detail_play_iv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/ic_play_but_image"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"/>
 
                 </android.support.constraint.ConstraintLayout>
 
                 <android.support.constraint.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:paddingBottom="16dp"
-                    android:layout_height="wrap_content">
+                        android:layout_width="match_parent"
+                        android:paddingBottom="16dp"
+                        android:layout_height="wrap_content">
 
                     <LinearLayout
-                        android:id="@+id/gc_game_app_discount_desc_btn"
-                        android:background="@drawable/shape_btn_yellow_one_round"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        android:gravity="center"
-                        android:layout_width="88dp"
-                        android:layout_height="20dp">
+                            android:id="@+id/gc_game_app_discount_desc_btn"
+                            android:background="@drawable/shape_btn_yellow_one_round"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            android:orientation="horizontal"
+                            android:visibility="gone"
+                            android:gravity="center"
+                            android:layout_width="88dp"
+                            android:layout_height="20dp">
                         <TextView
-                            android:text="金丹玩法"
-                            android:textSize="11sp"
-                            android:layout_marginStart="10dp"
-                            android:textColor="@color/black_333333"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                                android:text="金丹玩法"
+                                android:textSize="11sp"
+                                android:layout_marginStart="10dp"
+                                android:textColor="@color/black_333333"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"/>
                         <ImageView
-                            android:layout_width="10dp"
-                            android:layout_height="10dp"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/narrow_back_black"
-                            android:tint="@color/black_333333"
-                            android:rotation="180" />
+                                android:layout_width="10dp"
+                                android:layout_height="10dp"
+                                android:scaleType="centerInside"
+                                android:src="@drawable/narrow_back_black"
+                                android:tint="@color/black_333333"
+                                android:rotation="180"/>
                     </LinearLayout>
 
                     <ImageView
-                        android:id="@+id/gc_game_app_detail_icon"
-                        android:layout_width="62dp"
-                        android:layout_height="62dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginBottom="20dp"
-                        android:src="@drawable/icon_lj"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            android:id="@+id/gc_game_app_detail_icon"
+                            android:layout_width="64dp"
+                            android:layout_height="64dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginTop="16dp"
+                            android:layout_marginBottom="20dp"
+                            android:src="@drawable/icon_lj"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
                     <TextView
-                        android:id="@+id/gc_game_app_detail_score_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="40dp"
-                        android:layout_marginTop="32dp"
-                        android:textColor="#ffffd042"
-                        android:textSize="15sp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintRight_toRightOf="parent" />
+                            android:id="@+id/gc_game_app_detail_score_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="40dp"
+                            android:layout_marginTop="32dp"
+                            android:textColor="#ffffd042"
+                            android:textSize="24dp"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"/>
 
                     <TextView
-                        android:id="@+id/gc_game_app_detail_name"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginEnd="16dp"
-                        android:gravity="center_vertical"
-                        android:textColor="#ff333333"
-                        android:textSize="15sp"
-                        app:layout_constraintStart_toEndOf="@id/gc_game_app_detail_icon"
-                        app:layout_constraintTop_toTopOf="@id/gc_game_app_detail_icon" />
+                            android:id="@+id/gc_game_app_detail_name"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginEnd="16dp"
+                            android:gravity="center_vertical"
+                            android:textColor="#ff333333"
+                            android:textSize="15sp"
+                            app:layout_constraintStart_toEndOf="@id/gc_game_app_detail_icon"
+                            app:layout_constraintTop_toTopOf="@id/gc_game_app_detail_icon"/>
 
                     <ImageView
-                        android:id="@+id/gc_game_app_hot_iv"
-                        android:src="@mipmap/hot"
-                        app:layout_constraintTop_toTopOf="@+id/gc_game_app_detail_name"
-                        app:layout_constraintStart_toEndOf="@+id/gc_game_app_detail_name"
-                        android:layout_marginStart="3dp"
-                        android:visibility="gone"
-                        android:layout_width="8dp"
-                        android:layout_height="10dp" />
+                            android:id="@+id/gc_game_app_hot_iv"
+                            android:src="@mipmap/hot"
+                            app:layout_constraintTop_toTopOf="@+id/gc_game_app_detail_name"
+                            app:layout_constraintStart_toEndOf="@+id/gc_game_app_detail_name"
+                            android:layout_marginStart="3dp"
+                            android:visibility="gone"
+                            android:layout_width="8dp"
+                            android:layout_height="10dp"/>
 
                     <android.support.v7.widget.RecyclerView
-                        android:id="@+id/gc_game_app_detail_tag_list"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_name"
-                        app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name" />
+                            android:id="@+id/gc_game_app_detail_tag_list"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_name"
+                            app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name"/>
 
                     <TextView
-                        android:id="@+id/gc_game_app_detail_info_tv"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:lineSpacingExtra="5dp"
-                        android:textColor="#ff999999"
-                        android:textSize="12sp"
-                        android:layout_marginTop="8dp"
-                        app:layout_constraintEnd_toStartOf="@id/gc_game_app_detail_score_tv"
-                        app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_tag_list" />
+                            android:id="@+id/gc_game_app_detail_info_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:lineSpacingExtra="5dp"
+                            android:textColor="#ff999999"
+                            android:textSize="12sp"
+                            android:layout_marginTop="8dp"
+                            app:layout_constraintEnd_toStartOf="@id/gc_game_app_detail_score_tv"
+                            app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/gc_game_app_detail_tag_list"/>
 
                     <TextView
-                        android:id="@+id/gc_game_app_detail_bt1"
-                        android:layout_width="44dp"
-                        android:layout_height="17dp"
-                        android:background="@drawable/selector_button_stroke_main"
-                        android:gravity="center"
-                        android:onClick="onClickFollowTv"
-                        android:text="关注"
-                        android:textColor="@color/selector_color_stoke_main_btn"
-                        android:textSize="10sp"
-                        android:layout_marginTop="6dp"
-                        app:layout_constraintTop_toBottomOf="@+id/gc_game_app_detail_icon"
-                        app:layout_constraintRight_toRightOf="@+id/gc_game_app_detail_icon"
-                        app:layout_constraintLeft_toLeftOf="@+id/gc_game_app_detail_icon"/>
+                            android:id="@+id/gc_game_app_detail_bt1"
+                            android:layout_width="44dp"
+                            android:layout_height="17dp"
+                            android:background="@drawable/selector_button_stroke_main"
+                            android:gravity="center"
+                            android:onClick="onClickFollowTv"
+                            android:text="关注"
+                            android:textColor="@color/selector_color_stoke_main_btn"
+                            android:textSize="10sp"
+                            android:layout_marginTop="6dp"
+                            app:layout_constraintTop_toBottomOf="@+id/gc_game_app_detail_icon"
+                            app:layout_constraintRight_toRightOf="@+id/gc_game_app_detail_icon"
+                            app:layout_constraintLeft_toLeftOf="@+id/gc_game_app_detail_icon"/>
 
                     <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="12dp"
-                        app:layout_constraintBottom_toBottomOf="@id/gc_game_app_detail_icon"
-                        app:layout_constraintEnd_toEndOf="parent">
+                            android:orientation="horizontal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="12dp"
+                            app:layout_constraintBottom_toBottomOf="@id/gc_game_app_detail_icon"
+                            app:layout_constraintEnd_toEndOf="parent">
 
                         <TextView
-                            android:id="@+id/gc_game_app_detail_bt4"
-                            style="@style/style_activity_td_tv"
-                            android:textSize="13sp"
-                            android:layout_width="66dp"
-                            android:layout_height="24dp"
-                            android:visibility="gone"
-                            android:layout_marginStart="12dp" />
+                                android:id="@+id/gc_game_app_detail_bt4"
+                                style="@style/style_activity_td_tv"
+                                android:textSize="13sp"
+                                android:layout_width="66dp"
+                                android:layout_height="24dp"
+                                android:visibility="gone"
+                                android:layout_marginStart="12dp"/>
 
                         <TextView
-                            android:id="@+id/gc_game_app_detail_bt3"
-                            style="@style/style_vip_td_tv"
-                            android:textSize="13sp"
-                            android:layout_width="66dp"
-                            android:layout_height="24dp"
-                            android:visibility="gone"
-                            android:layout_marginStart="12dp" />
+                                android:id="@+id/gc_game_app_detail_bt3"
+                                style="@style/style_vip_td_tv"
+                                android:textSize="13sp"
+                                android:layout_width="66dp"
+                                android:layout_height="24dp"
+                                android:visibility="gone"
+                                android:layout_marginStart="12dp"/>
                     </LinearLayout>
 
                 </android.support.constraint.ConstraintLayout>
 
                 <View
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#fff5f5f5" />
+                        android:layout_width="match_parent"
+                        android:layout_height="10dp"
+                        android:background="#fff5f5f5"/>
 
                 <include
-                    android:id="@+id/gc_game_app_detail_game_list"
-                    layout="@layout/item_gc_game_app_channel_list"/>
+                        android:id="@+id/gc_game_app_detail_game_list"
+                        layout="@layout/item_gc_game_app_channel_list"/>
 
                 <android.support.design.widget.TabLayout
-                    android:id="@+id/tabLayout"
-                    style="@style/style_tab"
-                    app:tabMode="fixed"
-                    android:layout_height="48dp"
-                    app:tabIndicatorHeight="2dp" />
-
-                <include layout="@layout/line_1px_hor" />
-
+                        android:id="@+id/tabLayout"
+                        style="@style/style_tab"
+                        app:tabMode="fixed"
+                        android:layout_height="48dp"
+                        app:tabIndicatorHeight="2dp"/>
 
                 <com.kfzs.android.view.widget.WrapContentHeightViewPager
-                    android:id="@+id/viewPager"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:minHeight="@dimen/view_size_100"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+                        android:id="@+id/viewPager"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:minHeight="@dimen/view_size_100"
+                        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
             </LinearLayout>
 
@@ -301,21 +300,21 @@
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="300dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:onClick="onClickPlusDrag"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="300dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:onClick="onClickPlusDrag"
+            android:paddingTop="@dimen/content_padding_10"
+            android:paddingBottom="@dimen/content_padding_10">
 
         <ImageView
-            android:id="@+id/write_comment"
-            android:layout_width="45dp"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY" />
+                android:id="@+id/write_comment"
+                android:layout_width="45dp"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"/>
     </com.kfzs.duanduan.view.DragRelativeLayout>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -1,8 +1,8 @@
 <?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:layout_width="match_parent"
-    android:layout_height="match_parent">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -240,6 +240,8 @@
             android:id="@+id/img_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="?attr/actionBarSize"
+            android:foreground="@drawable/selector_forground_circle_white"
+            tools:ignore="UnusedAttribute"
             android:paddingStart="@dimen/content_padding_20"
             android:paddingEnd="@dimen/content_padding_20"
             android:gravity="center_vertical"

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

@@ -28,9 +28,11 @@
                     android:id="@+id/iv_user_face"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
+                    android:foreground="@drawable/selector_forground_circle_white"
+                    tools:ignore="UnusedAttribute"
                     android:scaleType="centerCrop"
                     android:layout_marginBottom="8dp"
-                    android:src="@drawable/qq"/>
+                    android:src="@drawable/qq" />
 
             <View
                     android:id="@+id/v_red_dot"
@@ -96,15 +98,14 @@
                 android:layout_width="18dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
-                android:layout_below="@+id/tv_nickname"
-                android:layout_toRightOf="@+id/tv_user_asset"
+                android:foreground="@drawable/selector_forground_circle_white"
                 android:adjustViewBounds="true"
                 android:padding="3dp"
                 android:src="@mipmap/pwd_hide"
                 android:tint="@color/white"
                 app:layout_constraintStart_toEndOf="@+id/tv_user_asset"
                 app:layout_constraintTop_toTopOf="@+id/tv_user_asset"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_user_asset"/>
+                app:layout_constraintBottom_toBottomOf="@+id/tv_user_asset" tools:ignore="UnusedAttribute"/>
 
     </android.support.constraint.ConstraintLayout>
 
@@ -124,9 +125,11 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginEnd="16dp"
+            android:foreground="@drawable/selector_forground_circle_white"
             android:src="@drawable/drawable_selector_ic_home_search"
             android:padding="6dp"
-            android:tint="@color/white"/>
+            android:tint="@color/white"
+            tools:ignore="UnusedAttribute"/>
 
     <FrameLayout
             android:layout_width="wrap_content"
@@ -138,9 +141,11 @@
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_gravity="end"
+                android:foreground="@drawable/selector_forground_circle_white"
                 android:scaleType="center"
                 android:src="@drawable/zhedie"
-                android:tint="@color/white"/>
+                android:tint="@color/white"
+                tools:ignore="UnusedAttribute"/>
 
         <View
                 android:id="@+id/v_red_dot_menu"

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

@@ -25,6 +25,8 @@
                     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"
@@ -49,6 +51,8 @@
                     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"/>
@@ -113,35 +117,35 @@
                 android:id="@+id/vertical_seperator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
                 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_constraintTop_toBottomOf="@+id/name_tv"
                 app:layout_goneMarginLeft="8dp"
-                app:layout_goneMarginRight="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:layout_marginTop="6dp"
                 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_toBottomOf="@+id/name_tv"/>
+                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:layout_marginTop="6dp"
-                android:text="绵羊号："
+                android:text="登录账号："
                 android:textColor="@color/txt_white"
                 android:textSize="@dimen/text_size_11"
                 app:layout_constraintStart_toEndOf="@+id/vertical_seperator"

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

@@ -36,8 +36,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:paddingEnd="5dp"
-                android:paddingStart="5dp"
                 tools:listitem="@layout/item_my_list_but" />
 
         </LinearLayout>

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

@@ -64,6 +64,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
                     android:visibility="gone"
+                    tools:visibility="visible"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent">
@@ -90,7 +91,6 @@
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:layout_marginEnd="12dp"
-                        android:layout_alignParentRight="true"
                         android:padding="8dp"
                         android:src="@mipmap/arrow_down"
                         android:tint="@color/black_6_3"
@@ -106,14 +106,12 @@
                         android:paddingEnd="28dp"
                         android:paddingTop="21dp"
                         android:paddingBottom="21dp"
-                        android:layout_marginBottom="16dp"
                         style="@style/login_edit_style_pwd"
                         app:layout_constraintTop_toBottomOf="@id/user_name_box"
                         android:background="@drawable/selector_login_edit_text"
                         android:hint="请输入密码(6-16位)"
                         android:inputType="textPassword"
                         android:maxLength="16"
-                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="@+id/user_name_box"
                         app:layout_constraintEnd_toEndOf="@+id/user_name_box"/>
 
@@ -129,6 +127,48 @@
                         app:layout_constraintBottom_toBottomOf="@+id/password_box"
                         app:layout_constraintTop_toTopOf="@+id/password_box"/>
 
+                <android.support.constraint.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        app:layout_constraintTop_toBottomOf="@id/password_box"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginTop="16dp"
+                        app:layout_constraintStart_toStartOf="@+id/password_box"
+                        app:layout_constraintEnd_toEndOf="@+id/password_box">
+
+                    <EditText
+                            android:id="@+id/verify_box"
+                            android:digits="@string/digits_username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textSize="14dp"
+                            android:paddingStart="28dp"
+                            android:paddingTop="21dp"
+                            android:paddingBottom="21dp"
+                            android:background="@drawable/selector_login_edit_text"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            android:hint="验证码"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:maxLength="16"/>
+
+                    <ImageView
+                            android:id="@+id/captcha_code_view"
+                            android:background="@color/gray_F0F0F0"
+                            android:layout_marginEnd="16dp"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:layout_width="120dp"
+                            android:layout_height="40dp"/>
+
+                </android.support.constraint.ConstraintLayout>
+
             </android.support.constraint.ConstraintLayout>
 
             <android.support.constraint.ConstraintLayout
@@ -139,6 +179,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    tools:visibility="gone"
                     android:visibility="visible">
 
                 <EditText
@@ -262,38 +303,6 @@
 
     </android.support.v7.widget.CardView>
 
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="50dp">
-
-        <EditText
-                android:id="@+id/verify_box"
-                style="@style/login_edit_style_name"
-                android:layout_width="80dp"
-                android:hint="验证码"
-                android:visibility="gone"
-                android:maxLength="16"/>
-
-        <ImageView
-                android:id="@+id/captcha_code_view"
-                android:background="@color/gray_F0F0F0"
-                android:layout_toRightOf="@+id/verify_box"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="20dp"
-                android:visibility="gone"
-                android:layout_width="120dp"
-                android:layout_height="40dp"/>
-
-        <View
-                android:id="@+id/captcha_seperator"
-                style="@style/login_separetor_line_style"
-                android:layout_width="80dp"
-                android:visibility="gone"
-                android:layout_below="@+id/verify_box"/>
-    </RelativeLayout>
-
 
     <include layout="@layout/footer_third_login"
              android:layout_width="match_parent"

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

@@ -4,14 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/item_gc_game_app_list_top"
-        android:layout_width="match_parent"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_height="1dp"
-        android:background="#F2F2F2" />
-
     <LinearLayout style="@style/style_wc_rl">
 
         <ImageView

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

@@ -4,14 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/item_gc_game_app_list_top"
-        android:layout_width="match_parent"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_height="1dp"
-        android:background="#F2F2F2" />
-
     <RelativeLayout style="@style/style_wc_rl">
 
         <TextView

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

@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/my_item_but"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp">
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/my_item_but"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp">
 
     <ImageView
-        android:id="@+id/my_item_img"
-        android:layout_width="match_parent"
-        android:layout_height="47dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/icon" />
+            android:id="@+id/my_item_img"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/icon"/>
 
     <TextView
-        android:id="@+id/my_item_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/my_item_img"
-        android:layout_marginTop="5dp"
-        android:singleLine="true"
-        android:gravity="center"
-        android:text="试玩赚钱"
-        android:textColor="@color/black_6_3"
-        android:textSize="13sp" />
+            android:id="@+id/my_item_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/my_item_img"
+            android:layout_marginTop="5dp"
+            android:singleLine="true"
+            android:gravity="center"
+            android:text="试玩赚钱"
+            android:textColor="@color/black_6_3"
+            android:textSize="13sp"/>
     <TextView
-        android:id="@+id/my_item_text2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="可赚151元"
-        android:textColor="#fff02155"
-        android:textSize="10sp"
-        android:layout_below="@id/my_item_text"
-        android:layout_marginTop="3dp"
-        android:singleLine="true"
-        android:gravity="center"
-        />
-</RelativeLayout>
+            android:id="@+id/my_item_text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="可赚151元"
+            android:textColor="#fff02155"
+            android:textSize="10sp"
+            android:layout_below="@id/my_item_text"
+            android:layout_marginTop="3dp"
+            android:singleLine="true"
+            android:gravity="center"
+    />
+</LinearLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:orientation="vertical">
@@ -31,9 +31,11 @@
                 android:id="@+id/cl_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:foreground="@drawable/selector_forground_rect_white"
+                tools:ignore="UnusedAttribute"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
+                app:layout_constraintEnd_toEndOf="parent" >
 
             <ImageView
                     android:id="@+id/iv_msg"
@@ -94,6 +96,8 @@
                 android:id="@+id/cl_scan"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:foreground="@drawable/selector_forground_rect_white"
+                tools:ignore="UnusedAttribute"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent">
@@ -142,6 +146,8 @@
                 android:id="@+id/cl_download"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:foreground="@drawable/selector_forground_rect_white"
+                tools:ignore="UnusedAttribute"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent">

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

@@ -61,6 +61,7 @@
             style="@style/nomal_txt_style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textStyle="bold"
             android:ellipsize="end"
             android:maxLines="2"
             android:text="完成试玩无敌大航" />
@@ -68,6 +69,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 

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

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_navigationBar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="@color/white">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/layout_navigationBar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/white">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
+        android:foreground="@drawable/selector_forground_circle_white"
+        tools:ignore="UnusedAttribute"
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
@@ -76,6 +78,8 @@
             android:layout_height="@dimen/app_nav_toolbar_height"
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
+            android:foreground="@drawable/selector_forground_circle_white"
+            tools:ignore="UnusedAttribute"
             android:background="@color/translate"
             android:gravity="center_vertical|end"
             android:lines="1"
@@ -89,6 +93,8 @@
             android:layout_width="6dp"
             android:layout_height="6dp"
             android:layout_alignParentRight="true"
+            android:foreground="@drawable/selector_forground_circle_white"
+            tools:ignore="UnusedAttribute"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
             android:src="@drawable/sp_dot_red"
@@ -99,6 +105,8 @@
         android:id="@+id/ibtn_baseactivity_right"
         android:layout_width="?attr/actionBarSize"
         android:layout_height="match_parent"
+        android:foreground="@drawable/selector_forground_circle_white"
+        tools:ignore="UnusedAttribute"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:background="@color/translate"
@@ -112,6 +120,8 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:foreground="@drawable/selector_forground_circle_white"
+        tools:ignore="UnusedAttribute"
         android:layout_marginEnd="40dp"
         android:background="@color/translate"
         android:gravity="center"
@@ -126,6 +136,8 @@
         android:gravity="center"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
+        android:foreground="@drawable/selector_forground_circle_white"
+        tools:ignore="UnusedAttribute"
         android:text="发表"
         android:visibility="gone"
         android:textColor="#ff2ebef2"

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

@@ -160,6 +160,8 @@
             </LinearLayout>
         </LinearLayout>
 
+        <View style="@style/style_item_line_3_0" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -327,6 +327,7 @@
         <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:orientation">horizontal</item>
         <item name="android:paddingBottom">@dimen/content_padding_16</item>
         <item name="android:paddingEnd">@dimen/content_padding_30</item>
@@ -364,6 +365,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1px</item>
         <item name="android:layout_marginStart">20dp</item>
+        <item name="android:layout_marginEnd">20dp</item>
         <item name="android:background">@color/white_bg_line</item>
     </style>