diff --git a/app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
index 8f9eef384..37cfacad4 100644
--- a/app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
+++ b/app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
@@ -86,7 +86,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
             tvUsed.setText("取消使用");
             tvUsed.setBackgroundResource(R.drawable.bg_common_cancel);
             tvUsed.setEnabled(true);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_normal_282828));
         } else {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText("使用");
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoIndicatorAdapter.java
index 25a10660e..067871f97 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoIndicatorAdapter.java
+++ b/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoIndicatorAdapter.java
@@ -64,7 +64,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
         indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
         indicator.setLineHeight(UIUtil.dip2px(mContext, 10));
         indicator.setRoundRadius(UIUtil.dip2px(mContext, 7));
-        indicator.setColors(Color.parseColor("#5FCCE4"));
+        indicator.setColors(Color.parseColor("#FFE710"));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.END;
         lp.bottomMargin = UIUtil.dip2px(mContext, 0);
diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java b/app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java
index 14792e4a3..616b2815a 100644
--- a/app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java
@@ -871,7 +871,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         }
         SpannableBuilder text = new SpannableBuilder()
                 .append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD")))
-                .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#5FCCE4")));
+                .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#FFE710")));
         tvGiftValue.setText(text.build());
     }
 
diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/PrivateChatGiftDialog.java b/app/src/main/java/com/nnbc123/app/ui/widget/PrivateChatGiftDialog.java
index 8e598098e..cc20588c8 100644
--- a/app/src/main/java/com/nnbc123/app/ui/widget/PrivateChatGiftDialog.java
+++ b/app/src/main/java/com/nnbc123/app/ui/widget/PrivateChatGiftDialog.java
@@ -477,7 +477,7 @@ public class PrivateChatGiftDialog extends BottomSheetDialog implements View.OnC
         }
         SpannableBuilder text = new SpannableBuilder()
                 .append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD")))
-                .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#5FCCE4")));
+                .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#FFE710")));
         tvGiftValue.setText(text.build());
     }
 
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_hot.png b/app/src/main/res/drawable-xhdpi/ic_home_hot.png
new file mode 100644
index 000000000..1f9a2a815
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_hot.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_resource_1.png b/app/src/main/res/drawable-xhdpi/ic_resource_1.png
index 39d5f74a6..e77dc85d8 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_resource_1.png and b/app/src/main/res/drawable-xhdpi/ic_resource_1.png differ
diff --git a/app/src/main/res/drawable/shape_me_indicator_visible.xml b/app/src/main/res/drawable/shape_me_indicator_visible.xml
index a6a343f27..76cf3338e 100644
--- a/app/src/main/res/drawable/shape_me_indicator_visible.xml
+++ b/app/src/main/res/drawable/shape_me_indicator_visible.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#5FCCE4" />
+    <solid android:color="#FFE710" />
     <size
         android:width="@dimen/dp_12"
         android:height="@dimen/dp_4" />
diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml
index 522125310..16d3b66b5 100644
--- a/app/src/main/res/layout/activity_patriarch_mode.xml
+++ b/app/src/main/res/layout/activity_patriarch_mode.xml
@@ -101,7 +101,7 @@
             android:gravity="center"
             android:text="开启青少年模式"
             android:background="@drawable/bg_common_cancel"
-            android:textColor="@color/app_248cfe"
+            android:textColor="@color/text_normal_282828"
             android:textSize="15sp" />
 
 
diff --git a/app/src/main/res/layout/dialog_buy_decoration.xml b/app/src/main/res/layout/dialog_buy_decoration.xml
index 6bac125fe..cfebdaefd 100644
--- a/app/src/main/res/layout/dialog_buy_decoration.xml
+++ b/app/src/main/res/layout/dialog_buy_decoration.xml
@@ -27,7 +27,7 @@
         android:layout_width="140dp"
         android:layout_height="38dp"
         android:text="@string/label_common_close"
