From 5f2dce29e16794b901468c82aa43b440c1d812e6 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Sun, 26 Nov 2023 17:33:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E6=8C=89=E9=92=AE=E4=B8=BA=E6=96=B0=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/decoration/adapter/MyCarAdapter.java  | 12 ++++++------
 .../app/decoration/adapter/MyNamePlateAdapter.java | 10 +++++-----
 .../app/ui/patriarch/PatriarchPwdActivity.java     |  8 ++++----
 .../app/ui/relation/adapter/FansViewAdapter.java   |  4 ++--
 .../java/com/chwl/app/ui/search/SearchAdapter.java |  4 ++--
 app/src/main/res/drawable/bg_common_confirm_15.xml | 14 --------------
 app/src/main/res/drawable/bg_common_confirm_30.xml | 14 --------------
 .../main/res/drawable/selector_common_confirm.xml  |  7 -------
 app/src/main/res/layout/activity_bind_phone.xml    |  4 ++--
 .../main/res/layout/activity_bind_withdraw_msg.xml |  4 ++--
 app/src/main/res/layout/activity_binder_alipay.xml |  8 ++++----
 .../main/res/layout/activity_convert_diamond.xml   |  4 ++--
 app/src/main/res/layout/activity_create_pk.xml     | 12 ++++++------
 app/src/main/res/layout/activity_earn_withdraw.xml |  4 ++--
 app/src/main/res/layout/activity_feedback.xml      |  4 ++--
 .../main/res/layout/activity_give_gold_to_user.xml |  4 ++--
 app/src/main/res/layout/activity_modify_pwd.xml    |  4 ++--
 .../main/res/layout/activity_patriarch_mode.xml    |  4 ++--
 app/src/main/res/layout/activity_patriarch_pwd.xml |  4 ++--
 .../main/res/layout/activity_reset_login_pwd.xml   |  4 ++--
 .../main/res/layout/activity_room_title_edit.xml   |  4 ++--
 .../main/res/layout/activity_show_bind_phone.xml   |  4 ++--
 app/src/main/res/layout/activity_splash.xml        |  4 ++--
 app/src/main/res/layout/activity_verify_phone.xml  |  4 ++--
 .../all_service_gift_go_room_tips_dialog.xml       |  8 ++++----
 app/src/main/res/layout/dialog_attention_hint.xml  |  4 ++--
 app/src/main/res/layout/dialog_bind_success.xml    |  4 ++--
 app/src/main/res/layout/dialog_buy_decoration.xml  |  4 ++--
 app/src/main/res/layout/dialog_common_edit.xml     |  8 ++++----
 app/src/main/res/layout/dialog_exit_room.xml       |  4 ++--
 app/src/main/res/layout/dialog_family_join.xml     |  8 ++++----
 app/src/main/res/layout/dialog_mic_queue.xml       |  4 ++--
 app/src/main/res/layout/dialog_payment.xml         |  4 ++--
 app/src/main/res/layout/dialog_pk_mic_queue.xml    |  8 ++++----
 .../main/res/layout/dialog_pk_select_people.xml    |  4 ++--
 .../main/res/layout/dialog_privacy_agreement.xml   |  4 ++--
 app/src/main/res/layout/dialog_protocol_update.xml |  8 ++++----
 app/src/main/res/layout/dialog_pub_room_shutup.xml |  8 ++++----
 app/src/main/res/layout/dialog_recommend_room.xml  |  4 ++--
 app/src/main/res/layout/dialog_request_upmic.xml   |  8 ++++----
 app/src/main/res/layout/dialog_room_free_gift.xml  |  4 ++--
 .../main/res/layout/dialog_room_pk_received.xml    |  8 ++++----
 app/src/main/res/layout/dialog_select_pay_type.xml |  4 ++--
 app/src/main/res/layout/dialog_task.xml            |  4 ++--
 app/src/main/res/layout/dialog_treasure_box.xml    |  4 ++--
 app/src/main/res/layout/dialog_user_tag.xml        |  4 ++--
 app/src/main/res/layout/fans_list_item_new.xml     |  4 ++--
 .../main/res/layout/fragment_association_room.xml  |  4 ++--
 .../layout/include_dialog_common_ok_cancel_btn.xml |  8 ++++----
 app/src/main/res/layout/item_attention_in_room.xml |  4 ++--
 app/src/main/res/layout/item_car_garage_normal.xml |  4 ++--
 app/src/main/res/layout/item_my_chat_bubble.xml    | 10 +++++-----
 app/src/main/res/layout/item_my_head_wear.xml      |  8 ++++----
 app/src/main/res/layout/item_my_user_card_wear.xml | 10 +++++-----
 app/src/main/res/layout/item_room_history.xml      |  4 ++--
 app/src/main/res/layout/item_room_shield.xml       |  4 ++--
 .../main/res/layout/layout_agree_apply_dialog.xml  |  8 ++++----
 .../main/res/layout/layout_anchor_card_view.xml    |  4 ++--
 .../res/layout/layout_close_exchange_dialog.xml    |  8 ++++----
 app/src/main/res/layout/layout_common_dialog.xml   |  4 ++--
 .../res/layout/layout_exchange_diamond_dialog.xml  |  4 ++--
 .../main/res/layout/layout_give_diamond_dialog.xml |  4 ++--
 .../main/res/layout/layout_ok_cancel_dialog.xml    |  8 ++++----
 .../main/res/layout/layout_pic_login_dialog.xml    |  8 ++++----
 .../main/res/layout/layout_refuse_apply_dialog.xml |  8 ++++----
 app/src/main/res/layout/list_item_search.xml       |  4 ++--
 .../layout/activity_add_bank_card_agreement.xml    |  8 ++++----
 .../res/layout/item_association_room.xml           |  4 ++--
 .../res/layout/activity_give_gold.xml              |  4 ++--
 .../res/layout/dialog_dating_select.xml            |  8 ++++----
 .../hall/activity/ModuleHallActivity.java          |  4 ++--
 .../hall/adapter/AssociationRoomAdapter.java       |  4 ++--
 .../hall/adapter/EnableExchangeAdapter.kt          |  2 +-
 .../res/layout/activity_module_hall.xml            |  4 ++--
 .../res/layout/activity_super_admin_manege.xml     |  4 ++--
 .../res/layout/activity_super_admin_room_set.xml   |  4 ++--
 .../res/layout/item_hall_exchange.xml              |  4 ++--
 .../res/layout/item_search_admin.xml               |  4 ++--
 .../res/layout/layout_hall_msg_view_holder.xml     | 10 +++++-----
 ...alog_release_mentoring_relationship_success.xml |  4 ++--
 .../room_chat/activity/RoomInviteFansActivity.java | 12 ++++++------
 .../chwl/app/room_chat/utils/InViteFansTimer.java  |  4 ++--
 .../res/layout/activity_newbie_message.xml         |  4 ++--
 .../res/layout/activity_room_invite_fans.xml       |  4 ++--
 .../res/layout/activity_room_newbie_message.xml    |  4 ++--
 .../res/layout/dialog_newbie_filter.xml            |  4 ++--
 .../res/layout/dialog_erban_update.xml             |  4 ++--
 .../res/color/base_selector_color_theme_btn.xml    |  2 ++
 .../main/res/drawable/base_selector_theme_15dp.xml |  9 +++++++++
 .../main/res/drawable/base_selector_theme_26dp.xml |  2 ++
 .../main/res/drawable/base_selector_theme_30dp.xml |  9 +++++++++
 .../main/res/drawable/base_shape_e6e6e6_15dp.xml   |  6 ++----
 .../main/res/drawable/base_shape_e6e6e6_30dp.xml   |  6 ++----
 .../main/res/drawable/base_shape_negative_15dp.xml |  9 +++++++++
 .../main/res/drawable/base_shape_negative_30dp.xml |  9 +++++++++
 .../main/res/drawable/base_shape_positive_15dp.xml |  6 ++++++
 .../main/res/drawable/base_shape_positive_30dp.xml |  6 ++++++
 .../main/res/drawable/base_shape_theme_15dp.xml    |  6 ++++++
 .../main/res/drawable/base_shape_theme_30dp.xml    |  6 ++++++
 modules/module_base/src/main/res/values/colors.xml | 10 ++++++++++
 100 files changed, 307 insertions(+), 272 deletions(-)
 delete mode 100644 app/src/main/res/drawable/bg_common_confirm_15.xml
 delete mode 100644 app/src/main/res/drawable/bg_common_confirm_30.xml
 delete mode 100644 app/src/main/res/drawable/selector_common_confirm.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_selector_theme_15dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_selector_theme_30dp.xml
 rename app/src/main/res/drawable/bg_common_cancel_15.xml => modules/module_base/src/main/res/drawable/base_shape_e6e6e6_15dp.xml (59%)
 rename app/src/main/res/drawable/bg_common_cancel_30.xml => modules/module_base/src/main/res/drawable/base_shape_e6e6e6_30dp.xml (59%)
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_negative_15dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_negative_30dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml
 create mode 100644 modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml

diff --git a/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java
index 57223d9ab..ea06089f8 100644
--- a/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java
+++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyCarAdapter.java
@@ -79,20 +79,20 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
         if (!canUse) {
             tvUsed.setVisibility(View.GONE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_02));
