diff --git a/app/src/common/res/drawable/bg_common_touch.xml b/app/src/common/res/drawable/bg_common_touch.xml
new file mode 100644
index 000000000..e4ca96661
--- /dev/null
+++ b/app/src/common/res/drawable/bg_common_touch.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/bg_secondary_2a2a39" android:state_pressed="true" />
+    <item android:drawable="@color/bg_secondary_2a2a39" android:state_focused="true" />
+    <item android:drawable="@color/bg_normal_1c1b22" />
+</selector>
diff --git a/app/src/main/res/layout/fragment_network_error.xml b/app/src/main/res/layout/fragment_network_error.xml
index 6e3f4b99d..65578a4e4 100644
--- a/app/src/main/res/layout/fragment_network_error.xml
+++ b/app/src/main/res/layout/fragment_network_error.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/in_big_top_board"
@@ -29,7 +28,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/network_error_reload"
-            android:textColor="@color/text_tertiary"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="@dimen/font_medium" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/newbie_list_item.xml b/app/src/main/res/layout/newbie_list_item.xml
index 3126eee45..5e54c764f 100644
--- a/app/src/main/res/layout/newbie_list_item.xml
+++ b/app/src/main/res/layout/newbie_list_item.xml
@@ -113,7 +113,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="15dp"
-        android:background="@drawable/shape_bg_add_attention"
+        android:background="@drawable/bg_common_confirm"
         android:gravity="center"
         android:scaleType="centerCrop"
         android:text="@string/say_hello"
diff --git a/app/src/main/res/layout/newbie_message_item.xml b/app/src/main/res/layout/newbie_message_item.xml
index 784e6b5c3..3c6631040 100644
--- a/app/src/main/res/layout/newbie_message_item.xml
+++ b/app/src/main/res/layout/newbie_message_item.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="34dp"
-    android:id="@+id/root_view"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingBottom="34dp">
 
     <RadioButton
         android:id="@+id/rb_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:button="@drawable/selector_check_box_pic_check"
         android:layout_marginStart="@dimen/dp_15"
-        android:clickable="false"
-        />
+        android:button="@drawable/selector_check_box_pic_check"
+        android:clickable="false" />
 
     <TextView
         android:id="@+id/tv_message"
@@ -23,5 +20,5 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:text="哈哈哈哈"
-        />
+        android:textColor="@color/text_normal_c6c6e9" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nim_recent_contact_list_item.xml b/app/src/main/res/layout/nim_recent_contact_list_item.xml
index 97768d606..13224baf6 100644
--- a/app/src/main/res/layout/nim_recent_contact_list_item.xml
+++ b/app/src/main/res/layout/nim_recent_contact_list_item.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="65dp"
-    android:background="@drawable/bg_common_touch_while">
+    android:background="@drawable/bg_common_touch">
 
     <View
         android:id="@+id/top_line"
@@ -11,7 +11,7 @@
         android:layout_height="1px"
         android:layout_alignParentBottom="true"
         android:layout_marginStart="70dip"
-        android:background="@color/color_gray_d9d9d9" />
+        android:background="@color/line_353548" />
 
     <RelativeLayout
         android:id="@+id/rl_user_avatar"
@@ -109,7 +109,7 @@
         android:maxWidth="130dp"
         android:singleLine="true"
         android:text=""
-        android:textColor="@color/color_black_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="15dp"
         tools:ignore="SpUsage"
         tools:text="你好啊啊啊啊啊啊啊啊" />
@@ -139,7 +139,7 @@
             android:gravity="center_vertical"
             android:lines="1"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage"
             tools:text="我是内容" />
@@ -165,7 +165,7 @@
             android:lines="1"
             android:scrollHorizontally="true"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage"
             tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -181,7 +181,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="16dip"
         android:layout_marginEnd="10dip"