-        android:textColor="@color/color_7154EE"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp"
         android:background="@drawable/bg_common_cancel"
         android:gravity="center"
diff --git a/app/src/main/res/layout/dialog_common_edit.xml b/app/src/main/res/layout/dialog_common_edit.xml
index ab32a6112..889b7def6 100644
--- a/app/src/main/res/layout/dialog_common_edit.xml
+++ b/app/src/main/res/layout/dialog_common_edit.xml
@@ -56,7 +56,7 @@
         android:gravity="center"
         android:text="取消"
         android:layout_marginEnd="@dimen/dp_5"
-        android:textColor="@color/color_4C5AF1"
+        android:textColor="@color/text_normal_282828"
         android:textSize="@dimen/sp_15" />
 
     <TextView
diff --git a/app/src/main/res/layout/dialog_family_join.xml b/app/src/main/res/layout/dialog_family_join.xml
index bcf396a20..b724f2f85 100644
--- a/app/src/main/res/layout/dialog_family_join.xml
+++ b/app/src/main/res/layout/dialog_family_join.xml
@@ -59,7 +59,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_normal_282828"
             android:background="@drawable/bg_common_cancel"
             android:textSize="15sp"
             android:layout_marginEnd="2.5dp"
diff --git a/app/src/main/res/layout/dialog_protocol_update.xml b/app/src/main/res/layout/dialog_protocol_update.xml
index eef6522b6..708719291 100644
--- a/app/src/main/res/layout/dialog_protocol_update.xml
+++ b/app/src/main/res/layout/dialog_protocol_update.xml
@@ -55,7 +55,7 @@
                 android:background="@drawable/bg_common_cancel"
                 android:gravity="center"
                 android:text="不同意"
-                android:textColor="@color/color_7154EE"
+                android:textColor="@color/text_normal_282828"
                 android:textSize="@dimen/sp_14" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_pub_room_shutup.xml b/app/src/main/res/layout/dialog_pub_room_shutup.xml
index 8529967a2..fd757de37 100644
--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -116,7 +116,7 @@
                     android:background="@drawable/bg_common_cancel"
                     android:gravity="center"
                     android:text="@string/cancel"
-                    android:textColor="@color/color_7154EE"
+                    android:textColor="@color/text_normal_282828"
                     android:textSize="15sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_request_upmic.xml b/app/src/main/res/layout/dialog_request_upmic.xml
index e998f2629..26f01eabd 100644
--- a/app/src/main/res/layout/dialog_request_upmic.xml
+++ b/app/src/main/res/layout/dialog_request_upmic.xml
@@ -66,7 +66,7 @@
             android:background="@drawable/bg_common_cancel"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_normal_282828"
             android:textSize="@dimen/sp_14"
             android:onClick="@{click}"
             android:layout_marginTop="12dp"
diff --git a/app/src/main/res/layout/dialog_task.xml b/app/src/main/res/layout/dialog_task.xml
index bb95d517f..a7694ca1b 100644
--- a/app/src/main/res/layout/dialog_task.xml
+++ b/app/src/main/res/layout/dialog_task.xml
@@ -32,7 +32,7 @@
             android:text="@string/close"
             android:layout_marginTop="13dp"
             android:layout_marginBottom="17dp"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_normal_282828"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/bg_common_cancel"
             android:textSize="15sp" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 42aeed82c..af57e531c 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -61,11 +61,10 @@
 
                 <ImageView
                     android:id="@+id/iv_ranking"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:layout_marginEnd="23dp"
-                    android:layout_marginBottom="2dp"
-                    android:adjustViewBounds="true"
+                    android:layout_marginBottom="4dp"
                     android:onClick="@{click}"
                     android:scaleType="center"
                     android:src="@drawable/ic_home_rank" />
diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml
index 0599c8308..070bd8a73 100644
--- a/app/src/main/res/layout/fragment_recent_list.xml
+++ b/app/src/main/res/layout/fragment_recent_list.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="18dp"
         android:layout_marginEnd="15dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml
index 9e2a6e674..bfdafc50a 100644
--- a/app/src/main/res/layout/fragment_recommend.xml
+++ b/app/src/main/res/layout/fragment_recommend.xml
@@ -175,14 +175,13 @@
                                 app:layout_constraintStart_toStartOf="@id/iv_resource_0"
                                 app:layout_constraintTop_toBottomOf="@id/iv_resource_0">
 
-                                <TextView
+                                <ImageView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="21dp"
                                     android:layout_marginTop="7dp"
-                                    android:text="热门"
-                                    android:textColor="@color/text_normal_282828"
-                                    android:textSize="14sp" />
+                                    android:src="@drawable/ic_home_hot"
+                                   />
 
                                 <androidx.recyclerview.widget.RecyclerView
                                     android:id="@+id/rv_gift_service"
@@ -254,7 +253,7 @@
                     android:id="@+id/fl_indicator"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="20dp"
                     android:paddingBottom="5dp">
 
                     <com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
diff --git a/app/src/main/res/layout/item_decoration_common.xml b/app/src/main/res/layout/item_decoration_common.xml
index 4f4f83f6f..d3e723399 100644
--- a/app/src/main/res/layout/item_decoration_common.xml
+++ b/app/src/main/res/layout/item_decoration_common.xml
@@ -79,7 +79,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="赠送"
-        android:textColor="@color/color_FFA957"
+        android:textColor="@color/text_normal_282828"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
diff --git a/app/src/main/res/layout/item_decoration_user_card.xml b/app/src/main/res/layout/item_decoration_user_card.xml
index d86c33818..42b3fd633 100644
--- a/app/src/main/res/layout/item_decoration_user_card.xml
+++ b/app/src/main/res/layout/item_decoration_user_card.xml
@@ -98,7 +98,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="赠送"
-        android:textColor="@color/color_FFA957"
+        android:textColor="@color/text_normal_282828"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
diff --git a/app/src/main/res/layout/item_gift_service.xml b/app/src/main/res/layout/item_gift_service.xml
index 91a2f716e..e0ef07a15 100644
--- a/app/src/main/res/layout/item_gift_service.xml
+++ b/app/src/main/res/layout/item_gift_service.xml
@@ -29,7 +29,7 @@
         android:layout_marginStart="5dp"
         android:lines="1"
         android:text="赠送"
-        android:textColor="#ffffa826"
+        android:textColor="#FFA826"
         android:textSize="12dp" />
 
     <com.nnbc123.app.common.widget.CircleImageView
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:lines="1"
-        android:textColor="#ffffa826"
+        android:textColor="#FFA826"
         android:textSize="12dp"
         tools:text="星语心愿" />
 
diff --git a/app/src/main/res/layout/item_my_chat_bubble.xml b/app/src/main/res/layout/item_my_chat_bubble.xml
index f62f9f38d..81bf48dbb 100644
--- a/app/src/main/res/layout/item_my_chat_bubble.xml
+++ b/app/src/main/res/layout/item_my_chat_bubble.xml
@@ -81,7 +81,7 @@
             android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.hasUsed ? @color/color_4C5AF1 : @color/white}"
+            android:textColor="@color/text_normal_282828"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/tv_counters"
@@ -90,7 +90,6 @@
             app:layout_constraintTop_toBottomOf="@id/iv_user_card_wear"
             tools:background="@drawable/bg_common_confirm"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/white"
             tools:visibility="visible" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_my_head_wear.xml b/app/src/main/res/layout/item_my_head_wear.xml
index c889ee59b..5553f6dd2 100644
--- a/app/src/main/res/layout/item_my_head_wear.xml
+++ b/app/src/main/res/layout/item_my_head_wear.xml
@@ -64,12 +64,11 @@
             android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_282828}"