-            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
+            tvUsed.setBackgroundResource(R.drawable.base_shape_negative_30dp);
             tvUsed.setEnabled(false);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.base_color_negative_text));
         } else if (isUsing) {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_03));
-            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
+            tvUsed.setBackgroundResource(R.drawable.base_shape_negative_30dp);
             tvUsed.setEnabled(true);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.base_color_negative_text));
         } else {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
-            tvUsed.setBackgroundResource(R.drawable.selector_common_confirm);
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_first));
+            tvUsed.setBackgroundResource(R.drawable.base_selector_theme_30dp);
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.base_selector_color_theme_btn));
             tvUsed.setEnabled(true);
         }
 
diff --git a/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java
index 4a76cfa25..c6ed227a4 100644
--- a/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java
+++ b/app/src/main/java/com/chwl/app/decoration/adapter/MyNamePlateAdapter.java
@@ -36,18 +36,18 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
 
         //使用按钮
         TextView tvUsed = helper.getView(R.id.tv_used);
-        tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel_30 : R.drawable.selector_common_confirm);
-        tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.text_button_color_gray) :
-                mContext.getResources().getColor(R.color.text_button_color_first));
+        tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.base_shape_e6e6e6_30dp : R.drawable.base_selector_theme_30dp);
+        tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_FFFFFF) :
+                mContext.getResources().getColor(R.color.base_selector_color_theme_btn));
         tvUsed.setText(item.isUsing() ? R.string.label_used : R.string.label_can_use);
         if (item.isIsExpired()) { // 过期
             // 日期展示
             helper.setText(R.id.tv_counters, mContext.getString(R.string.past_due));
             tvUsed.setVisibility(View.GONE);
             tvUsed.setEnabled(false);
-            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
+            tvUsed.setBackgroundResource(R.drawable.base_shape_e6e6e6_30dp);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mynameplateadapter_01));
-            tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
+            tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_FFFFFF));
         } else {
             String days;
             if (item.getExpireDays() > 99) {
diff --git a/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java
index 5dd1d967e..f3e77886d 100644
--- a/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java
+++ b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchPwdActivity.java
@@ -97,11 +97,11 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
     private void setCommitBtnStatus(boolean canClick) {
         mBinding.tvCommit.setClickable(canClick);
         if (canClick) {
-            mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_30);
-            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_first));
+            mBinding.tvCommit.setBackgroundResource(R.drawable.base_shape_positive_30dp);
+            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.base_color_positive_text));
         } else {
-            mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_cancel_30);
-            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_gray));
+            mBinding.tvCommit.setBackgroundResource(R.drawable.base_shape_e6e6e6_30dp);
+            mBinding.tvCommit.setTextColor(getResources().getColor(R.color.color_FFFFFF));
         }
     }
 
diff --git a/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java
index fc17cb055..ffd6c26df 100644
--- a/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java
+++ b/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java
@@ -84,10 +84,10 @@ public class FansViewAdapter extends BaseQuickAdapter<FansInfo, BaseViewHolder>
         baseViewHolder.setVisible(R.id.attention_img, type == AbstractSelectFriendAction.TYPE_NORMAL);
         if (IMFriendModel.get().isMyFriend(String.valueOf(fansInfo.getUid()))) {
             tvAttention.setText(ResUtil.getString(R.string.relation_adapter_fansviewadapter_01));
-            tvAttention.setBackgroundResource(R.drawable.bg_common_cancel_30);
+            tvAttention.setBackgroundResource(R.drawable.base_shape_e6e6e6_30dp);
         } else {
             tvAttention.setText(ResUtil.getString(R.string.relation_adapter_fansviewadapter_02));
-            tvAttention.setBackgroundResource(R.drawable.selector_common_confirm);
+            tvAttention.setBackgroundResource(R.drawable.base_selector_theme_30dp);
         }
 
         GenderAgeTextView tvGenderAge = baseViewHolder.getView(R.id.tv_gender_age);
