diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
index d056579c1..b1d7ff1d1 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
@@ -1,6 +1,7 @@
 package com.shayu.onetoone.activity.fragments;
 
 
+import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -208,7 +209,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
 //                mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
             }
         });
-        loadData();
+        //loadData();
         initPeopleNum();
     }
 
@@ -221,9 +222,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
     @Override
     public void onResume() {
         super.onResume();
-//        if (isShowed() && mPaused) {
-//            loadData();
-//        }
+        loadData();
         mPaused = false;
     }
 
@@ -292,7 +291,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
      */
     private void initMenu(List<UserItemBean> list) {
         if (list != null && list.size() > 0) {
-            List<UserItemBean> listNow = new ArrayList<>();
+           /* List<UserItemBean> listNow = new ArrayList<>();
             for (UserItemBean userItemBean : list) {
                 if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
                     listNow.add(userItemBean);
@@ -301,13 +300,13 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
                 } else if (userItemBean.getId() == 13) {
                     beanStetting = userItemBean;
                 }
-            }
+            }*/
             if (mAdapter == null) {
-                mAdapter = new MainMeAdapter(mContext, listNow);
+                mAdapter = new MainMeAdapter(mContext, list);
                 mAdapter.setOnItemClickListener(this);
                 mRecyclerView.setAdapter(mAdapter);
             } else {
-                mAdapter.setList(listNow);
+                mAdapter.setList(list);
             }
         }
     }
@@ -339,6 +338,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
 
     private List<SlideBean> mBannerListNew = new ArrayList<>();
 
+    @SuppressLint("SetTextI18n")
     private void showData(UserBean u) {
         mBannerList.clear();
         mBannerListNew.clear();
@@ -374,9 +374,8 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
             } else {
                 singnature = "The guy was lazy and didn't write anything.";
             }
-
         }
-        signature.setText(singnature);
+        signature.setText(getResources().getString(R.string.user_sign) + ":" + singnature);
         CommonAppConfig appConfig = CommonAppConfig.getInstance();
         LevelBean anchorLevelBean = appConfig.getAnchorLevel(u.getLevelAnchor());
 
@@ -444,7 +443,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
         //修改靓号图标 个人中心
         if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
             good_nub_ico.setVisibility(View.VISIBLE);
-            mID.setText(" " + u.getGoodnum());
+            mID.setText("ID:" + u.getGoodnum());
         } else {
             good_nub_ico.setVisibility(View.GONE);
             mID.setText(u.getLiangNameTip());
@@ -472,6 +471,12 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
     public void onItemClick(UserItemBean bean, int position) {
         if (!StringUtil.isEmpty(bean.getHref())) {
             RouteManager.forwardWebViewActivity(bean.getName(), bean.getHref());
+        } else {
+            switch (bean.getId()) {
+                case 13:
+                    forwardSetting();
+                    break;
+            }
         }
 
 
@@ -673,20 +678,19 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
     }
 
     void initPeopleNum() {
-        OTONetManager.getInstance(mContext)
-                .getPeopleNum(new com.yunbao.common.http.base.HttpCallback<PeopleNum>() {
-                    @Override
-                    public void onSuccess(PeopleNum data) {
-                        fansNum.setText(data.getFans() + "");
-                        followNum.setText(data.getFollow() + "");
-                        friendNum.setText(data.getFriend() + "");
-                    }
+        OTONetManager.getInstance(mContext).getPeopleNum(new com.yunbao.common.http.base.HttpCallback<PeopleNum>() {
+            @Override
+            public void onSuccess(PeopleNum data) {
+                fansNum.setText(data.getFans() + "");
+                followNum.setText(data.getFollow() + "");
+                friendNum.setText(data.getFriend() + "");
+            }
 
-                    @Override
-                    public void onError(String error) {
+            @Override
+            public void onError(String error) {
 
-                    }
-                });
+            }
+        });
     }
 }
 
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
index 697319053..70a526a0c 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
@@ -148,6 +148,7 @@ public class ChooseLabelActivity extends AbsOTOActivity {
         next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                RouteManager.forwardMainActivity();
                 finish();
             }
         });
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
index 9b0b3501b..87b314117 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
@@ -217,7 +217,7 @@ public class CompleteActivity extends AbsOTOActivity {
                     Toast.makeText(mContext, WordUtil.getNewString(R.string.gender_hint), Toast.LENGTH_SHORT).show();
                     return;
                 }