+            android:textColor="@color/text_title_282828"
             android:textSize="14sp"
             android:visibility="gone"
             tools:background="@drawable/bg_common_confirm"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/text_title_282828"
             tools:visibility="visible" />
 
 
diff --git a/app/src/main/res/layout/item_my_user_card_wear.xml b/app/src/main/res/layout/item_my_user_card_wear.xml
index 64c681d72..c26da7326 100644
--- a/app/src/main/res/layout/item_my_user_card_wear.xml
+++ b/app/src/main/res/layout/item_my_user_card_wear.xml
@@ -75,14 +75,13 @@
             android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/white}"
+            android:textColor="@color/text_normal_282828"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:background="@drawable/bg_common_confirm"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/white"
             tools:visibility="visible" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_room_common.xml b/app/src/main/res/layout/item_room_common.xml
index db4e74076..87a00f019 100644
--- a/app/src/main/res/layout/item_room_common.xml
+++ b/app/src/main/res/layout/item_room_common.xml
@@ -24,6 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="12dp"
+        android:scaleType="centerCrop"
         android:src="@drawable/default_cover"
         app:layout_constraintBottom_toBottomOf="@id/view_bg"
         app:layout_constraintDimensionRatio="1:1"
@@ -49,15 +50,16 @@
 
     <TextView
         android:id="@+id/tv_room_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginEnd="50dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="@color/text_primary"
+        android:textColor="@color/text_normal_282828"
         android:textSize="14sp"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/ll_tag"
+        app:layout_constraintEnd_toEndOf="@id/view_bg"
         app:layout_constraintStart_toEndOf="@id/iv_room_image"
         app:layout_constraintTop_toTopOf="@id/view_bg"
         app:layout_constraintVertical_chainStyle="packed"
diff --git a/app/src/main/res/layout/item_room_history.xml b/app/src/main/res/layout/item_room_history.xml
index bfed3edea..f52f0d415 100644
--- a/app/src/main/res/layout/item_room_history.xml
+++ b/app/src/main/res/layout/item_room_history.xml
@@ -31,7 +31,7 @@
             android:visibility="gone"
             android:text="直播中"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
             android:textSize="@dimen/dp_11"
             tools:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/item_room_new_friends.xml b/app/src/main/res/layout/item_room_new_friends.xml
index 3765ef967..747ee2095 100644
--- a/app/src/main/res/layout/item_room_new_friends.xml
+++ b/app/src/main/res/layout/item_room_new_friends.xml
@@ -57,10 +57,10 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/text_normal_282828"
-        android:textSize="14sp"
-        android:textStyle="bold"
+        android:textSize="15sp"
         app:layout_constraintBottom_toTopOf="@id/ll_gender_age"
         app:layout_constraintEnd_toStartOf="@id/ll_online"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
         app:layout_constraintTop_toTopOf="@id/view_bg"
         app:layout_constraintVertical_chainStyle="packed"
diff --git a/app/src/main/res/layout/item_wish_list.xml b/app/src/main/res/layout/item_wish_list.xml
index c50d919de..8294e7d89 100644
--- a/app/src/main/res/layout/item_wish_list.xml
+++ b/app/src/main/res/layout/item_wish_list.xml
@@ -64,7 +64,7 @@
             android:background="@drawable/bg_common_cancel"
             android:gravity="center"
             android:text="编辑"
-            android:textColor="#5FCCE4"
+            android:textColor="@color/text_normal_282828"
             android:textSize="10sp" />
 
         <TextView
@@ -75,7 +75,7 @@
             android:background="@drawable/bg_common_confirm_normal"
             android:gravity="center"
             android:text="删除"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
             android:textSize="10sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_anchor_card_view.xml b/app/src/main/res/layout/layout_anchor_card_view.xml
index ec4329252..da1659baa 100644
--- a/app/src/main/res/layout/layout_anchor_card_view.xml
+++ b/app/src/main/res/layout/layout_anchor_card_view.xml
@@ -119,7 +119,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="进入房间"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/layout_ok_cancel_dialog.xml b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
index 1fc947b62..38cb86cf2 100644
--- a/app/src/main/res/layout/layout_ok_cancel_dialog.xml
+++ b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
@@ -41,7 +41,7 @@
             android:background="@drawable/bg_common_cancel"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_7154EE"