diff --git a/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java b/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java
index a881e8c72..4c2b39d3f 100644
--- a/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java
+++ b/app/src/main/java/com/chwl/app/ui/search/SearchAdapter.java
@@ -69,8 +69,8 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
             } else if (item.getHallBtnStatus() == 4) {
                 holder.stvOp.setVisibility(View.VISIBLE);
                 holder.stvOp.setText(ResUtil.getString(R.string.ui_search_searchadapter_02));
-                holder.stvOp.setTextColor(ContextCompat.getColor(context, R.color.color_white));
-                holder.stvOp.setBackground(ContextCompat.getDrawable(context, R.drawable.bg_common_confirm_30));
+                holder.stvOp.setTextColor(ContextCompat.getColor(context, R.color.base_color_theme_text));
+                holder.stvOp.setBackground(ContextCompat.getDrawable(context, R.drawable.base_shape_theme_30dp));
             } else if (item.getHallBtnStatus() == 5) {
                 holder.stvOp.setVisibility(View.VISIBLE);
                 holder.stvOp.setText(ResUtil.getString(R.string.ready_pass));
diff --git a/app/src/main/res/drawable/bg_common_confirm_15.xml b/app/src/main/res/drawable/bg_common_confirm_15.xml
deleted file mode 100644
index 4aac819d0..000000000
--- a/app/src/main/res/drawable/bg_common_confirm_15.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="180"
-        android:endColor="#13E2F5"
-        android:centerColor="#9DB4FF"
-        android:startColor="#CC67FF"
-        android:type="linear"
-        android:useLevel="true" />
-    <corners android:radius="@dimen/dp_15" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm_30.xml b/app/src/main/res/drawable/bg_common_confirm_30.xml
deleted file mode 100644
index 109c450fa..000000000
--- a/app/src/main/res/drawable/bg_common_confirm_30.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="180"
-        android:endColor="#13E2F5"
-        android:centerColor="#9DB4FF"
-        android:startColor="#CC67FF"
-        android:type="linear"
-        android:useLevel="true" />
-    <corners android:radius="@dimen/dp_30" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_common_confirm.xml b/app/src/main/res/drawable/selector_common_confirm.xml
deleted file mode 100644
index a7e4575a1..000000000
--- a/app/src/main/res/drawable/selector_common_confirm.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bg_common_confirm_30" android:state_pressed="true" />
-    <item android:drawable="@drawable/bg_common_confirm_30" android:state_focused="true" />
-    <item android:drawable="@drawable/bg_common_confirm_30" android:state_enabled="true" />
-    <item android:drawable="@drawable/bg_common_cancel_30" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index b4b08a18b..56bc492b8 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -107,11 +107,11 @@
         android:layout_marginTop="124dp"
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/ui_setting_verifyphoneactivity_011"
-        android:textColor="@color/color_selector_white_false_b3b3c3"
+        android:textColor="@color/base_selector_color_theme_btn"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_code" />
diff --git a/app/src/main/res/layout/activity_bind_withdraw_msg.xml b/app/src/main/res/layout/activity_bind_withdraw_msg.xml
index 765dd21da..dc4307b8d 100644
--- a/app/src/main/res/layout/activity_bind_withdraw_msg.xml
+++ b/app/src/main/res/layout/activity_bind_withdraw_msg.xml
@@ -331,11 +331,11 @@
                 android:layout_marginStart="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_50"
                 android:layout_marginEnd="@dimen/dp_15"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/base_shape_theme_30dp"
                 android:enabled="false"
                 android:gravity="center"
                 android:text="@string/save"
-                android:textColor="@color/color_selector_white_false_b3b3c3"
+                android:textColor="@color/base_selector_color_theme_btn"
                 android:textSize="@dimen/sp_16"
                 app:layout_constraintTop_toBottomOf="@+id/csConvertDetail" />
 
diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml
index f5a5e5767..41a42a60d 100644
--- a/app/src/main/res/layout/activity_binder_alipay.xml
+++ b/app/src/main/res/layout/activity_binder_alipay.xml
@@ -167,10 +167,10 @@
         android:layout_marginLeft="32dp"
         android:layout_marginTop="30dp"
         android:layout_marginRight="32dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:clickable="true"
         android:text="@string/layout_activity_binder_alipay_08"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="@dimen/font_huge" />
 
     <Button
@@ -180,10 +180,10 @@
         android:layout_marginLeft="32dp"
         android:layout_marginTop="30dp"
         android:layout_marginRight="32dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:clickable="true"
         android:text="@string/layout_activity_binder_alipay_09"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="@dimen/font_huge"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/activity_convert_diamond.xml b/app/src/main/res/layout/activity_convert_diamond.xml
index dfefc6f78..7a63aab44 100644
--- a/app/src/main/res/layout/activity_convert_diamond.xml
+++ b/app/src/main/res/layout/activity_convert_diamond.xml
@@ -169,14 +169,14 @@
         android:id="@+id/tvConvert"
         android:text="@string/confirm_exchange"
         android:textSize="16sp"
-        android:textColor="@color/color_selector_white_false_b3b3c3"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:layout_width="match_parent"
         android:layout_height="46dp"
         android:gravity="center"
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_50"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:enabled="false"
         app:layout_constraintTop_toBottomOf="@+id/csConvertDetail"/>
 
diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml
index 3db11de71..e54573f3d 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -437,10 +437,10 @@
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="20dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/ok"
-            android:textColor="@color/color_FFFFFF" />
+            android:textColor="@color/base_selector_color_theme_btn" />
 
 
         <LinearLayout
@@ -457,10 +457,10 @@
                 android:layout_height="40dp"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/base_selector_theme_30dp"
                 android:gravity="center"
                 android:text="@string/recreate_pk"
-                android:textColor="@color/text_button_color_first" />
+                android:textColor="@color/base_selector_color_theme_btn" />
 
 
             <TextView
@@ -470,10 +470,10 @@
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="@dimen/dp_15"
-                android:background="@drawable/bg_common_cancel_30"
+                android:background="@drawable/base_shape_negative_30dp"
                 android:gravity="center"
                 android:text="@string/close_pk_mode"
-                android:textColor="@color/text_button_color_gray" />
+                android:textColor="@color/base_color_negative_text" />
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_earn_withdraw.xml b/app/src/main/res/layout/activity_earn_withdraw.xml
index b8e5be089..035e8d429 100644
--- a/app/src/main/res/layout/activity_earn_withdraw.xml
+++ b/app/src/main/res/layout/activity_earn_withdraw.xml
@@ -226,11 +226,11 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_50"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/immediate_cash_withdrawal"
-        android:textColor="@color/color_selector_white_false_b3b3c3"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="@dimen/sp_16"
         app:layout_constraintTop_toBottomOf="@+id/csConvertDetail" />
 
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 1f1d3c8b4..08c984c8b 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -64,8 +64,8 @@
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="45dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:text="@string/layout_activity_feedback_04"
-        android:textColor="@color/text_button_color_first"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15sp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_give_gold_to_user.xml b/app/src/main/res/layout/activity_give_gold_to_user.xml
index 3120126d3..e3a68f299 100644
--- a/app/src/main/res/layout/activity_give_gold_to_user.xml
+++ b/app/src/main/res/layout/activity_give_gold_to_user.xml
@@ -277,11 +277,11 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="50dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/sure"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="@dimen/sp_16"
         app:layout_constraintTop_toBottomOf="@+id/tvAll" />
 
diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml
index 7cae70989..78db391ab 100644
--- a/app/src/main/res/layout/activity_modify_pwd.xml
+++ b/app/src/main/res/layout/activity_modify_pwd.xml
@@ -96,10 +96,10 @@
             android:layout_marginTop="50dp"
             android:layout_marginEnd="32dp"
             android:enabled="false"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:onClick="@{click}"
             android:text="@string/layout_activity_modify_pwd_07"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="@dimen/font_huge" />
 
         <TextView
diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml
index 04e4ff163..f3df0e9db 100644
--- a/app/src/main/res/layout/activity_patriarch_mode.xml
+++ b/app/src/main/res/layout/activity_patriarch_mode.xml
@@ -99,8 +99,8 @@
             android:layout_marginTop="100dp"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_mode_06"
-            android:background="@drawable/bg_common_confirm_30"
-            android:textColor="@color/text_button_color_first"
+            android:background="@drawable/base_shape_theme_30dp"
+            android:textColor="@color/base_color_theme_text"
             android:textSize="15sp" />
 
 
diff --git a/app/src/main/res/layout/activity_patriarch_pwd.xml b/app/src/main/res/layout/activity_patriarch_pwd.xml
index 4da39c4f2..ca4279f4e 100644
--- a/app/src/main/res/layout/activity_patriarch_pwd.xml
+++ b/app/src/main/res/layout/activity_patriarch_pwd.xml
@@ -75,10 +75,10 @@
             android:layout_height="45dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="105dp"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_e6e6e6_30dp"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_pwd_02"
-            android:textColor="@color/text_button_color_gray"
+            android:textColor="@color/color_FFFFFF"
             android:textSize="15sp"
             />
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_reset_login_pwd.xml b/app/src/main/res/layout/activity_reset_login_pwd.xml
index ef98330a3..4fe1b226e 100644
--- a/app/src/main/res/layout/activity_reset_login_pwd.xml
+++ b/app/src/main/res/layout/activity_reset_login_pwd.xml
@@ -116,11 +116,11 @@
             android:layout_marginStart="15dp"
             android:layout_marginTop="50dp"
             android:layout_marginEnd="15dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:enabled="false"
             android:gravity="center"
             android:text="@string/layout_activity_reset_login_pwd_04"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="15sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_room_title_edit.xml b/app/src/main/res/layout/activity_room_title_edit.xml
index 801ec5c50..c261f43a5 100644
--- a/app/src/main/res/layout/activity_room_title_edit.xml
+++ b/app/src/main/res/layout/activity_room_title_edit.xml
@@ -93,10 +93,10 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:layout_marginBottom="20dp"
-                android:background="@drawable/bg_common_confirm_30"
+                android:background="@drawable/base_shape_theme_30dp"
+                android:textColor="@color/base_selector_color_theme_btn"
                 android:gravity="center"
                 android:text="@string/text_ok"
-                android:textColor="@color/text_button_color_first"
                 android:textSize="@dimen/sp_14" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_show_bind_phone.xml b/app/src/main/res/layout/activity_show_bind_phone.xml
index 64c10127f..ff427c277 100644
--- a/app/src/main/res/layout/activity_show_bind_phone.xml
+++ b/app/src/main/res/layout/activity_show_bind_phone.xml
@@ -56,10 +56,10 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="48dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:text="@string/layout_activity_show_bind_phone_02"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="@dimen/sp_16"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index bf41de2a0..98f0acdb3 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -45,11 +45,11 @@
             android:layout_height="45dp"
             android:layout_gravity="center_horizontal|bottom"
             android:layout_marginBottom="50dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/layout_activity_splash_01"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="18dp"
             android:visibility="gone" />
     </FrameLayout>
diff --git a/app/src/main/res/layout/activity_verify_phone.xml b/app/src/main/res/layout/activity_verify_phone.xml
index 581c5f07e..6625274a1 100644
--- a/app/src/main/res/layout/activity_verify_phone.xml
+++ b/app/src/main/res/layout/activity_verify_phone.xml
@@ -107,11 +107,11 @@
         android:layout_marginTop="124dp"
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/layout_activity_login_phone_04"
-        android:textColor="@color/color_selector_white_false_b3b3c3"
+        android:textColor="@color/base_selector_color_theme_btn"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_code" />
diff --git a/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml b/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml
index 1b9388e54..053c3bff6 100644
--- a/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml
+++ b/app/src/main/res/layout/all_service_gift_go_room_tips_dialog.xml
@@ -86,10 +86,10 @@
                 android:layout_marginStart="28dp"
                 android:layout_marginTop="19dp"
                 android:layout_marginEnd="7.5dp"
-                android:background="@drawable/shape_e6e6f0_21"
+                android:background="@drawable/base_shape_negative_30dp"
                 android:gravity="center"
                 android:text="@string/all_service_gift_room_go_cancel"
-                android:textColor="@color/white"
+                android:textColor="@color/base_color_negative_text"
                 android:textSize="16dp"
                 app:layout_constraintEnd_toStartOf="@id/tv_go"
                 app:layout_constraintStart_toStartOf="parent"
@@ -101,10 +101,10 @@
                 android:layout_height="42dp"
                 android:layout_marginStart="7.5dp"
                 android:layout_marginEnd="28dp"
-                android:background="@drawable/bg_common_confirm_30"
+                android:background="@drawable/base_shape_positive_30dp"
+                android:textColor="@color/base_color_positive_text"
                 android:gravity="center"
                 android:text="@string/all_service_gift_room_go_go"
-                android:textColor="@color/white"
                 android:textSize="16dp"
                 app:layout_constraintBottom_toBottomOf="@id/tv_cancel"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_attention_hint.xml b/app/src/main/res/layout/dialog_attention_hint.xml
index 3d03ad109..332993067 100644
--- a/app/src/main/res/layout/dialog_attention_hint.xml
+++ b/app/src/main/res/layout/dialog_attention_hint.xml
@@ -47,14 +47,14 @@
     <TextView
         android:id="@+id/tv_attention"
         android:layout_width="225dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:layout_height="30dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="40dp"
         android:layout_marginBottom="22dp"
         android:gravity="center"
         android:text="@string/layout_dialog_attention_hint_03"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15sp"
         android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/dialog_bind_success.xml b/app/src/main/res/layout/dialog_bind_success.xml
index 2a2b17fad..10cc7e25a 100644
--- a/app/src/main/res/layout/dialog_bind_success.xml
+++ b/app/src/main/res/layout/dialog_bind_success.xml
@@ -28,10 +28,10 @@
         android:layout_height="38dp"
         android:gravity="center"
         android:textSize="15sp"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_theme_text"
         android:layout_marginTop="22dp"
         android:layout_marginBottom="22dp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:text="@string/layout_dialog_bind_success_02"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_buy_decoration.xml b/app/src/main/res/layout/dialog_buy_decoration.xml
index bacb0e5cb..915f01bd0 100644
--- a/app/src/main/res/layout/dialog_buy_decoration.xml
+++ b/app/src/main/res/layout/dialog_buy_decoration.xml
@@ -27,9 +27,9 @@
         android:layout_width="140dp"
         android:layout_height="38dp"
         android:text="@string/label_common_close"
-        android:textColor="@color/text_button_color_first"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="15sp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"/>
diff --git a/app/src/main/res/layout/dialog_common_edit.xml b/app/src/main/res/layout/dialog_common_edit.xml
index f9cc20aa3..b1d1c7825 100644
--- a/app/src/main/res/layout/dialog_common_edit.xml
+++ b/app/src/main/res/layout/dialog_common_edit.xml
@@ -52,11 +52,11 @@
         android:layout_width="120dp"
         android:layout_height="38dp"
         android:layout_marginStart="@dimen/dp_19"
-        android:background="@drawable/bg_common_cancel_30"
+        android:background="@drawable/base_shape_negative_30dp"
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_03"
         android:layout_marginEnd="@dimen/dp_5"
-        android:textColor="@color/text_button_color_gray"
+        android:textColor="@color/base_color_negative_text"
         android:textSize="@dimen/sp_15" />
 
     <TextView
@@ -66,8 +66,8 @@
         android:layout_marginStart="12dp"
         android:layout_width="120dp"
         android:layout_height="38dp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_positive_30dp"
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_04"
-        android:textColor="@color/text_button_color_first" />
+        android:textColor="@color/base_color_positive_text" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_exit_room.xml b/app/src/main/res/layout/dialog_exit_room.xml
index 55a9bbba3..e8f638ae0 100644
--- a/app/src/main/res/layout/dialog_exit_room.xml
+++ b/app/src/main/res/layout/dialog_exit_room.xml
@@ -98,10 +98,10 @@
                 android:layout_width="100dp"
                 android:layout_height="30dp"
                 android:layout_marginTop="13dp"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/base_selector_theme_30dp"
                 android:gravity="center"
                 android:text="@string/layout_dialog_exit_room_06"
-                android:textColor="@color/white"
+                android:textColor="@color/base_selector_color_theme_btn"
                 android:textSize="15sp"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/dialog_family_join.xml b/app/src/main/res/layout/dialog_family_join.xml
index 43024ca9c..aa43b2fac 100644
--- a/app/src/main/res/layout/dialog_family_join.xml
+++ b/app/src/main/res/layout/dialog_family_join.xml
@@ -59,8 +59,8 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/text_button_color_gray"
-            android:background="@drawable/bg_common_cancel_30"
+            android:textColor="@color/base_color_negative_text"
+            android:background="@drawable/base_shape_negative_30dp"
             android:textSize="15sp"
             android:layout_marginEnd="2.5dp"
             android:layout_marginStart="5dp"/>
@@ -72,8 +72,8 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
-            android:background="@drawable/selector_common_confirm"
+            android:textColor="@color/base_selector_color_theme_btn"
+            android:background="@drawable/base_selector_theme_30dp"
             android:textSize="15sp"
             android:layout_marginEnd="5dp"
             android:layout_marginStart="2.5dp"/>
diff --git a/app/src/main/res/layout/dialog_mic_queue.xml b/app/src/main/res/layout/dialog_mic_queue.xml
index 944054cfe..47073ab66 100644
--- a/app/src/main/res/layout/dialog_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_mic_queue.xml
@@ -100,10 +100,10 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:singleLine="true"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="16sp"
             android:visibility="gone"
             tools:text="@string/apply_mic_queue" />
diff --git a/app/src/main/res/layout/dialog_payment.xml b/app/src/main/res/layout/dialog_payment.xml
index 867438f7c..0f3c9686e 100644
--- a/app/src/main/res/layout/dialog_payment.xml
+++ b/app/src/main/res/layout/dialog_payment.xml
@@ -61,10 +61,10 @@
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_36"
         android:layout_marginBottom="@dimen/dp_20"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:gravity="center"
         android:text="@string/confirm_pay"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_20"
         app:layout_constraintTop_toBottomOf="@+id/mRecyclerView"
         app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_pk_mic_queue.xml b/app/src/main/res/layout/dialog_pk_mic_queue.xml
index 98c89740f..a01d97e3a 100644
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -140,9 +140,9 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/text_button_color_gray"
+                android:textColor="@color/base_color_negative_text"
                 android:textSize="16sp"
-                android:background="@drawable/bg_common_cancel_30"
+                android:background="@drawable/base_shape_negative_30dp"
                 android:text="@string/cancel_mic_queue"
                 android:visibility="gone" />
 
@@ -153,9 +153,9 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textColor="@color/color_FFFFFF"
+                android:textColor="@color/base_selector_color_theme_btn"
                 android:textSize="16sp"
-                android:background="@drawable/selector_common_confirm"
+                android:background="@drawable/base_selector_theme_30dp"
                 android:text="@string/invite_to_mic_queue"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/dialog_pk_select_people.xml b/app/src/main/res/layout/dialog_pk_select_people.xml
index 377d8b612..2fc30267f 100644
--- a/app/src/main/res/layout/dialog_pk_select_people.xml
+++ b/app/src/main/res/layout/dialog_pk_select_people.xml
@@ -18,9 +18,9 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         android:gravity="center"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:text="@string/ok"
-        android:textColor="@color/text_title_color"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_privacy_agreement.xml b/app/src/main/res/layout/dialog_privacy_agreement.xml
index 9b778a98b..cda34ea2d 100644
--- a/app/src/main/res/layout/dialog_privacy_agreement.xml
+++ b/app/src/main/res/layout/dialog_privacy_agreement.xml
@@ -62,11 +62,11 @@
         android:layout_height="36dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_positive_30dp"
         android:gravity="center"
         android:minHeight="50dp"
         android:text="@string/layout_dialog_privacy_agreement_01"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_positive_text"
         android:textSize="16sp" />
 
     <TextView
diff --git a/app/src/main/res/layout/dialog_protocol_update.xml b/app/src/main/res/layout/dialog_protocol_update.xml
index 5ab050e41..326c095d0 100644
--- a/app/src/main/res/layout/dialog_protocol_update.xml
+++ b/app/src/main/res/layout/dialog_protocol_update.xml
@@ -52,10 +52,10 @@
                 android:layout_marginTop="@dimen/dp_20"
                 android:layout_marginBottom="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_common_cancel_30"
+                android:background="@drawable/base_shape_negative_30dp"
                 android:gravity="center"
                 android:text="@string/layout_dialog_protocol_update_02"
-                android:textColor="@color/text_button_color_gray"
+                android:textColor="@color/base_color_negative_text"
                 android:textSize="@dimen/sp_14" />
 
             <TextView
@@ -67,10 +67,10 @@
                 android:layout_marginEnd="20dp"
                 android:layout_marginBottom="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_common_confirm_30"
+                android:background="@drawable/base_shape_positive_30dp"
                 android:gravity="center"
                 android:text="@string/layout_dialog_protocol_update_03"
-                android:textColor="@color/white"
+                android:textColor="@color/base_color_positive_text"
                 android:textSize="@dimen/sp_14" />
         </LinearLayout>
 
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 af28d7fbf..b3ffd7077 100644
--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -113,20 +113,20 @@
                     android:layout_width="120dp"
                     android:layout_height="38dp"
                     android:layout_marginEnd="@dimen/dp_16"
-                    android:background="@drawable/bg_common_cancel_30"
+                    android:background="@drawable/base_shape_negative_30dp"
                     android:gravity="center"
                     android:text="@string/cancel"
-                    android:textColor="@color/text_button_color_gray"
+                    android:textColor="@color/base_color_negative_text"
                     android:textSize="15sp" />
 
                 <TextView
                     android:id="@+id/btn_ok"
                     android:layout_width="120dp"
                     android:layout_height="38dp"
-                    android:background="@drawable/selector_common_confirm"
+                    android:background="@drawable/base_selector_theme_30dp"
                     android:gravity="center"
                     android:text="@string/text_ok"
-                    android:textColor="@color/white"
+                    android:textColor="@color/base_selector_color_theme_btn"
                     android:textSize="15sp" />
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_recommend_room.xml b/app/src/main/res/layout/dialog_recommend_room.xml
index 4a2c5f763..9e89aa563 100644
--- a/app/src/main/res/layout/dialog_recommend_room.xml
+++ b/app/src/main/res/layout/dialog_recommend_room.xml
@@ -55,10 +55,10 @@
             android:layout_width="180dp"
             android:layout_height="40dp"
             android:layout_marginTop="24dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/layout_dialog_recommend_room_03"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_request_upmic.xml b/app/src/main/res/layout/dialog_request_upmic.xml
index 47aeafe9f..5ed3987fe 100644
--- a/app/src/main/res/layout/dialog_request_upmic.xml
+++ b/app/src/main/res/layout/dialog_request_upmic.xml
@@ -63,10 +63,10 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_38"
             android:layout_marginStart="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/text_button_color_gray"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="@dimen/sp_14"
             android:onClick="@{click}"
             android:layout_marginTop="12dp"
@@ -80,11 +80,11 @@
             android:layout_height="@dimen/dp_38"
             android:layout_marginLeft="@dimen/dp_16"
             android:layout_marginRight="@dimen/dp_16"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_positive_30dp"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/ok"
-            android:textColor="@color/white"
+            android:textColor="@color/base_color_positive_text"
             android:textSize="@dimen/sp_14"
             android:layout_marginTop="12dp"
             app:layout_constraintTop_toBottomOf="@id/tv_invite_tip"
diff --git a/app/src/main/res/layout/dialog_room_free_gift.xml b/app/src/main/res/layout/dialog_room_free_gift.xml
index c7bdffef0..dd9d0a127 100644
--- a/app/src/main/res/layout/dialog_room_free_gift.xml
+++ b/app/src/main/res/layout/dialog_room_free_gift.xml
@@ -70,11 +70,11 @@
             android:layout_marginStart="88dp"
             android:layout_marginEnd="88dp"
             android:layout_marginBottom="@dimen/dp_20"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/dialog_free_gift_know"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_color_theme_text"
             android:textSize="@dimen/sp_16" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_room_pk_received.xml b/app/src/main/res/layout/dialog_room_pk_received.xml
index 84d3498cd..ad40fd3f1 100644
--- a/app/src/main/res/layout/dialog_room_pk_received.xml
+++ b/app/src/main/res/layout/dialog_room_pk_received.xml
@@ -121,11 +121,11 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="25dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_08"
-            android:textColor="@color/text_button_color_gray"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -136,11 +136,11 @@
             android:layout_width="110dp"
             android:layout_height="35dp"
             android:layout_marginEnd="16dp"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_positive_30dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_09"
-            android:textColor="#ffffffff"
+            android:textColor="@color/base_color_positive_text"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_refuse" />
diff --git a/app/src/main/res/layout/dialog_select_pay_type.xml b/app/src/main/res/layout/dialog_select_pay_type.xml
index 13914dd37..bd13bbfdd 100644
--- a/app/src/main/res/layout/dialog_select_pay_type.xml
+++ b/app/src/main/res/layout/dialog_select_pay_type.xml
@@ -97,10 +97,10 @@
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_36"
         android:layout_marginBottom="@dimen/dp_20"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:gravity="center"
         android:text="@string/confirm_pay"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rg" />
diff --git a/app/src/main/res/layout/dialog_task.xml b/app/src/main/res/layout/dialog_task.xml
index 525b882bf..e5cd91884 100644
--- a/app/src/main/res/layout/dialog_task.xml
+++ b/app/src/main/res/layout/dialog_task.xml
@@ -32,9 +32,9 @@
             android:text="@string/close"
             android:layout_marginTop="13dp"
             android:layout_marginBottom="17dp"
-            android:textColor="@color/text_button_color_first"
+            android:textColor="@color/base_color_theme_text"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:textSize="15sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_treasure_box.xml b/app/src/main/res/layout/dialog_treasure_box.xml
index d744a097a..b80e0cde4 100644
--- a/app/src/main/res/layout/dialog_treasure_box.xml
+++ b/app/src/main/res/layout/dialog_treasure_box.xml
@@ -56,13 +56,13 @@
             android:layout_height="wrap_content"
             android:text="@string/treasure_to_charge"
             android:textSize="@dimen/sp_15"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_color_theme_text"
             android:layout_marginTop="@dimen/dp_20"
             android:paddingStart="46dp"
             android:paddingEnd="46dp"
             android:paddingTop="@dimen/dp_10"
             android:paddingBottom="@dimen/dp_10"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_message_tip"/>
diff --git a/app/src/main/res/layout/dialog_user_tag.xml b/app/src/main/res/layout/dialog_user_tag.xml
index f82b49e5c..9a0e33c85 100644
--- a/app/src/main/res/layout/dialog_user_tag.xml
+++ b/app/src/main/res/layout/dialog_user_tag.xml
@@ -49,12 +49,12 @@
         android:id="@+id/tvEdit"
         android:text="@string/edit_tag"
         android:textSize="@dimen/sp_14"
-        android:textColor="@color/color_FFFFFF"
+        android:textColor="@color/base_color_theme_text"
         android:textStyle="bold"
         android:gravity="center"
         android:layout_width="130dp"
         android:layout_height="34dp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:layout_marginTop="@dimen/dp_20"
         app:layout_constraintTop_toBottomOf="@+id/mRecyclerView"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml
index 4455c69a8..52cd5452d 100644
--- a/app/src/main/res/layout/fans_list_item_new.xml
+++ b/app/src/main/res/layout/fans_list_item_new.xml
@@ -117,11 +117,11 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/dp_26"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:scaleType="centerCrop"
         android:text="@string/add_attention"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="14sp"
         android:visibility="visible" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_association_room.xml b/app/src/main/res/layout/fragment_association_room.xml
index e2990ce39..bbeebda27 100644
--- a/app/src/main/res/layout/fragment_association_room.xml
+++ b/app/src/main/res/layout/fragment_association_room.xml
@@ -36,13 +36,13 @@
             android:id="@+id/mTvSearch"
             android:text="@string/search"
             android:textSize="@dimen/sp_14"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_color_theme_text"
             android:paddingStart="@dimen/dp_20"
             android:paddingEnd="@dimen/dp_20"
             android:paddingTop="@dimen/dp_3"
             android:paddingBottom="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_3"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:layout_marginTop="@dimen/dp_3"
             android:layout_marginBottom="@dimen/dp_3"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml b/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
index 02396bfd2..78ccaa3cf 100644
--- a/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
+++ b/app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
@@ -11,9 +11,9 @@
         android:layout_height="35dp"
         android:gravity="center"
         android:text="@string/cancel"
-        android:textColor="@color/color_B3B3C3"
+        android:textColor="@color/base_color_negative_text"
         android:layout_marginEnd="@dimen/dp_14"
-        android:background="@drawable/bg_e6e6f0_30"
+        android:background="@drawable/base_shape_negative_30dp"
         android:textSize="15sp" />
 
     <TextView
@@ -22,7 +22,7 @@
         android:layout_height="35dp"
         android:gravity="center"
         android:text="@string/text_ok"
-        android:textColor="@color/white"
-        android:background="@drawable/selector_common_confirm"
+        android:textColor="@color/base_selector_color_theme_btn"
+        android:background="@drawable/base_selector_theme_30dp"
         android:textSize="15sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_attention_in_room.xml b/app/src/main/res/layout/item_attention_in_room.xml
index fb87c0886..cf972ead5 100644
--- a/app/src/main/res/layout/item_attention_in_room.xml
+++ b/app/src/main/res/layout/item_attention_in_room.xml
@@ -23,8 +23,8 @@
         android:layout_height="wrap_content"
         android:textSize="@dimen/dp_11"
         android:layout_marginTop="-9dp"
-        android:textColor="@color/white"
-        android:background="@drawable/bg_common_confirm_30"
+        android:textColor="@color/base_color_theme_text"
+        android:background="@drawable/base_shape_theme_30dp"
         android:paddingLeft="@dimen/dp_5"
         android:paddingRight="@dimen/dp_5"
         android:text="@string/layout_item_attention_in_room_01"/>
diff --git a/app/src/main/res/layout/item_car_garage_normal.xml b/app/src/main/res/layout/item_car_garage_normal.xml
index 356d08cfc..9b284bf81 100644
--- a/app/src/main/res/layout/item_car_garage_normal.xml
+++ b/app/src/main/res/layout/item_car_garage_normal.xml
@@ -62,13 +62,13 @@
                 android:gravity="center"
                 android:textSize="14sp"
                 android:visibility="gone"
-                android:textColor="@color/text_button_color_first"
+                android:textColor="@color/base_color_theme_text"
                 tools:visibility="visible"
                 android:layout_marginEnd="@dimen/dp_15"
                 android:layout_alignTop="@id/tv_car_name"
                 android:layout_alignParentEnd="true"
                 tools:text="@string/label_can_use"
-                tools:background="@drawable/bg_common_confirm_30"/>
+                tools:background="@drawable/base_shape_theme_30dp"/>
 
 
 
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 bd49e9a25..a36c21fa1 100644
--- a/app/src/main/res/layout/item_my_chat_bubble.xml
+++ b/app/src/main/res/layout/item_my_chat_bubble.xml
@@ -22,7 +22,7 @@
             android:layout_height="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="16dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             app:corner="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -77,19 +77,19 @@
             android:layout_width="90dp"
             android:layout_height="24dp"
             android:layout_marginTop="12dp"
-            android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
+            android:background="@{headWearInfo.hasUsed ? @drawable/base_shape_e6e6e6_30dp : @drawable/base_selector_theme_30dp}"
             android:gravity="center"
             android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.hasUsed ? @color/text_button_color_gray : @color/white}"