-        android:textColor="@color/color_grey_999999"
+        android:textColor="@color/text_secondary_4f516a"
         android:textSize="@dimen/text_small_size_ten_sp"
         tools:text="just now" />
 
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java
index f9dc3c23a..e381e4783 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java
@@ -56,7 +56,6 @@ public class RoomNewbieActivity extends BaseActivity {
 
     @Override
     protected void setStatusBar() {
-        super.setStatusBar();
         StatusBarUtil.transparencyBar(this);
     }
 
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieMessageActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieMessageActivity.java
index 23236251b..e03747e2e 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieMessageActivity.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieMessageActivity.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.netease.nim.uikit.StatusBarUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.tutu.room_chat.event.ChangeNewbieMessageEvent;
@@ -44,11 +45,6 @@ public class RoomNewbieMessageActivity extends BaseActivity implements View.OnCl
         fragmentTransaction.replace(R.id.recent_container, newbieMessageFragment).commitAllowingStateLoss();
     }
 
-    @Override
-    protected boolean needSteepStateBar() {
-        return false;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -105,4 +101,14 @@ public class RoomNewbieMessageActivity extends BaseActivity implements View.OnCl
                 break;
         }
     }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return !mIsInRoom;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        StatusBarUtil.transparencyBar(this);
