diff --git a/.gitignore b/.gitignore
index edcd6a0c2..e45f11744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ local.properties
 /live/build/
 /main/build/
 /video/build/
+/tmp/full-r8-config.txt
\ No newline at end of file
diff --git a/common/src/main/res/layout/activity_user_home.xml b/common/src/main/res/layout/activity_user_home.xml
index 1f483e26f..9c4ab697f 100644
--- a/common/src/main/res/layout/activity_user_home.xml
+++ b/common/src/main/res/layout/activity_user_home.xml
@@ -115,7 +115,7 @@
                                     android:layout_alignParentBottom="true"
                                     android:layout_centerHorizontal="true"
                                     android:layout_marginBottom="2dp"
-                                    android:src="@mipmap/icon_liveing_cn"
+                                    android:src="@mipmap/icon_liveing"
                                     android:visibility="gone" />
 
                             </RelativeLayout>
diff --git a/common/src/main/res/mipmap-mdpi/icon_liveing_cn.gif b/common/src/main/res/mipmap-mdpi/icon_liveing_cn.gif
deleted file mode 100644
index dee8de098..000000000
Binary files a/common/src/main/res/mipmap-mdpi/icon_liveing_cn.gif and /dev/null differ
diff --git a/common/src/main/res/mipmap-mdpi/icon_liveing_en.gif b/common/src/main/res/mipmap-mdpi/icon_liveing_en.gif
deleted file mode 100644
index c1cd884ca..000000000
Binary files a/common/src/main/res/mipmap-mdpi/icon_liveing_en.gif and /dev/null differ
diff --git a/main/src/main/res/layout/activity_edit_profile.xml b/main/src/main/res/layout/activity_edit_profile.xml
index 638620b74..f7672ec36 100644
--- a/main/src/main/res/layout/activity_edit_profile.xml
+++ b/main/src/main/res/layout/activity_edit_profile.xml
@@ -7,13 +7,15 @@
     android:orientation="vertical">
 
     <ScrollView
+        android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <include layout="@layout/view_title_not_color" />
 
             <RelativeLayout
@@ -26,11 +28,10 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_avatar"
                     android:text="@string/edit_profile_avatar"
                     android:textColor="@color/textColor"
                     android:textSize="14sp"
-                    />
+                    app:drawableLeftCompat="@mipmap/ic_edit_avatar" />
 
 
                 <com.makeramen.roundedimageview.RoundedImageView
@@ -64,14 +65,14 @@
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_nickname"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_name" />
 
                 <TextView
                     android:id="@+id/name"
@@ -111,11 +112,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="@string/edit_profile_sign"
                     android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_sign"
+                    android:text="@string/edit_profile_sign"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_sign" />
 
                 <TextView
                     android:id="@+id/sign"
@@ -152,14 +153,14 @@
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_birthday"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_birthday"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_birthday" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -201,19 +202,19 @@
 
             <RelativeLayout
                 android:id="@+id/btn_sex"
-                android:visibility="gone"
                 style="@style/edit_profile_group_not_color"
-                android:onClick="editProfileClick">
+                android:onClick="editProfileClick"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_sex"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_sex"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_sex" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -257,14 +258,14 @@
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_city"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_city"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_city" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -310,14 +311,14 @@
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_phone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/bind_phone"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_phone" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -363,24 +364,24 @@
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_occupation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_occupation"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_occupation" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="44dp"
                     android:layout_marginTop="10dp"
-                    android:visibility="gone"
                     android:text="*"
                     android:textColor="#FF5730"
-                    android:textSize="9sp" />
+                    android:textSize="9sp"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/occupation"
@@ -409,20 +410,21 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
                 android:visibility="gone" />
+
             <RelativeLayout
                 android:id="@+id/btn_height"
                 style="@style/edit_profile_group_not_color"
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_height"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_height"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_height" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -430,9 +432,9 @@
                     android:layout_marginStart="44dp"
                     android:layout_marginTop="10dp"
                     android:text="*"
-                    android:visibility="gone"
                     android:textColor="#FF5730"
-                    android:textSize="9sp" />
+                    android:textSize="9sp"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/height"
@@ -461,30 +463,31 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
                 android:visibility="gone" />
+
             <RelativeLayout
                 android:id="@+id/btn_hobby"
                 style="@style/edit_profile_group_not_color"
                 android:onClick="editProfileClick">
 
                 <TextView