+            android:textColor="@{headWearInfo.hasUsed ? @color/white : @color/base_selector_color_theme_btn}"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/tv_counters"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_user_card_wear"
-            tools:background="@drawable/selector_common_confirm"
+            tools:background="@drawable/base_selector_theme_30dp"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/white"
+            tools:textColor="@color/base_selector_color_theme_btn"
             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 a2310323c..27a62c5bf 100644
--- a/app/src/main/res/layout/item_my_head_wear.xml
+++ b/app/src/main/res/layout/item_my_head_wear.xml
@@ -61,15 +61,15 @@
             android:layout_alignTop="@id/tv_car_name"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_15"
-            android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
+            android:background="@{headWearInfo.used ? @drawable/base_shape_e6e6e6_30dp : @drawable/base_selector_theme_30dp}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/text_button_color_first}"
+            android:textColor="@{headWearInfo.used ? @color/white : @color/base_selector_color_theme_btn}"
             android:textSize="14sp"
             android:visibility="gone"
-            tools:background="@drawable/selector_common_confirm"
+            tools:background="@drawable/base_selector_theme_30dp"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/text_button_color_first"
+            tools:textColor="@color/base_selector_color_theme_btn"
             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 7dbfb5061..b665a7a4d 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
@@ -25,7 +25,7 @@
             android:layout_height="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="16dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             app:corner="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -72,17 +72,17 @@
             android:layout_alignParentEnd="true"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="@dimen/dp_9"