+            android:textColor="@color/text_normal_282828"
             android:textSize="15sp" />
 
         <TextView
@@ -51,7 +51,7 @@
             android:background="@drawable/bg_common_confirm"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
             android:textSize="15sp" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_pic_login_dialog.xml b/app/src/main/res/layout/layout_pic_login_dialog.xml
index 820c5dd9f..4d9d7ddcc 100644
--- a/app/src/main/res/layout/layout_pic_login_dialog.xml
+++ b/app/src/main/res/layout/layout_pic_login_dialog.xml
@@ -109,7 +109,7 @@
             android:layout_height="38dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
             android:background="@drawable/bg_common_confirm"
             android:textSize="15sp" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_item_search.xml b/app/src/main/res/layout/list_item_search.xml
index da75bc565..ab36b04e0 100644
--- a/app/src/main/res/layout/list_item_search.xml
+++ b/app/src/main/res/layout/list_item_search.xml
@@ -122,7 +122,7 @@
         android:paddingEnd="@dimen/dp_16"
         android:paddingBottom="@dimen/dp_4"
         android:text="邀请"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="@dimen/sp_12"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/upgrade_dialog.xml b/app/src/main/res/layout/upgrade_dialog.xml
index fc1b150aa..3ec816480 100644
--- a/app/src/main/res/layout/upgrade_dialog.xml
+++ b/app/src/main/res/layout/upgrade_dialog.xml
@@ -144,7 +144,7 @@
                 android:tag="beta_confirm_button"
                 android:text="立刻升级"
                 android:layout_marginStart="10dp"
-                android:textColor="@color/white"
+                android:textColor="@color/text_normal_282828"
                 android:textSize="@dimen/dp_14" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml
index d491624c6..cb4b0d306 100644
--- a/app/src/main/res/layout/user_info_bottom_layout.xml
+++ b/app/src/main/res/layout/user_info_bottom_layout.xml
@@ -17,7 +17,7 @@
         android:drawablePadding="5dp"
         android:gravity="center"
         android:text="@string/send_msg"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp" />
 
     <com.nnbc123.library.widget.DrawableCenterTextView
@@ -30,7 +30,7 @@
         android:drawablePadding="5dp"
         android:gravity="center"
         android:text="@string/attention"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp" />
 
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 81add778e..a05c04134 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -495,7 +495,7 @@
     <color name="color_9af5ef">#9af5ef</color>
 
     <!-- 音萌主题色 -->
-    <color name="color_7154EE">#FFA936</color>
+    <color name="color_7154EE">#FFE710</color>
 
     <color name="color_39EBDF">#39EBDF</color>
     <color name="color_39D0EB">#39D0EB</color>
@@ -557,7 +557,7 @@
     <!-- 音萌UI规范 start-->
 
     <!-- 主题色 -->
-    <color name="app_248cfe">#5FCCE4</color>
+    <color name="app_248cfe">#FFE710</color>
     <!-- 页面背景色 -->
     <color name="bg_normal_1c1b22">#F8F8FB</color>
     <!-- 页面次级背景 列表item背景色-->
diff --git a/app/src/module_labour_union/res/layout/activity_super_admin_manege.xml b/app/src/module_labour_union/res/layout/activity_super_admin_manege.xml
index 899009c68..1c199bc8a 100644
--- a/app/src/module_labour_union/res/layout/activity_super_admin_manege.xml
+++ b/app/src/module_labour_union/res/layout/activity_super_admin_manege.xml
@@ -35,7 +35,7 @@
         android:background="@drawable/bg_common_confirm"
         android:gravity="center"
         android:text="添加公会超管"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml b/app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml
index 6fb68a747..6fe6aea8c 100644
--- a/app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml
+++ b/app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml
@@ -35,7 +35,7 @@
         android:background="@drawable/bg_common_confirm"
         android:gravity="center"
         android:text="确认"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_labour_union/res/layout/item_search_admin.xml b/app/src/module_labour_union/res/layout/item_search_admin.xml
index 48cfff5ee..14d5a6d27 100644
--- a/app/src/module_labour_union/res/layout/item_search_admin.xml
+++ b/app/src/module_labour_union/res/layout/item_search_admin.xml
@@ -60,7 +60,7 @@
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:text="设置为超管"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml b/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
index 3e13ebf40..360dc4506 100644
--- a/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
+++ b/app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
@@ -33,7 +33,7 @@
         android:background="@drawable/bg_common_cancel"
         android:gravity="center"
         android:text="@string/label_common_close"
-        android:textColor="@color/appColor"
+        android:textColor="@color/text_normal_282828"
         android:textSize="15sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickLoginUiConfig.java b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickLoginUiConfig.java
index f1cdcbf17..ecf20ca22 100644
--- a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickLoginUiConfig.java
+++ b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickLoginUiConfig.java
@@ -62,7 +62,7 @@ public class QuickLoginUiConfig {
                 .setSloganTopYOffset(sloganToTop)
                 .setSloganBottomYOffset(BOTTOM_OFFSET)
                 // 登录按钮
-                .setLoginBtnTextColor(ContextCompat.getColor(context, R.color.white))
+                .setLoginBtnTextColor(ContextCompat.getColor(context, R.color.text_normal_282828))
                 .setLoginBtnText("本机号码一键登录")
                 .setLoginBtnBackgroundRes("bg_common_confirm")
                 .setLoginBtnWidth(280)
diff --git a/app/src/module_quick_pass/res/layout/dialog_protocol.xml b/app/src/module_quick_pass/res/layout/dialog_protocol.xml
index 74de832fc..79ca64c8e 100644
--- a/app/src/module_quick_pass/res/layout/dialog_protocol.xml
+++ b/app/src/module_quick_pass/res/layout/dialog_protocol.xml
@@ -49,7 +49,7 @@
             android:background="@drawable/bg_common_confirm"
             android:gravity="center"
             android:text="同意"
-            android:textColor="@color/white"
+            android:textColor="@color/text_normal_282828"
             android:textSize="15sp" />
 
         <TextView
diff --git a/app/src/module_upgrade_app/res/layout/dialog_update.xml b/app/src/module_upgrade_app/res/layout/dialog_update.xml
index b0bcdb2e3..5c2772d2d 100644
--- a/app/src/module_upgrade_app/res/layout/dialog_update.xml
+++ b/app/src/module_upgrade_app/res/layout/dialog_update.xml
@@ -67,7 +67,7 @@
                 android:background="@drawable/bg_common_cancel"
                 android:text="下次再说"
                 android:textAllCaps="false"
-                android:textColor="#5FCCE4"
+                android:textColor="@color/text_normal_282828"
                 android:textSize="14sp" />
 
 
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
index bd7a8f451..c33fad135 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
@@ -54,7 +54,7 @@ public class BubbleView extends AppCompatTextView {
         gradientDrawable.setCornerRadius(ScreenUtil.dip2px(20));
         gradientDrawable.setColor(Color.parseColor("#FF3B30"));
         setBackground(gradientDrawable);
-        setPadding(ScreenUtil.dip2px(6), ScreenUtil.dip2px(2), ScreenUtil.dip2px(6), ScreenUtil.dip2px(2));
+        setPadding(ScreenUtil.dip2px(4), ScreenUtil.dip2px(1), ScreenUtil.dip2px(4), ScreenUtil.dip2px(1));
         setGravity(Gravity.CENTER);
 //        TextViewCompat.setAutoSizeTextTypeWithDefaults(this,TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM);
 //        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this,