-                    android:drawablePadding="10dp"
-                    app:drawableLeftCompat="@mipmap/ic_edit_hobby"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
                     android:text="@string/edit_profile_hobby"
                     android:textColor="@color/textColor"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_hobby" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="44dp"
-                    android:visibility="gone"
                     android:layout_marginTop="10dp"
                     android:text="*"
                     android:textColor="#FF5730"
-                    android:textSize="9sp" />
+                    android:textSize="9sp"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/hobby"
@@ -519,254 +522,254 @@
                 android:layout_height="0dp"
                 android:layout_weight="1" />
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="213.5dp"
-                android:layout_gravity="bottom"
-                android:background="@mipmap/bg_gift_completely"
-                android:orientation="vertical"
-                android:visibility="visible">
 
-                <LinearLayout
-                    android:id="@+id/complete_information_top"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="14.5dp"
-                    android:layout_marginTop="24.5dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/complete_information"
-                        android:textColor="#333333"
-                        android:textSize="15sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="7dp"
-                        android:text="@string/complete_information_consumable"
-                        android:textColor="#999999"
-                        android:textSize="13sp" />
-                </LinearLayout>
-
-                <FrameLayout
-                    android:id="@+id/complete_information_top2"
-                    android:layout_width="230dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/complete_information_top"
-                    android:layout_marginStart="14.5dp"
-                    android:layout_marginTop="10.9dp">
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="4dp"
-                        android:layout_gravity="center_vertical">
-
-                        <View
-                            android:id="@+id/view_progress1"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginStart="7dp"
-                            android:layout_marginEnd="1dp"
-                            android:layout_weight="1"
-                            android:background="#FFE5D0" />
-
-                        <View
-                            android:id="@+id/view_progress2"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:background="#FFE5D0" />
-
-                        <View
-                            android:id="@+id/view_progress3"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginEnd="12dp"
-                            android:layout_weight="1"
-                            android:background="#FFE5D0" />
-
-
-                    </LinearLayout>
-
-                    <FrameLayout
-                        android:id="@+id/complete_information"
-                        android:layout_width="15.5dp"
-                        android:layout_height="15.5dp"
-                        android:background="@mipmap/bg_complete_information_progress2">
-
-                        <TextView
-                            android:id="@+id/information"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="1"
-                            android:textColor="@color/white"
-                            android:textSize="7.99sp" />
-                    </FrameLayout>
-
-                    <FrameLayout
-                        android:id="@+id/complete_information1"
-                        android:layout_width="15.5dp"
-                        android:layout_height="15.5dp"
-                        android:layout_marginStart="70dp"
-                        android:background="@mipmap/bg_complete_information_progress">
-
-                        <TextView
-                            android:id="@+id/information1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="2"
-                            android:textColor="@color/white"
-                            android:textSize="7.99sp" />
-
-                    </FrameLayout>
-
-                    <FrameLayout
-                        android:id="@+id/complete_information2"
-                        android:layout_width="15.5dp"
-                        android:layout_height="15.5dp"
-                        android:layout_marginStart="140dp"
-                        android:background="@mipmap/bg_complete_information_progress">
-
-                        <TextView
-                            android:id="@+id/information2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="3"
-                            android:textColor="@color/white"
-                            android:textSize="7.99sp" />
-                    </FrameLayout>
-
-                    <FrameLayout
-                        android:id="@+id/complete_information3"
-                        android:layout_width="15.5dp"
-                        android:layout_height="15.5dp"
-                        android:layout_marginStart="215dp"
-                        android:background="@mipmap/bg_complete_information_progress">
-
-                        <TextView
-                            android:id="@+id/information3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="4"
-                            android:textColor="@color/white"
-                            android:textSize="7.99sp" />
-                    </FrameLayout>
-                </FrameLayout>
-
-                <androidx.cardview.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginTop="81.5dp"
-                    android:layout_marginEnd="15dp"
-                    android:layout_marginBottom="20dp"
-                    app:cardBackgroundColor="#FDF3EB"
-                    app:cardCornerRadius="8dp"
-                    app:cardElevation="0dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-                            <!--头像 金豆 勋章-->
-                            <ImageView
-                                android:layout_width="49dp"
-                                android:layout_height="49dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="16dp"
-                                android:src="@mipmap/icon_profile_photo" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="7.5dp"
-                                android:gravity="center"
-                                android:text="@string/love_powder"
-                                android:textColor="#C7683C"
-                                android:textSize="10sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <ImageView
-                                android:layout_width="49dp"
-                                android:layout_height="49dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="16dp"
-                                android:src="@mipmap/icon_golden_bean" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="7.5dp"
-                                android:gravity="center"
-                                android:text="@string/golden_beans_128"
-                                android:textColor="#C7683C"
-                                android:textSize="10sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <ImageView
-                                android:layout_width="49dp"
-                                android:layout_height="49dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="16dp"
-                                android:src="@mipmap/icon_medal" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="7.5dp"
-                                android:gravity="center"
-                                android:text="@string/love_powder_medal"
-                                android:textColor="#C7683C"
-                                android:textSize="10sp" />
-                        </LinearLayout>
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <TextView
-                    android:id="@+id/submit"
-                    android:layout_width="64dp"
-                    android:layout_height="25.5dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="32dp"
-                    android:layout_marginEnd="8.5dp"
-                    android:background="@mipmap/bg_submit"
-                    android:gravity="center"
-                    android:text="@string/to_complete"
-                    android:textColor="@color/white"
-                    android:textSize="12.44sp" />
-
-            </RelativeLayout>
         </LinearLayout>
     </ScrollView>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="213.5dp"