-            android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
+            android:background="@{headWearInfo.used ? @drawable/base_shape_e6e6e6_30dp : @drawable/base_selector_theme_30dp}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
-            android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/white}"
+            android:textColor="@{headWearInfo.used ? @color/white : @color/base_selector_color_theme_btn}"
             android:textSize="14sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:background="@drawable/selector_common_confirm"
+            tools:background="@drawable/base_selector_theme_30dp"
             tools:text="@string/label_can_use"
-            tools:textColor="@color/white"
+            tools:textColor="@color/base_selector_color_theme_btn"
             tools:visibility="visible" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_room_history.xml b/app/src/main/res/layout/item_room_history.xml
index a9c50bed1..f94fd1239 100644
--- a/app/src/main/res/layout/item_room_history.xml
+++ b/app/src/main/res/layout/item_room_history.xml
@@ -27,11 +27,11 @@
             android:layout_width="38dp"
             android:layout_height="15dp"
             android:layout_gravity="center_horizontal|bottom"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:visibility="gone"
             android:text="@string/layout_item_room_history_01"
             android:gravity="center"
-            android:textColor="@color/white"
+            android:textColor="@color/base_color_theme_text"
             android:textSize="@dimen/dp_11"
             tools:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/item_room_shield.xml b/app/src/main/res/layout/item_room_shield.xml