+    }
 }
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentViewHolder.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentViewHolder.java
index 4cb0260ae..6c88fd193 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentViewHolder.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentViewHolder.java
@@ -82,7 +82,7 @@ public abstract class RoomMsgRecentViewHolder extends RecyclerViewHolder<BaseQui
 
     protected void updateBackground(BaseViewHolder holder, RecentContact recent, int position) {
         if ((recent.getTag() & RecentContactsFragment.RECENT_TAG_STICKY) == 0) {
-            holder.getConvertView().setBackgroundResource(R.drawable.bg_common_touch_while);
+            holder.getConvertView().setBackgroundResource(R.drawable.bg_common_touch);
         } else {
             holder.getConvertView().setBackgroundResource(R.drawable.nim_recent_contact_sticky_selecter);
         }
diff --git a/app/src/module_room_chat/res/drawable/shape_1c1b22_top_15dp.xml b/app/src/module_room_chat/res/drawable/shape_1c1b22_top_15dp.xml
new file mode 100644
index 000000000..15cf054d0
--- /dev/null
+++ b/app/src/module_room_chat/res/drawable/shape_1c1b22_top_15dp.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/bg_normal_1c1b22"/>
+    <corners android:topLeftRadius="@dimen/dp_15"
+        android:topRightRadius="@dimen/dp_15"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/module_room_chat/res/layout/activity_newbie_list.xml b/app/src/module_room_chat/res/layout/activity_newbie_list.xml
index 56bd606f1..dd70041bb 100644
--- a/app/src/module_room_chat/res/layout/activity_newbie_list.xml
+++ b/app/src/module_room_chat/res/layout/activity_newbie_list.xml
@@ -5,32 +5,33 @@
     android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="27dp"
+    android:paddingTop="25dp"
     android:background="@color/bg_normal_1c1b22">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="bottom"
-
         android:orientation="vertical">
 
         <FrameLayout
+            android:paddingTop="@dimen/dp_5"
+            android:paddingBottom="@dimen/dp_5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_gravity="center_vertical"
+           >
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="center"
                 android:gravity="center"
                 android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_15"
                     android:text="@string/find_new"
                     android:textColor="@color/white"
                     android:textSize="@dimen/dp_18" />
@@ -52,7 +53,6 @@
                 android:padding="@dimen/dp_8"
                 android:src="@drawable/arrow_left_white" />
 
-
         </FrameLayout>
 
         <FrameLayout
diff --git a/app/src/module_room_chat/res/layout/activity_newbie_message.xml b/app/src/module_room_chat/res/layout/activity_newbie_message.xml
index 1ae628bc8..7042e5e0a 100644
--- a/app/src/module_room_chat/res/layout/activity_newbie_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_newbie_message.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:background="@color/color_666666">
+    android:background="@color/bg_normal_1c1b22">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="bottom"
-        android:background="@color/white"
+        android:layout_marginTop="@dimen/dp_25"
         android:orientation="vertical">
 
         <FrameLayout
@@ -19,51 +17,47 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingTop="@dimen/dp_15"
-            android:paddingBottom="@dimen/dp_22"
-            >
+            android:paddingBottom="@dimen/dp_22">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="请选择"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/dp_18"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/dp_15"
-                />
+                android:text="请选择"
+                android:textColor="@color/text_title_white"
+                android:textSize="@dimen/dp_18" />
 
             <TextView
                 android:id="@+id/tv_refresh"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="换一批"
-                android:drawableStart="@drawable/refresh"
-                android:drawablePadding="@dimen/dp_5"
-                android:textColor="@color/color_666666"
-                android:textSize="13sp"
                 android:layout_gravity="end|center_vertical"
                 android:layout_marginEnd="15dp"
-                />
+                android:drawableStart="@drawable/refresh"
+                android:drawablePadding="@dimen/dp_5"
+                android:text="换一批"
+                android:textColor="@color/text_normal_c6c6e9"
+                android:textSize="13sp" />
         </FrameLayout>
 
         <FrameLayout
             android:id="@+id/recent_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            />
+            android:layout_weight="1" />
+
         <TextView
             android:id="@+id/tv_send"
             android:layout_width="160dp"
             android:layout_height="@dimen/dp_38"
-            android:text="发送"
-            android:gravity="center"
-            android:textSize="14sp"
-            android:textColor="@color/white"
-            android:background="@drawable/bg_common_confirm_normal"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/dp_20"
-            />
+            android:background="@drawable/bg_common_confirm"
+            android:gravity="center"
+            android:text="发送"
+            android:textColor="@color/text_title_white"
+            android:textSize="14sp" />
 
     </LinearLayout>
 
diff --git a/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml b/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
index 359a131cb..2b7a74288 100644
--- a/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/room_msg_height"
         android:layout_gravity="bottom"
-        android:background="@drawable/shape_white_top_14dp"
+        android:background="@drawable/shape_1c1b22_top_15dp"
         android:orientation="vertical">
 
         <FrameLayout
@@ -22,7 +22,7 @@
                 android:layout_width="@dimen/dp_50"
                 android:layout_height="@dimen/dp_50"
                 android:scaleType="center"
-                android:src="@drawable/icon_arrow_left_black" />
+                android:src="@drawable/arrow_left_white" />
 
             <TextView
                 android:id="@+id/tv_toolbar_title"
@@ -33,7 +33,8 @@
                 android:maxWidth="214dp"
                 android:maxLines="1"
                 android:singleLine="true"
-                android:textAppearance="@style/Toolbar.TitleText"
+               android:textSize="@dimen/sp_16"
+                android:textColor="@color/text_title_white"
                 android:visibility="gone"
                 tools:text="孙行者123"
                 tools:visibility="visible" />
diff --git a/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml b/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
index f19e0b560..9870f422d 100644
--- a/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="273dp"
         android:layout_gravity="bottom"
-        android:background="@drawable/shape_white_top_14dp"
+        android:background="@drawable/shape_1c1b22_top_15dp"
         android:orientation="vertical">
 
 
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:textSize="@dimen/dp_16"
             android:text="邀请房间粉丝"
-            android:textColor="@color/color_black_333333"
+            android:textColor="@color/text_title_white"
             android:textStyle="bold"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="@dimen/dp_20"
@@ -36,7 +36,7 @@
                 android:drawablePadding="8dp"
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp"
-                android:textColor="@color/color_666666"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="@dimen/dp_12"
                 android:layout_marginTop="@dimen/dp_25"
                 />
@@ -48,7 +48,7 @@
                 android:drawablePadding="8dp"
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp"
-                android:textColor="@color/color_666666"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="@dimen/dp_12"
                 android:layout_marginTop="@dimen/dp_14"
                 />
@@ -60,7 +60,7 @@
                 android:drawablePadding="8dp"
                 android:layout_marginStart="30dp"
                 android:layout_marginEnd="30dp"
-                android:textColor="@color/color_666666"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:layout_marginTop="@dimen/dp_14"
                 android:textSize="@dimen/dp_12"
                 />
@@ -70,8 +70,8 @@
             android:id="@+id/tv_invite_fans_confirm"
             android:layout_width="160dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm_normal"
-            android:textColor="@color/white"
+            android:background="@drawable/bg_common_confirm"
+            android:textColor="@color/text_title_white"
             android:gravity="center"
             android:layout_marginTop="@dimen/dp_35"
             android:layout_gravity="center_horizontal"
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:text=""
             android:textSize="13dp"
-            android:textColor="@color/color_666666"
+            android:textColor="@color/text_normal_c6c6e9"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="@dimen/dp_16"
             />
diff --git a/app/src/module_room_chat/res/layout/activity_room_message.xml b/app/src/module_room_chat/res/layout/activity_room_message.xml
index 982c0e923..1118e4902 100644
--- a/app/src/module_room_chat/res/layout/activity_room_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_message.xml
@@ -11,27 +11,26 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/room_msg_height"
         android:layout_gravity="bottom"
-        android:background="@drawable/shape_white_top_14dp"
+        android:background="@drawable/shape_1c1b22_top_15dp"
         android:orientation="vertical">
 
         <com.flyco.tablayout.SlidingTabLayout
             android:id="@+id/view_indicator"
             android:layout_width="match_parent"
             android:layout_height="46dp"
-            android:background="@drawable/shape_white_top_14dp"
-            app:tl_indicator_color="@color/appColor"
+            app:tl_indicator_color="@color/app_248cfe"
             app:tl_indicator_corner_radius="2dp"
             app:tl_indicator_height="@dimen/dp_3"
             app:tl_indicator_width="@dimen/dp_9"
             app:tl_tab_space_equal="true"
-            app:tl_textSelectColor="@color/color_333333"
-            app:tl_textUnselectColor="@color/text_tertiary"
+            app:tl_textSelectColor="@color/text_title_white"
+            app:tl_textUnselectColor="@color/text_secondary_4f516a"
             app:tl_textsize="@dimen/dp_16" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/color_f5f5f5" />
+            android:background="@color/line_353548" />
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/viewpager"
diff --git a/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml b/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml
index 53b31f25c..a9e02a95d 100644
--- a/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_newbie_list.xml
@@ -11,13 +11,15 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/room_msg_height"
         android:layout_gravity="bottom"
-        android:background="@drawable/shape_white_top_14dp"
+        android:background="@drawable/shape_1c1b22_top_15dp"
         android:orientation="vertical">
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:paddingTop="@dimen/dp_5"
+            android:paddingBottom="@dimen/dp_5"
             >
 
             <LinearLayout
@@ -31,15 +33,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/find_new"
-                    android:textColor="@color/color_333333"
+                    android:textColor="@color/text_title_white"
                     android:textSize="@dimen/dp_18"
-                    android:layout_marginTop="@dimen/dp_15"
                     />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="每日更新推荐"
-                    android:textColor="@color/color_999999"
+                    android:textColor="@color/text_secondary_4f516a"
                     android:textSize="@dimen/dp_13"
                     />
             </LinearLayout>
@@ -48,7 +49,7 @@
                 android:id="@+id/iv_back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/arrow_left"
+                android:src="@drawable/arrow_left_white"
                 android:layout_marginStart="@dimen/dp_15"
                 android:layout_gravity="center_vertical"
                 />
diff --git a/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml b/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
index 35378de26..3deb59adc 100644
--- a/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/room_msg_height"
         android:layout_gravity="bottom"
-        android:background="@drawable/shape_white_top_14dp"
+        android:background="@drawable/shape_1c1b22_top_15dp"
         android:orientation="vertical">
 
         <FrameLayout
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="请选择"
-                android:textColor="@color/color_333333"
+                android:textColor="@color/text_title_white"
                 android:textSize="@dimen/dp_18"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/dp_15"
@@ -39,7 +39,7 @@
                 android:text="换一批"
                 android:drawableStart="@drawable/refresh"
                 android:drawablePadding="@dimen/dp_5"
-                android:textColor="@color/color_666666"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="13sp"
                 android:layout_gravity="end|center_vertical"
                 android:layout_marginEnd="15dp"
@@ -60,7 +60,7 @@
             android:gravity="center"
             android:textSize="14sp"
             android:textColor="@color/white"
-            android:background="@drawable/bg_common_confirm_normal"
+            android:background="@drawable/bg_common_confirm"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/dp_20"
             />
diff --git a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
index a3866d4c3..4f0a63373 100644
--- a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
+++ b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="75dp"
-    android:background="@drawable/bg_common_touch_while">
+    android:background="@drawable/bg_common_touch">
 
     <com.netease.nim.uikit.common.ui.imageview.HeadImageView
         android:id="@+id/img_head"
@@ -73,7 +73,7 @@
         android:maxWidth="190dp"
         android:singleLine="true"
         android:text=""
-        android:textColor="@color/color_black_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="15dp"
         tools:ignore="SpUsage"
         tools:text="你好啊啊啊啊啊啊啊啊" />
@@ -103,7 +103,7 @@
             android:gravity="center_vertical"
             android:lines="1"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage"
             tools:text="我是内容" />
@@ -130,7 +130,7 @@
             android:maxWidth="190dp"
             android:scrollHorizontally="true"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage"
             tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -146,7 +146,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="16dip"
         android:layout_marginEnd="10dip"
-        android:textColor="@color/color_grey_999999"
+        android:textColor="@color/text_secondary_4f516a"
         android:textSize="@dimen/text_small_size_ten_sp"
         tools:text="just now" />
 
diff --git a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_team_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_team_list_item.xml
index c87f12aec..2c3006dd3 100644
--- a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_team_list_item.xml
+++ b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_team_list_item.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="75dp"
-    android:background="@drawable/bg_common_touch_while">
+    android:background="@drawable/bg_common_touch">
 
     <FrameLayout
         android:layout_width="55dp"
         android:layout_height="55dp"
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/dp_15"
-        android:layout_marginEnd="@dimen/dp_10" >
+        android:layout_marginEnd="@dimen/dp_10">
 
         <com.netease.nim.uikit.common.ui.imageview.HeadImageView
             android:id="@+id/img_head"
             android:layout_width="@dimen/room_msg_avatar_size"
-            android:layout_height="@dimen/room_msg_avatar_size"/>
+            android:layout_height="@dimen/room_msg_avatar_size" />
 
         <ImageView
             android:id="@+id/iv_mini_world_img"
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|right"
             android:src="@drawable/ic_mini_world_team"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
     </FrameLayout>
 
@@ -52,7 +52,7 @@
             android:gravity="center_vertical"
             android:lines="1"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage"
             tools:text="我是内容" />
@@ -78,7 +78,7 @@
             android:maxWidth="190dp"
             android:scrollHorizontally="true"
             android:text=""
-            android:textColor="@color/color_grey_999999"
+            android:textColor="@color/text_normal_c6c6e9"
             android:textSize="13dp"
             tools:ignore="SpUsage" />
     </LinearLayout>
@@ -91,7 +91,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="16dip"
         android:layout_marginEnd="10dip"
-        android:textColor="@color/color_grey_999999"
+        android:textColor="@color/text_secondary_4f516a"
         android:textSize="@dimen/text_small_size_ten_sp"
         tools:text=" 晚上 06:00" />
 
@@ -107,7 +107,7 @@
         android:maxWidth="190dp"
         android:singleLine="true"
         android:text=""
-        android:textColor="@color/color_black_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="15dp"
         tools:ignore="SpUsage"
         tools:text="你好啊啊啊啊啊啊啊啊" />
diff --git a/app/src/module_room_chat/res/layout/room_msg_user_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_user_list_item.xml
index 1ae4b336b..653f4be23 100644
--- a/app/src/module_room_chat/res/layout/room_msg_user_list_item.xml
+++ b/app/src/module_room_chat/res/layout/room_msg_user_list_item.xml
@@ -5,7 +5,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="75dp"
-    android:background="@drawable/bg_common_touch_while">
+    android:background="@drawable/bg_common_touch">
 
     <ImageView
         android:id="@+id/noble_avatar_view"
@@ -31,7 +31,7 @@
         android:lines="1"
         android:maxWidth="250dp"
         android:singleLine="true"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="15sp"
         app:layout_constraintStart_toEndOf="@+id/noble_avatar_view"
         app:layout_constraintTop_toTopOf="@+id/noble_avatar_view"
@@ -47,7 +47,7 @@
         android:includeFontPadding="false"
         android:lines="1"
         android:maxWidth="250dp"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/text_normal_c6c6e9"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@+id/noble_avatar_view"
         app:layout_constraintStart_toEndOf="@+id/noble_avatar_view"