+        android:layout_gravity="bottom"
+        android:background="@mipmap/bg_gift_completely"
+        android:orientation="vertical"
+        android:visibility="visible">
 
+        <LinearLayout
+            android:id="@+id/complete_information_top"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="14.5dp"
+            android:layout_marginTop="24.5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/complete_information"
+                android:textColor="#333333"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="7dp"
+                android:text="@string/complete_information_consumable"
+                android:textColor="#999999"
+                android:textSize="13sp" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/complete_information_top2"
+            android:layout_width="230dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/complete_information_top"
+            android:layout_marginStart="14.5dp"
+            android:layout_marginTop="10.9dp">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:layout_gravity="center_vertical">
+
+                <View
+                    android:id="@+id/view_progress1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="7dp"
+                    android:layout_marginEnd="1dp"
+                    android:layout_weight="1"
+                    android:background="#FFE5D0" />
+
+                <View
+                    android:id="@+id/view_progress2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
+                    android:layout_weight="1"
+                    android:background="#FFE5D0" />
+
+                <View
+                    android:id="@+id/view_progress3"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="12dp"
+                    android:layout_weight="1"
+                    android:background="#FFE5D0" />
+
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/complete_information"
+                android:layout_width="15.5dp"
+                android:layout_height="15.5dp"
+                android:background="@mipmap/bg_complete_information_progress2">
+
+                <TextView
+                    android:id="@+id/information"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="1"
+                    android:textColor="@color/white"
+                    android:textSize="7.99sp" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/complete_information1"
+                android:layout_width="15.5dp"
+                android:layout_height="15.5dp"
+                android:layout_marginStart="70dp"
+                android:background="@mipmap/bg_complete_information_progress">
+
+                <TextView
+                    android:id="@+id/information1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="2"
+                    android:textColor="@color/white"
+                    android:textSize="7.99sp" />
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/complete_information2"
+                android:layout_width="15.5dp"
+                android:layout_height="15.5dp"
+                android:layout_marginStart="140dp"
+                android:background="@mipmap/bg_complete_information_progress">
+
+                <TextView
+                    android:id="@+id/information2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="3"
+                    android:textColor="@color/white"
+                    android:textSize="7.99sp" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/complete_information3"
+                android:layout_width="15.5dp"
+                android:layout_height="15.5dp"
+                android:layout_marginStart="215dp"
+                android:background="@mipmap/bg_complete_information_progress">
+
+                <TextView
+                    android:id="@+id/information3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="4"
+                    android:textColor="@color/white"
+                    android:textSize="7.99sp" />
+            </FrameLayout>
+        </FrameLayout>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="81.5dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            app:cardBackgroundColor="#FDF3EB"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+                    <!--头像 金豆 勋章-->
+                    <ImageView
+                        android:layout_width="49dp"
+                        android:layout_height="49dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="16dp"
+                        android:src="@mipmap/icon_profile_photo" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="7.5dp"
+                        android:gravity="center"
+                        android:text="@string/love_powder"
+                        android:textColor="#C7683C"
+                        android:textSize="10sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="49dp"
+                        android:layout_height="49dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="16dp"
+                        android:src="@mipmap/icon_golden_bean" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="7.5dp"
+                        android:gravity="center"
+                        android:text="@string/golden_beans_128"
+                        android:textColor="#C7683C"
+                        android:textSize="10sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="49dp"
+                        android:layout_height="49dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="16dp"
+                        android:src="@mipmap/icon_medal" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="7.5dp"
+                        android:gravity="center"
+                        android:text="@string/love_powder_medal"
+                        android:textColor="#C7683C"
+                        android:textSize="10sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <TextView
+            android:id="@+id/submit"
+            android:layout_width="64dp"
+            android:layout_height="25.5dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="8.5dp"
+            android:background="@mipmap/bg_submit"
+            android:gravity="center"
+            android:text="@string/to_complete"
+            android:textColor="@color/white"
+            android:textSize="12.44sp" />
+
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_msg_chat_title.xml b/main/src/main/res/layout/view_msg_chat_title.xml
index 78203bb7e..b461aa83f 100644
--- a/main/src/main/res/layout/view_msg_chat_title.xml
+++ b/main/src/main/res/layout/view_msg_chat_title.xml
@@ -65,7 +65,7 @@
 
         <ImageView
             android:id="@+id/imageView"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -78,9 +78,9 @@
             android:layout_width="94dp"
             android:layout_height="94dp"
             android:layout_marginTop="40dp"