index 32f3e0b4e..3975bc16b 100644
--- a/app/src/main/res/layout/item_room_shield.xml
+++ b/app/src/main/res/layout/item_room_shield.xml
@@ -76,13 +76,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_12"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:paddingStart="@dimen/dp_14"
         android:paddingTop="@dimen/dp_8"
         android:paddingEnd="@dimen/dp_14"
         android:paddingBottom="@dimen/dp_8"
         android:text="@string/text_unmask"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_agree_apply_dialog.xml b/app/src/main/res/layout/layout_agree_apply_dialog.xml
index 40797b05c..42ecfaa3a 100644
--- a/app/src/main/res/layout/layout_agree_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_agree_apply_dialog.xml
@@ -60,20 +60,20 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_B3B3C3"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="@dimen/sp_14" />
 
     </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 6946b79db..d53c53b3e 100644
--- a/app/src/main/res/layout/layout_anchor_card_view.xml
+++ b/app/src/main/res/layout/layout_anchor_card_view.xml
@@ -115,11 +115,11 @@
         android:layout_height="24dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_layout_anchor_card_view_03"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/layout_close_exchange_dialog.xml b/app/src/main/res/layout/layout_close_exchange_dialog.xml
index 3ca34ef7e..9440b9673 100644
--- a/app/src/main/res/layout/layout_close_exchange_dialog.xml
+++ b/app/src/main/res/layout/layout_close_exchange_dialog.xml
@@ -76,20 +76,20 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_B3B3C3"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="@dimen/sp_14" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_common_dialog.xml b/app/src/main/res/layout/layout_common_dialog.xml
index 327618183..db4c4aaec 100644
--- a/app/src/main/res/layout/layout_common_dialog.xml
+++ b/app/src/main/res/layout/layout_common_dialog.xml
@@ -48,10 +48,10 @@
             android:layout_width="120dp"
             android:layout_height="38dp"
             android:layout_marginStart="@dimen/dp_16"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="@dimen/sp_14" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_exchange_diamond_dialog.xml b/app/src/main/res/layout/layout_exchange_diamond_dialog.xml
index e5b77bd80..7718acf0d 100644
--- a/app/src/main/res/layout/layout_exchange_diamond_dialog.xml
+++ b/app/src/main/res/layout/layout_exchange_diamond_dialog.xml
@@ -94,10 +94,10 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="@dimen/dp_25"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:text="@string/confirm_exchange"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_give_diamond_dialog.xml b/app/src/main/res/layout/layout_give_diamond_dialog.xml
index 4e6c66153..ec3f7b01d 100644
--- a/app/src/main/res/layout/layout_give_diamond_dialog.xml
+++ b/app/src/main/res/layout/layout_give_diamond_dialog.xml
@@ -117,10 +117,10 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="@dimen/dp_25"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:text="@string/dialog_lucky_money_confirm_btn"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15sp" />
 
 </LinearLayout>
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 e1c7e73d5..637db5b4b 100644
--- a/app/src/main/res/layout/layout_ok_cancel_dialog.xml
+++ b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
@@ -38,20 +38,20 @@
             android:layout_width="120dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/text_button_color_gray"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="15sp" />
 
         <TextView
             android:id="@+id/btn_ok"
             android:layout_width="120dp"
             android:layout_height="38dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             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 e2d226f43..22434896c 100644
--- a/app/src/main/res/layout/layout_pic_login_dialog.xml
+++ b/app/src/main/res/layout/layout_pic_login_dialog.xml
@@ -98,9 +98,9 @@
             android:layout_height="38dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/text_button_color_gray"
+            android:textColor="@color/base_color_negative_text"
             android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:textSize="15sp" />
 
         <TextView
@@ -109,8 +109,8 @@
             android:layout_height="38dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
-            android:background="@drawable/selector_common_confirm"
+            android:textColor="@color/base_selector_color_theme_btn"
+            android:background="@drawable/base_selector_theme_30dp"
             android:textSize="15sp" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_refuse_apply_dialog.xml b/app/src/main/res/layout/layout_refuse_apply_dialog.xml
index 439d429b4..a74481fec 100644
--- a/app/src/main/res/layout/layout_refuse_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_refuse_apply_dialog.xml
@@ -75,20 +75,20 @@
             android:layout_width="110dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/bg_common_cancel_30"
+            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:text="@string/cancel"
-            android:textColor="@color/color_B3B3C3"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/text_ok"
-            android:textColor="@color/white"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="@dimen/sp_14" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_item_search.xml b/app/src/main/res/layout/list_item_search.xml
index ff6c31ff2..196b710dd 100644
--- a/app/src/main/res/layout/list_item_search.xml
+++ b/app/src/main/res/layout/list_item_search.xml
@@ -114,14 +114,14 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:gravity="start|center_vertical"
         android:paddingStart="@dimen/dp_16"
         android:paddingTop="@dimen/dp_4"
         android:paddingEnd="@dimen/dp_16"
         android:paddingBottom="@dimen/dp_4"
         android:text="@string/layout_list_item_search_03"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_12"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml b/app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml
index 927931422..6619ae6e7 100644
--- a/app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml
+++ b/app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml
@@ -36,10 +36,10 @@
         android:layout_marginStart="@dimen/dp_22"
         android:layout_marginEnd="@dimen/dp_18"
         android:layout_marginBottom="@dimen/dp_33"
-        android:background="@drawable/shape_round_gray_solid"
+        android:background="@drawable/base_shape_negative_30dp"
         android:gravity="center"
         android:text="@string/text_disagree"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/base_color_negative_text"
         android:textSize="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/tv_agree"
@@ -52,10 +52,10 @@
         android:layout_height="43dp"
         android:layout_marginEnd="@dimen/dp_21"
         android:layout_marginBottom="@dimen/dp_33"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_positive_30dp"
         android:gravity="center"
         android:text="@string/text_agree"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/base_color_positive_text"
         android:textSize="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_bank_card/res/layout/item_association_room.xml b/app/src/module_bank_card/res/layout/item_association_room.xml
index 7bc560538..c94636656 100644
--- a/app/src/module_bank_card/res/layout/item_association_room.xml
+++ b/app/src/module_bank_card/res/layout/item_association_room.xml
@@ -85,9 +85,9 @@
         android:layout_width="70dp"
         android:layout_height="25dp"
         android:layout_marginEnd="@dimen/dp_16"
-        android:background="@drawable/bg_common_confirm_15"
+        android:background="@drawable/base_shape_theme_15dp"
         android:gravity="center"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_12"
         tools:text="@string/have_apply" />
 
diff --git a/app/src/module_community/res/layout/activity_give_gold.xml b/app/src/module_community/res/layout/activity_give_gold.xml
index 21f5538f9..165f4bb86 100644
--- a/app/src/module_community/res/layout/activity_give_gold.xml
+++ b/app/src/module_community/res/layout/activity_give_gold.xml
@@ -48,13 +48,13 @@
             android:id="@+id/mTvSearch"
             android:text="@string/search"
             android:textSize="@dimen/sp_14"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_color_theme_text"
             android:paddingStart="@dimen/dp_20"
             android:paddingEnd="@dimen/dp_20"
             android:paddingTop="@dimen/dp_3"
             android:paddingBottom="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_3"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:layout_marginTop="@dimen/dp_3"
             android:layout_marginBottom="@dimen/dp_3"
             android:layout_width="wrap_content"
diff --git a/app/src/module_community/res/layout/dialog_dating_select.xml b/app/src/module_community/res/layout/dialog_dating_select.xml
index 4fa135136..e8667b428 100644
--- a/app/src/module_community/res/layout/dialog_dating_select.xml
+++ b/app/src/module_community/res/layout/dialog_dating_select.xml
@@ -50,20 +50,20 @@
                 android:layout_width="80dp"
                 android:layout_height="28dp"
                 android:layout_marginEnd="@dimen/dp_13"