-                OTONetManager.getInstance(mContext).setInfo(avatarUrl, userNickName.getText().toString(), sex, year + "-" + month + "-" + day, new HttpCallback<HttpCallbackModel>() {
+                OTONetManager.getInstance(mContext).setInfo(avatarUrl, userNickName.getText().toString(), sex, year + "-" + (month + 1) + "-" + day, new HttpCallback<HttpCallbackModel>() {
                     @Override
                     public void onSuccess(HttpCallbackModel data) {
                         Toast.makeText(mContext, data.getMsg(), Toast.LENGTH_SHORT).show();
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
index 440236fa5..b133dcc36 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
@@ -63,7 +63,7 @@ public class AuthActivity extends AbsActivity {
 
     @Override
     protected void main() {
-        setTitle(mContext.getString(R.string.edit_profile));
+        setTitle("真人认证");
         image1 = findViewById(R.id.image1);
         image11 = findViewById(R.id.image11);
         image2 = findViewById(R.id.image2);
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java
index 4ce09f365..5e38048dd 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java
@@ -310,7 +310,7 @@ public class AuthBloggerActivity extends AbsActivity {
         }
     }
 
-    @Override
+   /* @Override
     public void onBackPressed() {
         if (userModel.getUserInfoComplete() == 1) {
             finish();
@@ -327,7 +327,7 @@ public class AuthBloggerActivity extends AbsActivity {
                 }
             })).show();
         }
-    }
+    }*/
 
     public class ActiveAdapter extends RefreshAdapter<ImageBean> {
 
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java
index 0dff04211..7549b160e 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java
@@ -109,7 +109,7 @@ public class AuthBloggerInletActivity extends AbsActivity {
                     public void onSuccess(AuthBloggerBean data) {
                         authBloggerBean = data;
                         if (data.getStatus() == 2) {//已通过
-                            sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3));
+                            sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_4));
                             sageImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_suc));
                             sageStatus.setText(R.string.complete2);
                             sageStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3));
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
index 755688cfa..ed193f0bd 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
@@ -270,7 +270,7 @@ public class EditProfileActivity extends AbsActivity {
 
         } else if (i == R.id.btn_sex) {
 //            forwardSex();
-            new XPopup.Builder(mContext).asCustom(new UpdateSexPopup(mContext, userModel.getSex(), new UpdateSexPopup.UpdateSexCallBack() {
+            /*new XPopup.Builder(mContext).asCustom(new UpdateSexPopup(mContext, userModel.getSex(), new UpdateSexPopup.UpdateSexCallBack() {
                 @Override
                 public void onSex(int sex) {
                     userSex = sex;
@@ -291,7 +291,7 @@ public class EditProfileActivity extends AbsActivity {
                         }
                     });
                 }
-            })).show();
+            })).show();*/
         } else if (i == R.id.btn_city) {
             CountryPicker.newInstance(null, new OnPick() {
                 @Override
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
index 16aab8995..d58bc511d 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
@@ -214,7 +214,7 @@ public interface OneToOneApi {
 
 
     /**
-     * 设置基本信息
+     * 设置标签
      */
     @FormUrlEncoded
     @POST("/api/public/?service=Friendappinfos.setLabel")
diff --git a/OneToOne/src/main/res/layout/activity_auth.xml b/OneToOne/src/main/res/layout/activity_auth.xml
index fceb68de3..89b047856 100644
--- a/OneToOne/src/main/res/layout/activity_auth.xml
+++ b/OneToOne/src/main/res/layout/activity_auth.xml
@@ -7,124 +7,139 @@
 
     <include layout="@layout/view_title_custom" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:text="@string/layout_auth_tips1"
-        android:textColor="@color/black2"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:text="@string/layout_auth_tips2"
-        android:textColor="@color/text_gray"
-        android:textSize="14sp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"
-        android:text="@string/layout_auth_tips3"
-        android:textColor="@color/black2"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:layout_marginLeft="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="40dp">
+        android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/image1"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/auth_add_bg" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/image11"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_gravity="center"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/auth_add_img" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/layout_auth_tips1"
+                android:textColor="@color/black2"
+                android:textSize="18sp"
+                android:textStyle="bold" />
 
-    </RelativeLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/layout_auth_tips2"
+                android:textColor="@color/text_gray"
+                android:textSize="14sp" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="10dp"
-        android:text="@string/layout_auth_tips4"
-        android:textColor="@color/black2"
-        android:textSize="18sp"
-        android:textStyle="bold" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:text="@string/layout_auth_tips3"
+                android:textColor="@color/black2"
+                android:textSize="18sp"
+                android:textStyle="bold" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:layout_marginLeft="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="40dp">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="180dp"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="40dp">
 
-        <ImageView
-            android:id="@+id/image2"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/auth_add_bg" />
+                <ImageView
+                    android:id="@+id/image1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/auth_add_bg" />
 
-        <ImageView
-            android:id="@+id/image22"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_gravity="center"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/auth_add_img" />
+                <ImageView
+                    android:id="@+id/image11"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/auth_add_img" />
 
-    </RelativeLayout>
+            </RelativeLayout>
 
-    <TextView
-        android:id="@+id/remake"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="10dp"
-        android:text="@string/layout_auth_tips4"
-        android:textColor="@color/red"
-        android:textSize="14sp"
-        android:visibility="gone" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:text="@string/layout_auth_tips4"
+                android:textColor="@color/black2"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="180dp"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="40dp">
+
+                <ImageView
+                    android:id="@+id/image2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/auth_add_bg" />
+
+                <ImageView
+                    android:id="@+id/image22"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/auth_add_img" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/remake"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:text="@string/layout_auth_tips4"
+                android:textColor="@color/red"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/submit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="70dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="70dp"
+                android:background="@drawable/bg_auth_submit_1"
+                android:gravity="center"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:text="@string/layout_auth_tips5"
+                android:textColor="@color/black2"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+
+        </LinearLayout>
+
+    </ScrollView>
 
-    <TextView
-        android:id="@+id/submit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="70dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="70dp"
-        android:background="@drawable/bg_auth_submit_1"
-        android:gravity="center"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:text="@string/layout_auth_tips5"
-        android:textColor="@color/black2"
-        android:textSize="16sp"
-        android:textStyle="bold" />
 
 </LinearLayout>
 
diff --git a/OneToOne/src/main/res/layout/activity_auth_blogger.xml b/OneToOne/src/main/res/layout/activity_auth_blogger.xml
index 0d0adcaeb..a1c87d0f1 100644
--- a/OneToOne/src/main/res/layout/activity_auth_blogger.xml
+++ b/OneToOne/src/main/res/layout/activity_auth_blogger.xml
@@ -344,7 +344,7 @@
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
         android:text="@string/layout_auth_blogger_tips15"
-        android:textColor="@color/black2"
+        android:textColor="@color/white"
         android:textSize="16sp"
         android:textStyle="bold" />
 
diff --git a/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml b/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml
index 01ec94a47..1a736fff8 100644
--- a/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml
+++ b/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml
@@ -39,7 +39,7 @@
             android:layout_marginLeft="50dp"
             android:layout_marginTop="30dp"
             android:layout_marginRight="50dp"
-            android:background="@drawable/bg_auth_submit_1"
+            android:background="@drawable/bg_auth_submit_4"
             android:gravity="center">
 
             <TextView
@@ -53,21 +53,21 @@
                 android:id="@+id/personStatus"
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:src="@mipmap/icon_suc" />
+                android:src="@mipmap/icon_fail" />
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/personBt"
             android:layout_width="wrap_content"
-            android:layout_height="50dp"
+            android:layout_height="40dp"
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
-            android:background="@drawable/bg_auth_submit_3"
+            android:background="@drawable/bg_auth_submit_5"
             android:gravity="center"
             android:paddingLeft="40dp"
             android:paddingRight="40dp"
-            android:text="@string/layout_auth_blogger_inlet_tips4"
+            android:text="去上传"
             android:textColor="@color/white"
             android:textSize="18sp" />
 
@@ -100,14 +100,14 @@
         <TextView
             android:id="@+id/sageBt"
             android:layout_width="wrap_content"
-            android:layout_height="50dp"
+            android:layout_height="40dp"
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
             android:background="@drawable/bg_auth_submit_5"
             android:gravity="center"
             android:paddingLeft="40dp"
             android:paddingRight="40dp"
-            android:text="@string/layout_auth_blogger_inlet_tips6"
+            android:text="去上传"
             android:textColor="@color/white"
             android:textSize="18sp" />
 
diff --git a/OneToOne/src/main/res/layout/activity_complete.xml b/OneToOne/src/main/res/layout/activity_complete.xml
index a6291abe8..ba9e38f72 100644
--- a/OneToOne/src/main/res/layout/activity_complete.xml
+++ b/OneToOne/src/main/res/layout/activity_complete.xml
@@ -6,151 +6,161 @@
     android:background="@mipmap/bg_login"
     android:orientation="vertical">
 
-    <LinearLayout
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@mipmap/bg_w"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="120dp"
-            android:gravity="center"
-            android:text="@string/layout_complete_tip1"
-            android:textColor="#FFFFFF"
-            android:textSize="33sp"
-            android:textStyle="bold" />
-
-        <RelativeLayout
-            android:id="@+id/editHead"
-            android:layout_width="90dp"
-            android:layout_height="90dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="20dp">
-
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/userAvatar"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_centerHorizontal="true"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/icon_avatar_placeholder"
-                app:riv_oval="true" />
-
-            <TextView
-                android:id="@+id/text_choose"
-                android:layout_width="70dp"
-                android:layout_height="30dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:background="@drawable/background_8f7cdf"
-                android:gravity="center"
-                android:text="去选择"
-                android:textColor="#FFFFFF"
-                android:textSize="12sp" />
-
-        </RelativeLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="60dp"
-            android:text="@string/layout_complete_tip3"
-            android:textColor="#ff333333"
-            android:textSize="16sp" />
-
-        <EditText
-            android:id="@+id/userNickName"
-            android:layout_width="match_parent"
-            android:layout_height="47dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="30dp"
-            android:background="@mipmap/ws_ind"
-            android:gravity="center"
-            android:maxEms="15"
-            android:paddingBottom="5dp"
-            android:textColor="#999999"
-            android:textColorHint="#999999"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/layout_complete_tip4"
-            android:textColor="#ff333333"
-            android:textSize="16sp" />
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:background="@mipmap/bg_w"
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/user_sex_1"
-                android:layout_width="119dp"
-                android:layout_height="45dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="120dp"
+                android:gravity="center"
+                android:text="@string/layout_complete_tip1"
+                android:textColor="#FFFFFF"
+                android:textSize="33sp"
+                android:textStyle="bold" />
+
+            <RelativeLayout
+                android:id="@+id/editHead"
+                android:layout_width="90dp"
+                android:layout_height="90dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/userAvatar"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_centerHorizontal="true"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/icon_avatar_placeholder"
+                    app:riv_oval="true" />
+
+                <TextView
+                    android:id="@+id/text_choose"
+                    android:layout_width="70dp"
+                    android:layout_height="30dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:background="@drawable/background_8f7cdf"
+                    android:gravity="center"
+                    android:text="去选择"
+                    android:textColor="#FFFFFF"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="60dp"
+                android:text="@string/layout_complete_tip3"
+                android:textColor="#ff333333"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/userNickName"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
                 android:layout_marginLeft="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_weight="1"
-                android:background="@mipmap/icon_user_sex_00"
+                android:background="@mipmap/ws_ind"
+                android:ems="15"
                 android:gravity="center"
-                android:text="@string/layout_complete_tip5"
+                android:maxEms="15"
+                android:maxLength="15"
+                android:maxLines="1"
+                android:paddingBottom="5dp"
                 android:textColor="#999999"
                 android:textColorHint="#999999"
                 android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/user_sex_2"
-                android:layout_width="119dp"
-                android:layout_height="45dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/layout_complete_tip4"
+                android:textColor="#ff333333"
+                android:textSize="16sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/user_sex_1"
+                    android:layout_width="119dp"
+                    android:layout_height="45dp"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
+                    android:layout_weight="1"
+                    android:background="@mipmap/icon_user_sex_00"
+                    android:gravity="center"
+                    android:text="@string/layout_complete_tip5"
+                    android:textColor="#999999"
+                    android:textColorHint="#999999"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/user_sex_2"
+                    android:layout_width="119dp"
+                    android:layout_height="45dp"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
+                    android:layout_weight="1"
+                    android:background="@mipmap/icon_user_sex_00"
+                    android:gravity="center"
+                    android:text="@string/layout_complete_tip6"
+                    android:textColor="#999999"
+                    android:textColorHint="#999999"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/layout_complete_tip7"
+                android:textColor="#ff333333"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/userBirthday"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
                 android:layout_marginLeft="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_weight="1"
-                android:background="@mipmap/icon_user_sex_00"
+                android:background="@mipmap/ws_ind"
                 android:gravity="center"
-                android:text="@string/layout_complete_tip6"
+                android:paddingBottom="5dp"
                 android:textColor="#999999"
                 android:textColorHint="#999999"
                 android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/btn_register"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="30dp"
+                android:background="@drawable/background_8f7cdf"
+                android:gravity="center"
+                android:text="@string/layout_complete_tip8"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/layout_complete_tip7"
-            android:textColor="#ff333333"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/userBirthday"
-            android:layout_width="match_parent"
-            android:layout_height="47dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="30dp"
-            android:background="@mipmap/ws_ind"
-            android:gravity="center"
-            android:paddingBottom="5dp"
-            android:textColor="#999999"
-            android:textColorHint="#999999"
-            android:textSize="14sp" />
-
-        <Button
-            android:id="@+id/btn_register"
-            android:layout_width="match_parent"
-            android:layout_height="47dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginTop="30dp"
-            android:layout_marginRight="30dp"
-            android:background="@drawable/background_8f7cdf"
-            android:gravity="center"
-            android:text="@string/layout_complete_tip8"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </LinearLayout>
+    </ScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_my_follow.xml b/OneToOne/src/main/res/layout/activity_my_follow.xml
index 00a4ce166..cd8a83610 100644
--- a/OneToOne/src/main/res/layout/activity_my_follow.xml
+++ b/OneToOne/src/main/res/layout/activity_my_follow.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="#F5F6F7"
+    android:layout_height="match_parent">
+
     <include
         android:id="@+id/include"
-        layout="@layout/view_activity_title"
+        layout="@layout/view_title_custom"
         android:layout_width="match_parent"
         android:layout_height="71dp"
-        android:layout_marginTop="@dimen/activity_top"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/OneToOne/src/main/res/layout/activity_setting.xml b/OneToOne/src/main/res/layout/activity_setting.xml
index ea75a79a3..deb716878 100644
--- a/OneToOne/src/main/res/layout/activity_setting.xml
+++ b/OneToOne/src/main/res/layout/activity_setting.xml
@@ -269,6 +269,34 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="15.33dp"
+                    android:paddingBottom="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="25dp"
+                        android:text="@string/layout_setting_tip14"
+                        android:textColor="#1E1F20"
+                        android:textSize="16sp" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:layout_width="17dp"
+                        android:layout_height="30dp"
+                        android:layout_marginEnd="26.33dp"
+                        android:src="@mipmap/icon_arrow_right" />
+
+                </LinearLayout>
+
                 <LinearLayout
                     android:id="@+id/clearCaChe"
                     android:layout_width="match_parent"
diff --git a/OneToOne/src/main/res/layout/activity_webview.xml b/OneToOne/src/main/res/layout/activity_webview.xml
index fcfdb32b0..969c974c0 100644
--- a/OneToOne/src/main/res/layout/activity_webview.xml
+++ b/OneToOne/src/main/res/layout/activity_webview.xml
@@ -24,7 +24,7 @@
             android:layout_height="match_parent">
 
             <TextView
-                android:id="@+id/titleView"
+                android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_centerHorizontal="true"
diff --git a/OneToOne/src/main/res/layout/fragment_my.xml b/OneToOne/src/main/res/layout/fragment_my.xml
index 92ca73775..6d8746c5a 100644
--- a/OneToOne/src/main/res/layout/fragment_my.xml
+++ b/OneToOne/src/main/res/layout/fragment_my.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/gray2"
     android:orientation="vertical"
     android:paddingBottom="10dp">
@@ -39,14 +39,13 @@
                     <LinearLayout
                         android:id="@+id/lt_me_top"
                         android:layout_width="match_parent"
-                        android:layout_height="144dp"
+                        android:layout_height="120dp"
                         android:layout_marginTop="42dp"
                         android:orientation="horizontal">
 
                         <RelativeLayout
                             android:layout_width="114dp"
                             android:layout_height="match_parent"
-                            android:layout_marginRight="18dp"
                             android:gravity="center|right">
 
                             <com.makeramen.roundedimageview.RoundedImageView
@@ -74,9 +73,10 @@
                                 android:id="@+id/sex"
                                 android:layout_width="28dp"
                                 android:layout_height="28dp"
-                                android:layout_alignParentBottom="true"
-                                android:layout_marginBottom="20dp"
                                 android:layout_alignParentRight="true"
+                                android:layout_alignParentBottom="true"
+                                android:layout_marginRight="5dp"
+                                android:layout_marginBottom="25dp"
                                 app:srcCompat="@mipmap/ic_message_tab_man" />
 
                         </RelativeLayout>
@@ -92,6 +92,7 @@
                                 android:layout_height="7dp"
                                 android:layout_marginStart="115.9dp"
                                 android:layout_marginEnd="4dp"
+                                android:visibility="invisible"
                                 app:cardBackgroundColor="#FF5730"
                                 app:cardCornerRadius="20dp" />
 
@@ -101,8 +102,8 @@
                                 android:layout_height="25.25dp"
                                 android:layout_marginStart="21dp"
                                 android:layout_marginTop="-5dp"
-                                android:visibility="gone"
-                                android:background="@mipmap/icon_complete_information">
+                                android:background="@mipmap/icon_complete_information"
+                                android:visibility="gone">
 
                                 <TextView
                                     android:layout_width="match_parent"
@@ -117,8 +118,7 @@
                                 android:id="@+id/lt_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
-                                android:layout_marginTop="8dp"
+                                android:layout_marginTop="12dp"
                                 android:gravity="center"
                                 android:orientation="horizontal">
 
@@ -126,6 +126,8 @@
                                     android:id="@+id/name"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLength="8"
                                     android:text="@string/layout_f_my_tips1"
                                     android:textColor="#D56FF0"
                                     android:textSize="19sp"
@@ -137,22 +139,21 @@
                                 android:id="@+id/signature"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
-                                android:layout_marginTop="6dp"
+                                android:layout_marginTop="3dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="@string/layout_f_my_tips2"
                                 android:textColor="@color/gray_cccccc"
                                 android:textSize="12sp" />
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
                                     android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="21dp"
+                                    android:layout_height="28dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
 
@@ -166,7 +167,8 @@
                                     <ImageView
                                         android:layout_width="30dp"
                                         android:layout_height="15dp"
-                                        android:src="@mipmap/icon_userid" />
+                                        android:src="@mipmap/icon_userid"
+                                        android:visibility="gone" />
 
                                     <TextView
                                         android:id="@+id/id_val"
@@ -190,7 +192,7 @@
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="48dp"
+                                    android:layout_height="28dp"
                                     android:layout_marginLeft="15dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
@@ -233,7 +235,6 @@
                                 </LinearLayout>
 
 
-
                             </LinearLayout>
 
                         </LinearLayout>
@@ -246,85 +247,100 @@
                             android:src="@mipmap/home_btn_edit" />
 
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/lt_friend_layout"
-                        android:layout_below="@id/lt_me_top"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_below="@id/lt_me_top"
                         android:layout_marginLeft="15dp"
                         android:layout_marginRight="15dp"
                         android:layout_weight="1"
                         android:orientation="horizontal">
-                    <LinearLayout
-                        android:id="@+id/friend_layout"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:orientation="vertical"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:id="@+id/friend"
-                            tools:text="1"
-                            android:textStyle="bold"
-                            android:textSize="20sp"
-                            android:textColor="#000"
-                            android:layout_gravity="center"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-                        <TextView
-                            android:text="@string/activity_my_friend_friend"
-                            android:layout_gravity="center"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/friend_layout"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/friend"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:textColor="#000"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                tools:text="1" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/activity_my_friend_friend"
+                                android:textSize="12sp" />
+
+                        </LinearLayout>
+
                         <LinearLayout
                             android:id="@+id/follow_layout"
-                            android:layout_weight="1"
                             android:layout_width="0dp"
-                            android:orientation="vertical"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
                             <TextView
                                 android:id="@+id/follow"
-                                tools:text="1"
-                                android:textStyle="bold"
-                                android:textSize="20sp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
                                 android:textColor="#000"
-                                android:layout_gravity="center"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                tools:text="1" />
+
                             <TextView
-                                android:text="@string/activity_my_friend_follow"
-                                android:layout_gravity="center"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/activity_my_friend_follow"
+                                android:textSize="12sp" />
                         </LinearLayout>
+
                         <LinearLayout
                             android:id="@+id/fans_layout"
-                            android:layout_weight="1"
                             android:layout_width="0dp"
-                            android:orientation="vertical"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
                             <TextView
                                 android:id="@+id/fans"
-                                tools:text="1"
-                                android:textStyle="bold"
-                                android:textSize="20sp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
                                 android:textColor="#000"
-                                android:layout_gravity="center"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                tools:text="1" />
+
                             <TextView
-                                android:text="@string/activity_my_friend_fans"
-                                android:layout_gravity="center"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/activity_my_friend_fans"
+                                android:textSize="12sp" />
                         </LinearLayout>
                     </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_below="@id/lt_friend_layout"
                         android:layout_height="114dp"
+                        android:layout_below="@id/lt_friend_layout"
                         android:layout_marginLeft="15dp"
+                        android:layout_marginTop="20dp"
                         android:layout_marginRight="15dp"
                         android:background="@drawable/bg_me_data"
                         android:orientation="vertical">
@@ -352,9 +368,9 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
-                                        android:src="@mipmap/home_me_diamonds" />
+                                        android:layout_width="30dp"
+                                        android:layout_height="30dp"
+                                        android:src="@mipmap/icon_coin_02" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
@@ -398,9 +414,9 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
-                                        android:src="@mipmap/icon_collectibles" />
+                                        android:layout_width="30dp"
+                                        android:layout_height="30dp"
+                                        android:src="@mipmap/icon_coin_01" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
@@ -445,9 +461,9 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
-                                        android:src="@mipmap/home_me_gold" />
+                                        android:layout_width="30dp"
+                                        android:layout_height="30dp"
+                                        android:src="@mipmap/icon_coin_03" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
@@ -583,10 +599,10 @@
                     android:background="@drawable/bg_me_data"
                     android:clickable="true"
                     android:focusable="true"
-                    android:visibility="gone"
                     android:focusableInTouchMode="true"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -737,7 +753,8 @@
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:orientation="vertical"
+                        android:visibility="gone">
 
                         <RelativeLayout
                             android:id="@+id/rt_setting"
diff --git a/OneToOne/src/main/res/layout/view_title_custom.xml b/OneToOne/src/main/res/layout/view_title_custom.xml
index fc1aa696d..c28319ab6 100644
--- a/OneToOne/src/main/res/layout/view_title_custom.xml
+++ b/OneToOne/src/main/res/layout/view_title_custom.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:id="@+id/titleView"
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_centerHorizontal="true"
diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png
new file mode 100644
index 000000000..30b877d98
Binary files /dev/null and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png differ
diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png
new file mode 100644
index 000000000..7e3778ebc
Binary files /dev/null and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png differ
diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png
new file mode 100644
index 000000000..d4f239f5a
Binary files /dev/null and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png differ
diff --git a/OneToOne/src/main/res/values-zh-rHK/strings.xml b/OneToOne/src/main/res/values-zh-rHK/strings.xml
index 6fbeeb10e..c24b922f6 100644
--- a/OneToOne/src/main/res/values-zh-rHK/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rHK/strings.xml
@@ -70,7 +70,7 @@
     <string name="dialog_normal_title">首次匹配成功獎勵</string>
     <string name="dialog_normal_content">恭喜獲得</string>
     <string name="title_greet_config">打招呼設置</string>
-    <string name="title_audit_config">審核中，請耐心等待</string>
+    <string name="title_audit_config">審核中，請耐心等待审核通过</string>
     <string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
     <string name="title_audit_config3">審核失敗，去提交</string>
     <string name="title_audit_config4">審核中</string>
@@ -202,6 +202,7 @@
     <string name="layout_setting_tip11">版本號</string>
     <string name="layout_setting_tip12">檢查新版本</string>
     <string name="layout_setting_tip13">退出</string>
+    <string name="layout_setting_tip14">用戶協議</string>
 
     <string name="layout_choose_label_adapter_tip1">我的標籤</string>
 
diff --git a/OneToOne/src/main/res/values-zh-rTW/strings.xml b/OneToOne/src/main/res/values-zh-rTW/strings.xml
index 6fbeeb10e..c24b922f6 100644
--- a/OneToOne/src/main/res/values-zh-rTW/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rTW/strings.xml
@@ -70,7 +70,7 @@
     <string name="dialog_normal_title">首次匹配成功獎勵</string>
     <string name="dialog_normal_content">恭喜獲得</string>
     <string name="title_greet_config">打招呼設置</string>
-    <string name="title_audit_config">審核中，請耐心等待</string>
+    <string name="title_audit_config">審核中，請耐心等待审核通过</string>
     <string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
     <string name="title_audit_config3">審核失敗，去提交</string>
     <string name="title_audit_config4">審核中</string>
@@ -202,6 +202,7 @@
     <string name="layout_setting_tip11">版本號</string>
     <string name="layout_setting_tip12">檢查新版本</string>
     <string name="layout_setting_tip13">退出</string>
+    <string name="layout_setting_tip14">用戶協議</string>
 
     <string name="layout_choose_label_adapter_tip1">我的標籤</string>
 
diff --git a/OneToOne/src/main/res/values/strings.xml b/OneToOne/src/main/res/values/strings.xml
index fb13bf9eb..118b60b0b 100644
--- a/OneToOne/src/main/res/values/strings.xml
+++ b/OneToOne/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
     <string name="dialog_normal_title">首次匹配成功奖励</string>
     <string name="dialog_normal_content">恭喜获得</string>
     <string name="title_greet_config">打招呼設置</string>
-    <string name="title_audit_config">審核中，請耐心等待</string>
+    <string name="title_audit_config">審核中，請耐心等待审核通过</string>
     <string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
     <string name="title_audit_config3">審核失敗，去提交</string>
     <string name="title_audit_config4">審核中</string>
@@ -113,6 +113,8 @@
     <string name="layout_auth_tips4">身份證背面</string>
     <string name="layout_auth_tips5">發起審核</string>
 
+
+
     <string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
     <string name="layout_auth_blogger_tips2">性别</string>
     <string name="layout_auth_blogger_tips3">男</string>
@@ -204,6 +206,7 @@
     <string name="layout_setting_tip11">版本號</string>
     <string name="layout_setting_tip12">檢查新版本</string>
     <string name="layout_setting_tip13">退出</string>
+    <string name="layout_setting_tip14">用戶協議</string>
 
     <string name="layout_choose_label_adapter_tip1">我的标签</string>