-            android:layout_marginEnd="40dp"
+            android:layout_marginEnd="25dp"
             android:background="@mipmap/bg_msg_chat_title_avater"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/imageView"
             app:layout_constraintTop_toTopOf="parent">
 
             <com.yunbao.common.views.weight.ClipPathCircleImage
@@ -99,7 +99,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
                 android:layout_marginTop="-10dp"
-                android:src="@mipmap/icon_liveing_cn"
+                android:src="@mipmap/icon_liveing"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -110,12 +110,12 @@
             android:id="@+id/userName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="25dp"
             android:layout_marginTop="60dp"
             android:text="TextView"
             android:textColor="#333333"
             android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/imageView"
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
@@ -143,13 +143,7 @@
                 android:layout_marginStart="5dp"
                 android:src="@mipmap/icon_green" />
 
-            <ImageView
-                android:id="@+id/user_auth_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:srcCompat="@mipmap/ic_chat_auth"
-                tools:layout_editor_absoluteX="124dp"
-                tools:layout_editor_absoluteY="17dp" />
+
         </LinearLayout>
 
         <TextView
@@ -163,14 +157,30 @@
             app:layout_constraintStart_toStartOf="@+id/userName"
             app:layout_constraintTop_toBottomOf="@+id/userName" />
 
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginStart="4dp"
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@+id/info"
             app:layout_constraintStart_toEndOf="@+id/info"
-            app:layout_constraintTop_toTopOf="@+id/info"
-            app:srcCompat="@mipmap/bg_msg_chat_title_gift" />
+            app:layout_constraintTop_toTopOf="@+id/info">
+
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="4dp"
+                app:srcCompat="@mipmap/bg_msg_chat_title_gift" />
+            <ImageView
+                android:id="@+id/user_auth_status"
+                android:layout_width="84dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="5dp"
+                android:scaleType="fitStart"
+                app:srcCompat="@mipmap/ic_chat_auth"
+                tools:layout_editor_absoluteX="124dp"
+                tools:layout_editor_absoluteY="17dp" />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/sign"
@@ -179,6 +189,7 @@
             android:layout_marginTop="10dp"
             android:text="个性签名给性签名个性签名给性签名个性签名给性签名"
             android:textColor="#333333"
+            android:maxLines="2"
             android:textSize="13sp"
             app:layout_constraintEnd_toStartOf="@+id/constraintLayout6"
             app:layout_constraintStart_toStartOf="@+id/info"
@@ -211,14 +222,14 @@
             android:id="@+id/avatar_list"
             android:layout_width="0dp"
             android:layout_height="75dp"
-            android:layout_marginStart="50dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="30dp"
             android:layout_marginBottom="60dp"
             android:orientation="horizontal"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/imageView"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/imageView"
             tools:itemCount="9"
             tools:listitem="@layout/view_msg_chat_top_image" />
 
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 177d88dd0..8bf02cd12 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="activity_msg_addressbook_tab_fan">Fan</string>
     <string name="activity_msg_addressbook_tab_fan2">Return</string>
     <string name="activity_msg_addressbook_tab_mutual">Mutual</string>
-    <string name="activity_msg_chat_top_tip1">Accompany them with gifts~</string>
+    <string name="activity_msg_chat_top_tip1">Let\'s chat!</string>
     <string name="dialog_msg_m_config">Message Settings</string>
     <string name="dialog_msg_status_config">Order Settings</string>
     <string name="dialog_msg_status_online_config">Online</string>