-                android:background="@drawable/bg_common_cancel_30"
+                android:background="@drawable/base_shape_negative_30dp"
                 android:gravity="center"
                 android:text="@string/cancel"
-                android:textColor="@color/text_button_color_gray"
+                android:textColor="@color/base_color_negative_text"
                 android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/btn_ok"
                 android:layout_width="80dp"
                 android:layout_height="28dp"
-                android:background="@drawable/bg_common_confirm_30"
+                android:background="@drawable/base_shape_positive_30dp"
                 android:gravity="center"
                 android:text="@string/text_ok"
-                android:textColor="@color/text_button_color_first"
+                android:textColor="@color/base_color_positive_text"
                 android:textSize="15sp" />
         </LinearLayout>
 
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
index 602f59969..9bbe3cde3 100644
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ModuleHallActivity.java
@@ -190,8 +190,8 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
                             binding.tvJoinRoom.setVisibility(View.VISIBLE);
                             binding.tvJoinRoom.setCompoundDrawablePadding(2);
                             binding.tvJoinRoom.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(this, R.drawable.ic_hall_add), null, null, null);
-                            binding.tvJoinRoom.setTextColor(ContextCompat.getColor(this, R.color.color_white));
-                            binding.tvJoinRoom.setBackgroundResource(R.drawable.bg_common_confirm_30);
+                            binding.tvJoinRoom.setTextColor(ContextCompat.getColor(this, R.color.base_color_theme_text));
+                            binding.tvJoinRoom.setBackgroundResource(R.drawable.base_shape_theme_30dp);
                             binding.tvJoinRoom.setText(getString(R.string.join_room));
                         } else if (joinRoomInfo.getHallBtnStatus() == 2) {
                             binding.tvJoinRoom.setVisibility(View.VISIBLE);
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
index 17a8ab50d..37d684f7c 100644
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/AssociationRoomAdapter.java
@@ -51,8 +51,8 @@ public class AssociationRoomAdapter extends BaseQuickAdapter<HallListInfo, BaseV
             tvApply.setVisibility(View.GONE);
         } else if (item.getHallBtnStatus() == 1) {
             tvApply.setVisibility(View.VISIBLE);
-            tvApply.setTextColor(ContextCompat.getColor(mContext,R.color.color_white));
-            tvApply.setBackgroundResource(R.drawable.bg_common_confirm_15);
+            tvApply.setTextColor(ContextCompat.getColor(mContext,R.color.base_color_theme_text));
+            tvApply.setBackgroundResource(R.drawable.base_shape_theme_15dp);
             tvApply.setText(mContext.getString(R.string.apply_join));
         } else if (item.getHallBtnStatus() == 2) {
             tvApply.setVisibility(View.VISIBLE);
diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
index 609fcd221..168ad9cf7 100644
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/adapter/EnableExchangeAdapter.kt
@@ -30,7 +30,7 @@ class EnableExchangeAdapter :
         )
         helper.getView<AppCompatTextView>(R.id.tv_confirm).background = ContextCompat.getDrawable(
             mContext,
-            R.drawable.bg_common_cancel_15
+            R.drawable.base_shape_e6e6e6_15dp
         )
         helper.setText(R.id.tv_confirm, mContext.getString(R.string.close_exchange))
             .setTextColor(R.id.tv_confirm, ContextCompat.getColor(mContext, R.color.color_B3B3C3))
diff --git a/app/src/module_labour_union/res/layout/activity_module_hall.xml b/app/src/module_labour_union/res/layout/activity_module_hall.xml
index c4f0dceb1..0fe760fdd 100644
--- a/app/src/module_labour_union/res/layout/activity_module_hall.xml
+++ b/app/src/module_labour_union/res/layout/activity_module_hall.xml
@@ -301,14 +301,14 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/dp_40"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:drawableStart="@drawable/ic_hall_add"
         android:drawablePadding="@dimen/dp_2"
         android:gravity="center"
         android:paddingStart="@dimen/dp_60"
         android:paddingEnd="@dimen/dp_60"
         android:text="@string/join_room"
-        android:textColor="@color/color_white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_16"
         android:visibility="gone"
         tools:visibility="visible" />
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 6d57f2912..e4ed00977 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
@@ -32,10 +32,10 @@
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:text="@string/layout_activity_super_admin_manege_01"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         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 a1fa67c0c..4c57081db 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
@@ -32,10 +32,10 @@
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:text="@string/layout_activity_super_admin_room_set_01"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_labour_union/res/layout/item_hall_exchange.xml b/app/src/module_labour_union/res/layout/item_hall_exchange.xml
index 551604219..0ea36333f 100644
--- a/app/src/module_labour_union/res/layout/item_hall_exchange.xml
+++ b/app/src/module_labour_union/res/layout/item_hall_exchange.xml
@@ -122,12 +122,12 @@
         android:layout_width="wrap_content"
         android:layout_height="24dp"
         android:layout_marginEnd="@dimen/dp_12"
-        android:background="@drawable/bg_common_confirm_15"
+        android:background="@drawable/base_shape_theme_15dp"
         android:gravity="center"
         android:paddingStart="@dimen/dp_8"
         android:paddingEnd="@dimen/dp_8"
         android:text="@string/open_exchange"
-        android:textColor="@color/white"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="@dimen/sp_13"
         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 429feb626..ebab6cee6 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
@@ -59,12 +59,12 @@
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:layout_marginEnd="15dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_selector_theme_30dp"
         android:gravity="center"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:text="@string/layout_item_search_admin_02"
-        android:textColor="@color/white"
+        android:textColor="@color/base_selector_color_theme_btn"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
index c2ec1596e..83c82fa0b 100644
--- a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
+++ b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
@@ -26,10 +26,10 @@
             android:layout_marginEnd="@dimen/dp_10"
             android:gravity="center"
             android:text="@string/lu_reject"
-            android:textColor="@color/color_6D6B89"
+            android:background="@drawable/base_shape_negative_15dp"
+            android:textColor="@color/base_color_negative_text"
             android:textSize="@dimen/sp_14"
-            app:corner="@dimen/dp_15"
-            app:solid="@color/color_E6E6F0" />
+            app:corner="@dimen/dp_15"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/stv_agree"
@@ -37,9 +37,9 @@
             android:layout_height="@dimen/dp_30"
             android:gravity="center"
             android:text="@string/lu_agree"
-            android:textColor="@color/color_white"
+            android:textColor="@color/base_color_positive_text"
             android:textSize="@dimen/sp_14"
-            android:background="@drawable/bg_common_confirm_15" />
+            android:background="@drawable/base_shape_positive_15dp" />
 
     </LinearLayout>
 
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 f3749abaa..18296f99f 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
@@ -30,10 +30,10 @@
         android:layout_height="38dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bg_common_confirm_30"
+        android:background="@drawable/base_shape_theme_30dp"
         android:gravity="center"
         android:text="@string/label_common_close"
-        android:textColor="@color/text_button_color_first"
+        android:textColor="@color/base_color_theme_text"
         android:textSize="15sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/activity/RoomInviteFansActivity.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/activity/RoomInviteFansActivity.java
index 06ef63ef1..26ab7309c 100644
--- a/app/src/module_room_chat/java/com/chwl/app/room_chat/activity/RoomInviteFansActivity.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/activity/RoomInviteFansActivity.java
@@ -49,18 +49,18 @@ public class RoomInviteFansActivity extends BaseViewBindingActivity<ActivityRoom
                 .subscribe(info -> {
                     binding.tvInviteFansCount.setText(Html.fromHtml(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_01) + "<font color=#FFBC52 font-size=12dp>" + info.getFansNum() + "</font>" + ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_02)));
                     binding.tvInviteFansTimes.setText(Html.fromHtml(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_03) + "<font color=#7662FE font-size=18dp>" + info.getInviteTimes() + "</font>" + ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_04)));
-                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_30));
+                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_theme_30dp));
                     if (info.getInviteInterval() > 0) {
                         if (info.getInviteTimes() > 0) {
                             startCountDownTimer(info.getInviteInterval());
                         } else {
-                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_e6e6e6_30dp));
                             binding.tvInviteFansConfirm.setText(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_05));
                         }
                         binding.tvInviteFansConfirm.setClickable(false);
                     } else {
                         if (info.getInviteTimes() <= 0) {
-                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_e6e6e6_30dp));
                             binding.tvInviteFansConfirm.setText(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_06));
                             binding.tvInviteFansConfirm.setClickable(false);
                             return;
@@ -84,7 +84,7 @@ public class RoomInviteFansActivity extends BaseViewBindingActivity<ActivityRoom
                 .subscribe(info -> {
                     binding.tvInviteFansCount.setText(Html.fromHtml(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_09) + "<font color=#FFBC52 font-size=12dp>" + info.getFansNum() + "</font>" + ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_010)));
                     binding.tvInviteFansTimes.setText(Html.fromHtml(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_011) + "<font color=#7662FE font-size=18dp>" + info.getInviteTimes() + "</font>" + ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_012)));
-                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_30));
+                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_theme_30dp));
                     if (info.getInviteInterval() > 0) {
                         binding.tvInviteFansConfirm.setClickable(false);
                         if (info.getInviteTimes() > 0) {
@@ -92,12 +92,12 @@ public class RoomInviteFansActivity extends BaseViewBindingActivity<ActivityRoom
                             SingleToastUtil.showToastShort(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_013));
                         } else {
                             stopCountDownTimer();
-                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_e6e6e6_30dp));
                             binding.tvInviteFansConfirm.setText(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_014));
                         }
                     } else {
                         if (info.getInviteTimes() <= 0) {
-                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.base_shape_e6e6e6_30dp));
                             binding.tvInviteFansConfirm.setText(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_015));
                             binding.tvInviteFansConfirm.setClickable(false);
                             return;
diff --git a/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java b/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
index 66391cf2b..b8345ac7a 100644
--- a/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
+++ b/app/src/module_room_chat/java/com/chwl/app/room_chat/utils/InViteFansTimer.java
@@ -39,14 +39,14 @@ public class InViteFansTimer extends CountDownTimer {
 
     @Override
     public void onFinish() {
-        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.bg_common_confirm_30));
+        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.base_shape_theme_30dp));
         tvInvite.setText(Html.fromHtml(ResUtil.getString(R.string.room_chat_utils_invitefanstimer_01)));
         tvInvite.setClickable(true);//重新获得点击
 
     }
 
     private String inviteInterval(int timeSecond){
-        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.bg_common_cancel_30));
+        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.base_shape_e6e6e6_30dp));
         return (timeSecond / 60) + ResUtil.getString(R.string.room_chat_utils_invitefanstimer_02) + (timeSecond % 60) + ResUtil.getString(R.string.room_chat_utils_invitefanstimer_03);
     }
 
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 68acdd06e..d9db0006d 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
@@ -53,10 +53,10 @@
             android:layout_height="@dimen/dp_38"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/dp_20"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/layout_activity_newbie_message_03"
-            android:textColor="@color/text_title_color"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="14sp" />
 
     </LinearLayout>
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 c71b821d8..204ff20c9 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
@@ -69,8 +69,8 @@
             android:id="@+id/tv_invite_fans_confirm"
             android:layout_width="160dp"
             android:layout_height="38dp"
-            android:background="@drawable/selector_common_confirm"
-            android:textColor="@color/text_title_color"
+            android:background="@drawable/base_selector_theme_30dp"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:gravity="center"
             android:layout_marginTop="@dimen/dp_35"
             android:layout_gravity="center_horizontal"
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 9033f8ad6..f75811159 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
@@ -58,8 +58,8 @@
             android:text="@string/layout_activity_room_newbie_message_03"
             android:gravity="center"
             android:textSize="14sp"
-            android:textColor="@color/white"
-            android:background="@drawable/selector_common_confirm"
+            android:textColor="@color/base_selector_color_theme_btn"
+            android:background="@drawable/base_selector_theme_30dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/dp_20"
             />
diff --git a/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml b/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
index c7c7ac4c1..2169730c4 100644
--- a/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
+++ b/app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
@@ -149,10 +149,10 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="40dp"
             android:layout_marginBottom="45dp"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_selector_theme_30dp"
             android:gravity="center"
             android:text="@string/layout_dialog_newbie_filter_010"
-            android:textColor="#ffffffff"
+            android:textColor="@color/base_selector_color_theme_btn"
             android:textSize="14sp" />
 
     </LinearLayout>
diff --git a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
index c60fc29d1..ac297909d 100644
--- a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
+++ b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
@@ -73,9 +73,9 @@
             android:layout_height="34dp"
             android:layout_marginTop="@dimen/dp_30"
             android:scaleType="center"
-            android:background="@drawable/bg_common_confirm_30"
+            android:background="@drawable/base_shape_theme_30dp"
             android:text="@string/layout_dialog_erban_update_01"
-            android:textColor="@color/white"
+            android:textColor="@color/base_color_theme_text"
             android:textSize="@dimen/sp_14"
             app:layout_constraintTop_toBottomOf="@+id/tv_update_dialog_content"
             app:layout_constraintBottom_toTopOf="@+id/tvLater"
diff --git a/modules/module_base/src/main/res/color/base_selector_color_theme_btn.xml b/modules/module_base/src/main/res/color/base_selector_color_theme_btn.xml
index b19405230..d9ca6e698 100644
--- a/modules/module_base/src/main/res/color/base_selector_color_theme_btn.xml
+++ b/modules/module_base/src/main/res/color/base_selector_color_theme_btn.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#1E1E1F" android:state_pressed="true" />
+    <item android:color="#1E1E1F" android:state_focused="true" />
     <item android:color="#1E1E1F" android:state_enabled="true" />
     <item android:color="#FFFFFF" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_selector_theme_15dp.xml b/modules/module_base/src/main/res/drawable/base_selector_theme_15dp.xml
new file mode 100644
index 000000000..0e6e29781
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_selector_theme_15dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/base_shape_theme_15dp" android:state_pressed="true" />
+    <item android:drawable="@drawable/base_shape_theme_15dp" android:state_focused="true" />
+    <item android:drawable="@drawable/base_shape_theme_15dp" android:state_enabled="true" />
+    <item android:drawable="@drawable/base_shape_e6e6e6_15dp" android:state_enabled="false" />
+
+</selector>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_selector_theme_26dp.xml b/modules/module_base/src/main/res/drawable/base_selector_theme_26dp.xml
index 182bb8fde..591ffa846 100644
--- a/modules/module_base/src/main/res/drawable/base_selector_theme_26dp.xml
+++ b/modules/module_base/src/main/res/drawable/base_selector_theme_26dp.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/base_shape_theme_26dp" android:state_pressed="true" />
+    <item android:drawable="@drawable/base_shape_theme_26dp" android:state_focused="true" />
     <item android:drawable="@drawable/base_shape_theme_26dp" android:state_enabled="true" />
     <item android:drawable="@drawable/base_shape_e6e6e6_26dp" android:state_enabled="false" />
 
diff --git a/modules/module_base/src/main/res/drawable/base_selector_theme_30dp.xml b/modules/module_base/src/main/res/drawable/base_selector_theme_30dp.xml
new file mode 100644
index 000000000..9d1353f47
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_selector_theme_30dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/base_shape_theme_30dp" android:state_pressed="true" />
+    <item android:drawable="@drawable/base_shape_theme_30dp" android:state_focused="true" />
+    <item android:drawable="@drawable/base_shape_theme_30dp" android:state_enabled="true" />
+    <item android:drawable="@drawable/base_shape_e6e6e6_30dp" android:state_enabled="false" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_cancel_15.xml b/modules/module_base/src/main/res/drawable/base_shape_e6e6e6_15dp.xml
similarity index 59%
rename from app/src/main/res/drawable/bg_common_cancel_15.xml
rename to modules/module_base/src/main/res/drawable/base_shape_e6e6e6_15dp.xml
index 05adbde19..00328db8f 100644
--- a/app/src/main/res/drawable/bg_common_cancel_15.xml
+++ b/modules/module_base/src/main/res/drawable/base_shape_e6e6e6_15dp.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <solid android:color="@color/color_E6E6F0" />
-    <corners android:radius="@dimen/dp_15" />
-
+    <solid android:color="#E6E6E6" />
+    <corners android:radius="15dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_cancel_30.xml b/modules/module_base/src/main/res/drawable/base_shape_e6e6e6_30dp.xml
similarity index 59%
rename from app/src/main/res/drawable/bg_common_cancel_30.xml
rename to modules/module_base/src/main/res/drawable/base_shape_e6e6e6_30dp.xml
index 736026f2b..5f3b28bba 100644
--- a/app/src/main/res/drawable/bg_common_cancel_30.xml
+++ b/modules/module_base/src/main/res/drawable/base_shape_e6e6e6_30dp.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <solid android:color="@color/color_E6E6F0" />
-    <corners android:radius="@dimen/dp_30" />
-
+    <solid android:color="#E6E6E6" />
+    <corners android:radius="30dp" />
 </shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_negative_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_negative_15dp.xml
new file mode 100644
index 000000000..3d52fe581
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_negative_15dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#1E1E1F" />
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_negative_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_negative_30dp.xml
new file mode 100644
index 000000000..3d52fe581
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_negative_30dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#1E1E1F" />
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml
new file mode 100644
index 000000000..3edc5cd2b
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/base_color_theme" />
+    <corners android:radius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml
new file mode 100644
index 000000000..405aa9a27
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/base_color_theme" />
+    <corners android:radius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml
new file mode 100644
index 000000000..3edc5cd2b
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/base_color_theme" />
+    <corners android:radius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml
new file mode 100644
index 000000000..405aa9a27
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/base_color_theme" />
+    <corners android:radius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/values/colors.xml b/modules/module_base/src/main/res/values/colors.xml
index 80525ab7a..6e6a276ce 100644
--- a/modules/module_base/src/main/res/values/colors.xml
+++ b/modules/module_base/src/main/res/values/colors.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--主题色-->
     <color name="base_color_theme">#CBFF00</color>
+
+    <!--主题色对应的文本色-->
+    <color name="base_color_theme_text">#1E1E1F</color>
+
+    <!--正面按钮-文本色-->
+    <color name="base_color_positive_text">#1E1E1F</color>
+
+    <!--负面按钮-文本色-->
+    <color name="base_color_negative_text">#1E1E1F</color>
 </resources>