diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
index 36146b45a..252b18979 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
@@ -79,19 +79,19 @@ 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_disable);
+            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
             tvUsed.setEnabled(false);
             tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
         } else if (isUsing) {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_03));
-            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel);
+            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
             tvUsed.setEnabled(true);
             tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1));
         } else {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
-            tvUsed.setBackgroundResource(R.drawable.bg_common_confirm);
+            tvUsed.setBackgroundResource(R.drawable.selector_common_confirm);
             tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_color));
             tvUsed.setEnabled(true);
         }
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
index d9dc094a5..37d8d5fb6 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
@@ -36,7 +36,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
 
         //使用按钮
         TextView tvUsed = helper.getView(R.id.tv_used);
-        tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel : R.drawable.bg_common_confirm);
+        tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel_30 : R.drawable.selector_common_confirm);
         tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_4C5AF1) :
                 mContext.getResources().getColor(R.color.white));
         tvUsed.setText(item.isUsing() ? R.string.label_used : R.string.label_can_use);
@@ -45,7 +45,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
             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_disable);
+            tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mynameplateadapter_01));
             tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
         } else {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
index 6f524f897..524a61ec5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
@@ -97,10 +97,10 @@ 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_normal);
+            mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_30);
             mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_color));
         } else {
-            mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_disable);
+            mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_cancel_30);
             mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
         }
     }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
index 59fc038bf..533642b1d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
@@ -83,10 +83,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_disable);
+            tvAttention.setBackgroundResource(R.drawable.bg_common_cancel_30);
         } else {
             tvAttention.setText(ResUtil.getString(R.string.relation_adapter_fansviewadapter_02));
-            tvAttention.setBackgroundResource(R.drawable.bg_common_confirm);
+            tvAttention.setBackgroundResource(R.drawable.selector_common_confirm);
         }
 
         AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
index e703cc38a..c963e06f2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
@@ -73,7 +73,7 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
                 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_normal));
+                holder.stvOp.setBackground(ContextCompat.getDrawable(context, R.drawable.bg_common_confirm_30));
             } 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_cancel.xml b/app/src/main/res/drawable/bg_common_cancel.xml
deleted file mode 100644
index 6e0d8aa2b..000000000
--- a/app/src/main/res/drawable/bg_common_cancel.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="100dp" />
-    <gradient
-        android:angle="180"
-        android:endColor="#FFA936"
-        android:startColor="#FFCB47"
-        android:type="linear"
-        android:useLevel="true" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_disable.xml b/app/src/main/res/drawable/bg_common_cancel_30.xml
similarity index 59%
rename from app/src/main/res/drawable/bg_common_disable.xml
rename to app/src/main/res/drawable/bg_common_cancel_30.xml
index b3d2d20e9..a170e6a5c 100644
--- a/app/src/main/res/drawable/bg_common_disable.xml
+++ b/app/src/main/res/drawable/bg_common_cancel_30.xml
@@ -1,9 +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/bg_disable_303043" />
-
-    <corners android:radius="100dp" />
-
+    <corners android:radius="@dimen/dp_30" />
+    <solid android:color="@color/color_E6E6F0"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm.xml b/app/src/main/res/drawable/bg_common_confirm.xml
deleted file mode 100644
index 9f60c2428..000000000
--- a/app/src/main/res/drawable/bg_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_press" android:state_pressed="true" />
-    <item android:drawable="@drawable/bg_common_confirm_press" android:state_focused="true" />
-    <item android:drawable="@drawable/bg_common_confirm_normal" android:state_enabled="true" />
-    <item android:drawable="@drawable/bg_common_disable" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm_normal.xml b/app/src/main/res/drawable/bg_common_confirm_normal.xml
deleted file mode 100644
index 060b3dcd8..000000000
--- a/app/src/main/res/drawable/bg_common_confirm_normal.xml
+++ /dev/null
@@ -1,13 +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="#19EBFF"
-        android:startColor="#ED66FF"
-        android:type="linear"
-        android:useLevel="true" />
-    <corners android:radius="28dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_common_confirm_press.xml b/app/src/main/res/drawable/bg_common_confirm_press.xml
deleted file mode 100644
index b7a78555f..000000000
--- a/app/src/main/res/drawable/bg_common_confirm_press.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="#19EBFF"
-        android:startColor="#ED66FF"
-        android:type="linear"
-        android:useLevel="true" />
-    <corners android:radius="28dp" />
-
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_common_button.xml b/app/src/main/res/drawable/selector_common_button.xml
deleted file mode 100644
index 74206581d..000000000
--- a/app/src/main/res/drawable/selector_common_button.xml
+++ /dev/null
@@ -1,6 +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_normal" android:state_enabled="true" />
-
-    <item android:drawable="@drawable/shape_dbdbdb_100dp" android:state_enabled="false" />
-</selector>
\ 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
new file mode 100644
index 000000000..a7e4575a1
--- /dev/null
+++ b/app/src/main/res/drawable/selector_common_confirm.xml
@@ -0,0 +1,7 @@
+<?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 64f56a4af..7a7a58519 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -107,7 +107,7 @@
         android:layout_marginTop="124dp"
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/ui_setting_verifyphoneactivity_011"
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 535a9e53f..f89bd5ce2 100644
--- a/app/src/main/res/layout/activity_bind_withdraw_msg.xml
+++ b/app/src/main/res/layout/activity_bind_withdraw_msg.xml
@@ -331,7 +331,7 @@
                 android:layout_marginStart="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_50"
                 android:layout_marginEnd="@dimen/dp_15"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 android:enabled="false"
                 android:gravity="center"
                 android:text="@string/save"
diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml
index c1da7b9d8..320c7e7be 100644
--- a/app/src/main/res/layout/activity_binder_alipay.xml
+++ b/app/src/main/res/layout/activity_binder_alipay.xml
@@ -167,7 +167,7 @@
         android:layout_marginLeft="32dp"
         android:layout_marginTop="30dp"
         android:layout_marginRight="32dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:clickable="true"
         android:text="@string/layout_activity_binder_alipay_08"
         android:textColor="@color/white"
@@ -180,7 +180,7 @@
         android:layout_marginLeft="32dp"
         android:layout_marginTop="30dp"
         android:layout_marginRight="32dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:clickable="true"
         android:text="@string/layout_activity_binder_alipay_09"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml
index 3ff384ee9..e6795761e 100644
--- a/app/src/main/res/layout/activity_charge.xml
+++ b/app/src/main/res/layout/activity_charge.xml
@@ -103,7 +103,7 @@
                 android:layout_marginTop="@dimen/dp_25"
                 android:layout_marginEnd="@dimen/dp_16"
                 android:layout_marginBottom="@dimen/dp_18"
-                android:background="@drawable/bg_common_confirm_normal"
+                android:background="@drawable/bg_common_confirm_30"
                 android:gravity="center"
                 android:text="@string/charge_confirm_charge"
                 android:textColor="@color/white"
diff --git a/app/src/main/res/layout/activity_convert_diamond.xml b/app/src/main/res/layout/activity_convert_diamond.xml
index 4f38972a7..36bfa1f62 100644
--- a/app/src/main/res/layout/activity_convert_diamond.xml
+++ b/app/src/main/res/layout/activity_convert_diamond.xml
@@ -175,7 +175,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_50"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         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 659e43201..80afd72a4 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -437,7 +437,7 @@
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="20dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/ok"
             android:textColor="@color/color_FFFFFF" />
@@ -457,7 +457,7 @@
                 android:layout_height="40dp"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 android:gravity="center"
                 android:text="@string/recreate_pk"
                 android:textColor="@color/color_FFFFFF" />
@@ -470,7 +470,7 @@
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="@dimen/dp_15"
-                android:background="@drawable/bg_common_disable"
+                android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/close_pk_mode"
                 android:textColor="@color/text_secondary_4f516a" />
diff --git a/app/src/main/res/layout/activity_decoration_store.xml b/app/src/main/res/layout/activity_decoration_store.xml
index 19c2706a4..9a4457cc8 100644
--- a/app/src/main/res/layout/activity_decoration_store.xml
+++ b/app/src/main/res/layout/activity_decoration_store.xml
@@ -83,7 +83,7 @@
             android:layout_width="72dp"
             android:layout_height="24dp"
             android:text="@string/layout_activity_decoration_store_02"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:layout_marginEnd="15dp"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/activity_earn_withdraw.xml b/app/src/main/res/layout/activity_earn_withdraw.xml
index 8d7c6c9a4..c5ff5980c 100644
--- a/app/src/main/res/layout/activity_earn_withdraw.xml
+++ b/app/src/main/res/layout/activity_earn_withdraw.xml
@@ -226,7 +226,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_50"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/immediate_cash_withdrawal"
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 46cabc139..ce4098980 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -64,7 +64,7 @@
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="45dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:text="@string/layout_activity_feedback_04"
         android:textColor="@color/text_title_color"
         android:textSize="15sp" />
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 e114e3a7e..ebf5205dd 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,7 +277,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="50dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_button"
+        android:background="@drawable/selector_common_confirm"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/sure"
diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml
index 84bf29013..ed858777e 100644
--- a/app/src/main/res/layout/activity_modify_pwd.xml
+++ b/app/src/main/res/layout/activity_modify_pwd.xml
@@ -96,7 +96,7 @@
             android:layout_marginTop="50dp"
             android:layout_marginEnd="32dp"
             android:enabled="false"
-            android:background="@drawable/selector_common_button"
+            android:background="@drawable/selector_common_confirm"
             android:onClick="@{click}"
             android:text="@string/layout_activity_modify_pwd_07"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml
index b80f8e467..9986da869 100644
--- a/app/src/main/res/layout/activity_patriarch_mode.xml
+++ b/app/src/main/res/layout/activity_patriarch_mode.xml
@@ -99,7 +99,7 @@
             android:layout_marginTop="100dp"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_mode_06"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:textColor="@color/color_7154EE"
             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 9aaa2a0bc..df8ea0aa0 100644
--- a/app/src/main/res/layout/activity_patriarch_pwd.xml
+++ b/app/src/main/res/layout/activity_patriarch_pwd.xml
@@ -75,7 +75,7 @@
             android:layout_height="45dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="105dp"
-            android:background="@drawable/bg_common_disable"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/layout_activity_patriarch_pwd_02"
             android:textColor="@color/text_secondary_4f516a"
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 56c73f789..e51b2c065 100644
--- a/app/src/main/res/layout/activity_reset_login_pwd.xml
+++ b/app/src/main/res/layout/activity_reset_login_pwd.xml
@@ -116,7 +116,7 @@
             android:layout_marginStart="15dp"
             android:layout_marginTop="50dp"
             android:layout_marginEnd="15dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:enabled="false"
             android:gravity="center"
             android:text="@string/layout_activity_reset_login_pwd_04"
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 4836e71f6..148785d01 100644
--- a/app/src/main/res/layout/activity_room_title_edit.xml
+++ b/app/src/main/res/layout/activity_room_title_edit.xml
@@ -93,7 +93,7 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:layout_marginBottom="20dp"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 android:gravity="center"
                 android:text="@string/text_ok"
                 android:textColor="@color/text_title_color"
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 23bf78120..41dbb7660 100644
--- a/app/src/main/res/layout/activity_show_bind_phone.xml
+++ b/app/src/main/res/layout/activity_show_bind_phone.xml
@@ -56,7 +56,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="48dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/layout_activity_show_bind_phone_02"
         android:textColor="@color/color_white"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 178cbc56d..bf41de2a0 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -45,7 +45,7 @@
             android:layout_height="45dp"
             android:layout_gravity="center_horizontal|bottom"
             android:layout_marginBottom="50dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/layout_activity_splash_01"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 8edf5b2be..9768086ff 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -324,7 +324,7 @@
                                     android:layout_width="98dp"
                                     android:layout_height="@dimen/dp_28"
                                     android:layout_marginEnd="@dimen/dp_15"
-                                    android:background="@drawable/bg_common_confirm_normal"
+                                    android:background="@drawable/bg_common_confirm_30"
                                     android:gravity="center_vertical"
                                     android:orientation="horizontal"
                                     android:visibility="gone"
@@ -368,7 +368,7 @@
                                     android:layout_width="98dp"
                                     android:layout_height="@dimen/dp_28"
                                     android:layout_marginEnd="@dimen/dp_15"
-                                    android:background="@drawable/bg_common_confirm_normal"
+                                    android:background="@drawable/bg_common_confirm_30"
                                     android:gravity="center_vertical"
                                     android:orientation="horizontal"
                                     android:visibility="gone">
diff --git a/app/src/main/res/layout/activity_verify_phone.xml b/app/src/main/res/layout/activity_verify_phone.xml
index 78da3a022..690020407 100644
--- a/app/src/main/res/layout/activity_verify_phone.xml
+++ b/app/src/main/res/layout/activity_verify_phone.xml
@@ -107,7 +107,7 @@
         android:layout_marginTop="124dp"
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:enabled="false"
         android:gravity="center"
         android:text="@string/layout_activity_login_phone_04"
diff --git a/app/src/main/res/layout/dialog_attention_hint.xml b/app/src/main/res/layout/dialog_attention_hint.xml
index 581e9aefa..3d03ad109 100644
--- a/app/src/main/res/layout/dialog_attention_hint.xml
+++ b/app/src/main/res/layout/dialog_attention_hint.xml
@@ -47,7 +47,7 @@
     <TextView
         android:id="@+id/tv_attention"
         android:layout_width="225dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:layout_height="30dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="40dp"
diff --git a/app/src/main/res/layout/dialog_bind_success.xml b/app/src/main/res/layout/dialog_bind_success.xml
index f60df47a9..2a2b17fad 100644
--- a/app/src/main/res/layout/dialog_bind_success.xml
+++ b/app/src/main/res/layout/dialog_bind_success.xml
@@ -31,7 +31,7 @@
         android:textColor="@color/white"
         android:layout_marginTop="22dp"
         android:layout_marginBottom="22dp"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         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 7d5eccf72..86f76e95e 100644
--- a/app/src/main/res/layout/dialog_buy_decoration.xml
+++ b/app/src/main/res/layout/dialog_buy_decoration.xml
@@ -29,7 +29,7 @@
         android:text="@string/label_common_close"
         android:textColor="@color/color_7154EE"
         android:textSize="15sp"
-        android:background="@drawable/bg_common_cancel"
+        android:background="@drawable/bg_common_cancel_30"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"/>
diff --git a/app/src/main/res/layout/dialog_charge.xml b/app/src/main/res/layout/dialog_charge.xml
index 5e5032fa7..7f13a3058 100644
--- a/app/src/main/res/layout/dialog_charge.xml
+++ b/app/src/main/res/layout/dialog_charge.xml
@@ -198,7 +198,7 @@
             android:layout_marginStart="60dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="@dimen/dp_60"
-            android:background="@drawable/bg_common_confirm_normal"
+            android:background="@drawable/bg_common_confirm_30"
             android:gravity="center"
             android:text="@string/layout_dialog_charge_07"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/dialog_common_edit.xml b/app/src/main/res/layout/dialog_common_edit.xml
index 3cc8836e2..6b8073f9f 100644
--- a/app/src/main/res/layout/dialog_common_edit.xml
+++ b/app/src/main/res/layout/dialog_common_edit.xml
@@ -52,7 +52,7 @@
         android:layout_width="120dp"
         android:layout_height="38dp"
         android:layout_marginStart="@dimen/dp_19"
-        android:background="@drawable/bg_common_cancel"
+        android:background="@drawable/bg_common_cancel_30"
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_03"
         android:layout_marginEnd="@dimen/dp_5"
@@ -66,7 +66,7 @@
         android:layout_marginStart="12dp"
         android:layout_width="120dp"
         android:layout_height="38dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/layout_dialog_common_edit_04"
         android:textColor="@color/text_title_color" />
diff --git a/app/src/main/res/layout/dialog_exit_room.xml b/app/src/main/res/layout/dialog_exit_room.xml
index 852fd35ed..55a9bbba3 100644
--- a/app/src/main/res/layout/dialog_exit_room.xml
+++ b/app/src/main/res/layout/dialog_exit_room.xml
@@ -98,7 +98,7 @@
                 android:layout_width="100dp"
                 android:layout_height="30dp"
                 android:layout_marginTop="13dp"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 android:gravity="center"
                 android:text="@string/layout_dialog_exit_room_06"
                 android:textColor="@color/white"
diff --git a/app/src/main/res/layout/dialog_family_join.xml b/app/src/main/res/layout/dialog_family_join.xml
index f0a4cc5fd..d0381a94d 100644
--- a/app/src/main/res/layout/dialog_family_join.xml
+++ b/app/src/main/res/layout/dialog_family_join.xml
@@ -60,7 +60,7 @@
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_7154EE"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:textSize="15sp"
             android:layout_marginEnd="2.5dp"
             android:layout_marginStart="5dp"/>
@@ -73,7 +73,7 @@
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             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 aa0fbf9ad..944054cfe 100644
--- a/app/src/main/res/layout/dialog_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_mic_queue.xml
@@ -100,7 +100,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:singleLine="true"
             android:textColor="@color/color_white"
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 b733ae39d..1018eb3b0 100644
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -142,7 +142,7 @@
                 android:singleLine="true"
                 android:textColor="@color/text_secondary_4f516a"
                 android:textSize="16sp"
-                android:background="@drawable/bg_common_disable"
+                android:background="@drawable/bg_common_cancel_30"
                 android:text="@string/cancel_mic_queue"
                 android:visibility="gone" />
 
@@ -155,7 +155,7 @@
                 android:singleLine="true"
                 android:textColor="@color/color_FFFFFF"
                 android:textSize="16sp"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 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 2560baa6c..377d8b612 100644
--- a/app/src/main/res/layout/dialog_pk_select_people.xml
+++ b/app/src/main/res/layout/dialog_pk_select_people.xml
@@ -18,7 +18,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         android:gravity="center"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:text="@string/ok"
         android:textColor="@color/text_title_color"
         android:textSize="15dp" />
diff --git a/app/src/main/res/layout/dialog_privacy_agreement.xml b/app/src/main/res/layout/dialog_privacy_agreement.xml
index 88f6724ba..1dfbad99b 100644
--- a/app/src/main/res/layout/dialog_privacy_agreement.xml
+++ b/app/src/main/res/layout/dialog_privacy_agreement.xml
@@ -62,7 +62,7 @@
         android:layout_height="36dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="center"
         android:minHeight="50dp"
         android:text="@string/layout_dialog_privacy_agreement_01"
diff --git a/app/src/main/res/layout/dialog_protocol_update.xml b/app/src/main/res/layout/dialog_protocol_update.xml
index 68058ed21..34d783cad 100644
--- a/app/src/main/res/layout/dialog_protocol_update.xml
+++ b/app/src/main/res/layout/dialog_protocol_update.xml
@@ -52,7 +52,7 @@
                 android:layout_marginTop="@dimen/dp_20"
                 android:layout_marginBottom="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_common_cancel"
+                android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/layout_dialog_protocol_update_02"
                 android:textColor="@color/color_7154EE"
@@ -67,7 +67,7 @@
                 android:layout_marginEnd="20dp"
                 android:layout_marginBottom="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_common_confirm_normal"
+                android:background="@drawable/bg_common_confirm_30"
                 android:gravity="center"
                 android:text="@string/layout_dialog_protocol_update_03"
                 android:textColor="@color/white"
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 88b69451f..32d287da1 100644
--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -113,7 +113,7 @@
                     android:layout_width="120dp"
                     android:layout_height="38dp"
                     android:layout_marginEnd="@dimen/dp_16"
-                    android:background="@drawable/bg_common_cancel"
+                    android:background="@drawable/bg_common_cancel_30"
                     android:gravity="center"
                     android:text="@string/cancel"
                     android:textColor="@color/color_7154EE"
@@ -123,7 +123,7 @@
                     android:id="@+id/btn_ok"
                     android:layout_width="120dp"
                     android:layout_height="38dp"
-                    android:background="@drawable/bg_common_confirm"
+                    android:background="@drawable/selector_common_confirm"
                     android:gravity="center"
                     android:text="@string/text_ok"
                     android:textColor="@color/white"
diff --git a/app/src/main/res/layout/dialog_recommend_room.xml b/app/src/main/res/layout/dialog_recommend_room.xml
index 5cdb9f45f..4a2c5f763 100644
--- a/app/src/main/res/layout/dialog_recommend_room.xml
+++ b/app/src/main/res/layout/dialog_recommend_room.xml
@@ -55,7 +55,7 @@
             android:layout_width="180dp"
             android:layout_height="40dp"
             android:layout_marginTop="24dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/layout_dialog_recommend_room_03"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/dialog_request_upmic.xml b/app/src/main/res/layout/dialog_request_upmic.xml
index e1bc23566..c538abfb8 100644
--- a/app/src/main/res/layout/dialog_request_upmic.xml
+++ b/app/src/main/res/layout/dialog_request_upmic.xml
@@ -63,7 +63,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_38"
             android:layout_marginLeft="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_7154EE"
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 24072a355..c7bdffef0 100644
--- a/app/src/main/res/layout/dialog_room_free_gift.xml
+++ b/app/src/main/res/layout/dialog_room_free_gift.xml
@@ -70,7 +70,7 @@
             android:layout_marginStart="88dp"
             android:layout_marginEnd="88dp"
             android:layout_marginBottom="@dimen/dp_20"
-            android:background="@drawable/bg_common_confirm_normal"
+            android:background="@drawable/bg_common_confirm_30"
             android:gravity="center"
             android:onClick="@{click}"
             android:text="@string/dialog_free_gift_know"
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 87a6c889c..309f17f56 100644
--- a/app/src/main/res/layout/dialog_room_pk_received.xml
+++ b/app/src/main/res/layout/dialog_room_pk_received.xml
@@ -121,7 +121,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="25dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/bg_common_disable"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_08"
@@ -136,7 +136,7 @@
             android:layout_width="110dp"
             android:layout_height="35dp"
             android:layout_marginEnd="16dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_09"
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 013fbe734..893347ac5 100644
--- a/app/src/main/res/layout/dialog_select_pay_type.xml
+++ b/app/src/main/res/layout/dialog_select_pay_type.xml
@@ -106,7 +106,7 @@
             android:layout_marginStart="15dp"
             android:layout_marginTop="40dp"
             android:layout_marginBottom="15dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/layout_dialog_select_pay_type_05"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/dialog_task.xml b/app/src/main/res/layout/dialog_task.xml
index bb95d517f..049a376ca 100644
--- a/app/src/main/res/layout/dialog_task.xml
+++ b/app/src/main/res/layout/dialog_task.xml
@@ -34,7 +34,7 @@
             android:layout_marginBottom="17dp"
             android:textColor="@color/color_7154EE"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:textSize="15sp" />
 
     </LinearLayout>
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 c83522f3b..dc76e7d71 100644
--- a/app/src/main/res/layout/fans_list_item_new.xml
+++ b/app/src/main/res/layout/fans_list_item_new.xml
@@ -120,7 +120,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/dp_26"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:scaleType="centerCrop"
         android:text="@string/add_attention"
diff --git a/app/src/main/res/layout/fragment_add_user_info.xml b/app/src/main/res/layout/fragment_add_user_info.xml
index 9d0f57407..855e03085 100644
--- a/app/src/main/res/layout/fragment_add_user_info.xml
+++ b/app/src/main/res/layout/fragment_add_user_info.xml
@@ -211,7 +211,7 @@
         android:layout_width="165dp"
         android:layout_height="63dp"
         android:layout_marginBottom="@dimen/dp_50"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:text="@string/layout_fragment_add_user_info_04"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_15"
diff --git a/app/src/main/res/layout/fragment_association_room.xml b/app/src/main/res/layout/fragment_association_room.xml
index 8ee4b31f0..e2990ce39 100644
--- a/app/src/main/res/layout/fragment_association_room.xml
+++ b/app/src/main/res/layout/fragment_association_room.xml
@@ -42,7 +42,7 @@
             android:paddingTop="@dimen/dp_3"
             android:paddingBottom="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_3"
-            android:background="@drawable/bg_common_confirm_press"
+            android:background="@drawable/bg_common_confirm_30"
             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/fragment_dialog_room_title.xml b/app/src/main/res/layout/fragment_dialog_room_title.xml
index 4971b2b51..532fab674 100644
--- a/app/src/main/res/layout/fragment_dialog_room_title.xml
+++ b/app/src/main/res/layout/fragment_dialog_room_title.xml
@@ -47,7 +47,7 @@
             android:text="@string/close"
             android:gravity="center"
             android:layout_marginBottom="15dp"
-            android:background="@drawable/bg_common_cancel" />
+            android:background="@drawable/bg_common_cancel_30" />
 
     </RelativeLayout>
 
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 577a19984..47d64ae54 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
@@ -23,6 +23,6 @@
         android:gravity="center"
         android:text="@string/text_ok"
         android:textColor="@color/white"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         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 326139b52..151b9cdb5 100644
--- a/app/src/main/res/layout/item_attention_in_room.xml
+++ b/app/src/main/res/layout/item_attention_in_room.xml
@@ -24,7 +24,7 @@
         android:textSize="@dimen/dp_11"
         android:layout_marginTop="-9dp"
         android:textColor="@color/white"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         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 d0387c09f..aacd5818e 100644
--- a/app/src/main/res/layout/item_car_garage_normal.xml
+++ b/app/src/main/res/layout/item_car_garage_normal.xml
@@ -68,7 +68,7 @@
                 android:layout_alignTop="@id/tv_car_name"
                 android:layout_alignParentEnd="true"
                 tools:text="@string/label_can_use"
-                tools:background="@drawable/bg_common_confirm"/>
+                tools:background="@drawable/selector_common_confirm"/>
 
 
 
diff --git a/app/src/main/res/layout/item_decoration_common.xml b/app/src/main/res/layout/item_decoration_common.xml
index 929772041..e9bf8002c 100644
--- a/app/src/main/res/layout/item_decoration_common.xml
+++ b/app/src/main/res/layout/item_decoration_common.xml
@@ -75,7 +75,7 @@
         android:layout_height="24dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_cancel"
+        android:background="@drawable/bg_common_cancel_30"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_03"
@@ -92,7 +92,7 @@
         android:layout_width="72dp"
         android:layout_height="24dp"
         android:layout_marginStart="6dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_04"
diff --git a/app/src/main/res/layout/item_decoration_user_card.xml b/app/src/main/res/layout/item_decoration_user_card.xml
index 1b8e7387c..6ff6b650e 100644
--- a/app/src/main/res/layout/item_decoration_user_card.xml
+++ b/app/src/main/res/layout/item_decoration_user_card.xml
@@ -94,7 +94,7 @@
         android:layout_height="32dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_cancel"
+        android:background="@drawable/bg_common_cancel_30"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_user_card_03"
@@ -111,7 +111,7 @@
         android:layout_width="146dp"
         android:layout_height="32dp"
         android:layout_marginStart="13dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_user_card_04"
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 d0fc5c417..f674fc859 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/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             app:corner="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -78,7 +78,7 @@
             android:layout_width="90dp"
             android:layout_height="24dp"
             android:layout_marginTop="12dp"
-            android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
+            android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
             android:textColor="@{headWearInfo.hasUsed ? @color/color_4C5AF1 : @color/white}"
@@ -88,7 +88,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_user_card_wear"
-            tools:background="@drawable/bg_common_confirm"
+            tools:background="@drawable/selector_common_confirm"
             tools:text="@string/label_can_use"
             tools:textColor="@color/white"
             tools:visibility="visible" />
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 07c03fd16..f164aea60 100644
--- a/app/src/main/res/layout/item_my_head_wear.xml
+++ b/app/src/main/res/layout/item_my_head_wear.xml
@@ -61,13 +61,13 @@
             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 : @drawable/bg_common_confirm}"
+            android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
             android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_color}"
             android:textSize="14sp"
             android:visibility="gone"
-            tools:background="@drawable/bg_common_confirm"
+            tools:background="@drawable/selector_common_confirm"
             tools:text="@string/label_can_use"
             tools:textColor="@color/text_title_color"
             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 40c38eadc..7814d7a70 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/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             app:corner="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -72,7 +72,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="@dimen/dp_9"
-            android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
+            android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
             android:gravity="center"
             android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
             android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/white}"
@@ -80,7 +80,7 @@
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:background="@drawable/bg_common_confirm"
+            tools:background="@drawable/selector_common_confirm"
             tools:text="@string/label_can_use"
             tools:textColor="@color/white"
             tools:visibility="visible" />
diff --git a/app/src/main/res/layout/item_room_history.xml b/app/src/main/res/layout/item_room_history.xml
index 02cec9b71..86c449233 100644
--- a/app/src/main/res/layout/item_room_history.xml
+++ b/app/src/main/res/layout/item_room_history.xml
@@ -27,7 +27,7 @@
             android:layout_width="38dp"
             android:layout_height="15dp"
             android:layout_gravity="center_horizontal|bottom"
-            android:background="@drawable/bg_common_confirm_normal"
+            android:background="@drawable/bg_common_confirm_30"
             android:visibility="gone"
             android:text="@string/layout_item_room_history_01"
             android:gravity="center"
diff --git a/app/src/main/res/layout/item_room_shield.xml b/app/src/main/res/layout/item_room_shield.xml
index 5083227f2..e92655037 100644
--- a/app/src/main/res/layout/item_room_shield.xml
+++ b/app/src/main/res/layout/item_room_shield.xml
@@ -76,7 +76,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_12"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         android:paddingStart="@dimen/dp_14"
         android:paddingTop="@dimen/dp_8"
         android:paddingEnd="@dimen/dp_14"
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 1535b3aaf..cd93e0186 100644
--- a/app/src/main/res/layout/layout_agree_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_agree_apply_dialog.xml
@@ -70,7 +70,7 @@
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
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 0fa159e74..fa2f203d9 100644
--- a/app/src/main/res/layout/layout_anchor_card_view.xml
+++ b/app/src/main/res/layout/layout_anchor_card_view.xml
@@ -115,7 +115,7 @@
         android:layout_height="24dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_layout_anchor_card_view_03"
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 f3b757256..c18fcc7a2 100644
--- a/app/src/main/res/layout/layout_close_exchange_dialog.xml
+++ b/app/src/main/res/layout/layout_close_exchange_dialog.xml
@@ -86,7 +86,7 @@
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/layout_common_dialog.xml b/app/src/main/res/layout/layout_common_dialog.xml
index 7d51a3daa..327618183 100644
--- a/app/src/main/res/layout/layout_common_dialog.xml
+++ b/app/src/main/res/layout/layout_common_dialog.xml
@@ -48,7 +48,7 @@
             android:layout_width="120dp"
             android:layout_height="38dp"
             android:layout_marginStart="@dimen/dp_16"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/white"
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 6feb0acad..e5b77bd80 100644
--- a/app/src/main/res/layout/layout_exchange_diamond_dialog.xml
+++ b/app/src/main/res/layout/layout_exchange_diamond_dialog.xml
@@ -94,7 +94,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="@dimen/dp_25"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/confirm_exchange"
         android:textColor="@color/white"
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 21baa3b53..4e6c66153 100644
--- a/app/src/main/res/layout/layout_give_diamond_dialog.xml
+++ b/app/src/main/res/layout/layout_give_diamond_dialog.xml
@@ -117,7 +117,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="@dimen/dp_25"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/dialog_lucky_money_confirm_btn"
         android:textColor="@color/white"
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 7a901417f..8d8d588c3 100644
--- a/app/src/main/res/layout/layout_ok_cancel_dialog.xml
+++ b/app/src/main/res/layout/layout_ok_cancel_dialog.xml
@@ -38,7 +38,7 @@
             android:layout_width="120dp"
             android:layout_height="38dp"
             android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:gravity="center"
             android:text="@string/cancel"
             android:textColor="@color/color_7154EE"
@@ -48,7 +48,7 @@
             android:id="@+id/btn_ok"
             android:layout_width="120dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
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 71c8de471..7e3a237e0 100644
--- a/app/src/main/res/layout/layout_pic_login_dialog.xml
+++ b/app/src/main/res/layout/layout_pic_login_dialog.xml
@@ -100,7 +100,7 @@
             android:text="@string/cancel"
             android:textColor="@color/color_7154EE"
             android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_common_cancel"
+            android:background="@drawable/bg_common_cancel_30"
             android:textSize="15sp" />
 
         <TextView
@@ -110,7 +110,7 @@
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             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 62b4bc1e8..2cd6c63be 100644
--- a/app/src/main/res/layout/layout_refuse_apply_dialog.xml
+++ b/app/src/main/res/layout/layout_refuse_apply_dialog.xml
@@ -85,7 +85,7 @@
             android:id="@+id/btn_ok"
             android:layout_width="110dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/text_ok"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/list_item_search.xml b/app/src/main/res/layout/list_item_search.xml
index cddecfedf..2ef1c8581 100644
--- a/app/src/main/res/layout/list_item_search.xml
+++ b/app/src/main/res/layout/list_item_search.xml
@@ -114,7 +114,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="start|center_vertical"
         android:paddingStart="@dimen/dp_16"
         android:paddingTop="@dimen/dp_4"
diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml
index 4f337b79a..360a3bd4c 100644
--- a/app/src/main/res/layout/user_info_bottom_layout.xml
+++ b/app/src/main/res/layout/user_info_bottom_layout.xml
@@ -26,7 +26,7 @@
         android:layout_height="45dp"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/attention"
         android:textColor="@color/white"
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 7a7c61c98..804055894 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
@@ -52,7 +52,7 @@
         android:layout_height="43dp"
         android:layout_marginEnd="@dimen/dp_21"
         android:layout_marginBottom="@dimen/dp_33"
-        android:background="@drawable/bg_common_confirm_normal"
+        android:background="@drawable/bg_common_confirm_30"
         android:gravity="center"
         android:text="@string/text_agree"
         android:textColor="@color/color_333333"
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 8e22ac916..ef0673a85 100644
--- a/app/src/module_community/res/layout/activity_give_gold.xml
+++ b/app/src/module_community/res/layout/activity_give_gold.xml
@@ -53,7 +53,7 @@
             android:paddingTop="@dimen/dp_3"
             android:paddingBottom="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_3"
-            android:background="@drawable/bg_common_confirm_press"
+            android:background="@drawable/bg_common_confirm_30"
             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 b96844223..0da6b7e74 100644
--- a/app/src/module_community/res/layout/dialog_dating_select.xml
+++ b/app/src/module_community/res/layout/dialog_dating_select.xml
@@ -50,7 +50,7 @@
                 android:layout_width="80dp"
                 android:layout_height="28dp"
                 android:layout_marginEnd="@dimen/dp_13"
-                android:background="@drawable/bg_common_cancel"
+                android:background="@drawable/bg_common_cancel_30"
                 android:gravity="center"
                 android:text="@string/cancel"
                 android:textColor="@color/color_7154EE"
@@ -60,7 +60,7 @@
                 android:id="@+id/btn_ok"
                 android:layout_width="80dp"
                 android:layout_height="28dp"
-                android:background="@drawable/bg_common_confirm"
+                android:background="@drawable/selector_common_confirm"
                 android:gravity="center"
                 android:text="@string/text_ok"
                 android:textColor="@color/white"
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 725be0c67..72b55889e 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,7 +32,7 @@
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/layout_activity_super_admin_manege_01"
         android:textColor="@color/white"
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 035ac3c90..b4dbfa20a 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,7 +32,7 @@
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:text="@string/layout_activity_super_admin_room_set_01"
         android:textColor="@color/white"
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 08a8a3e6d..8add9438b 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
@@ -55,7 +55,7 @@
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:layout_marginEnd="15dp"
-        android:background="@drawable/bg_common_confirm"
+        android:background="@drawable/selector_common_confirm"
         android:gravity="center"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
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 6220a1d2a..cf995d7da 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,7 +30,7 @@
         android:layout_height="38dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"
-        android:background="@drawable/bg_common_cancel"
+        android:background="@drawable/bg_common_cancel_30"
         android:gravity="center"
         android:text="@string/label_common_close"
         android:textColor="@color/appColor"
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java
index 024895285..abe22aab5 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java
@@ -51,18 +51,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_normal));
+                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_30));
                     if (info.getInviteInterval() > 0) {
                         if (info.getInviteTimes() > 0) {
                             startCountDownTimer(info.getInviteInterval());
                         } else {
-                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
                             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));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
                             binding.tvInviteFansConfirm.setText(ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_06));
                             binding.tvInviteFansConfirm.setClickable(false);
                             return;
@@ -87,7 +87,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_normal));
+                    binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_confirm_30));
                     if (info.getInviteInterval() > 0) {
                         binding.tvInviteFansConfirm.setClickable(false);
                         if (info.getInviteTimes() > 0) {
@@ -95,12 +95,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));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
                             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));
+                            binding.tvInviteFansConfirm.setBackground(getResources().getDrawable(R.drawable.bg_common_cancel_30));
                             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/yizhuan/tutu/room_chat/utils/InViteFansTimer.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java
index adcf61ef9..c6e0abb63 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/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_normal));
+        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.bg_common_confirm_30));
         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));
+        tvInvite.setBackground(mContext.getResources().getDrawable(R.drawable.bg_common_cancel_30));
         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 6216a630d..68acdd06e 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,7 +53,7 @@
             android:layout_height="@dimen/dp_38"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/dp_20"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/layout_activity_newbie_message_03"
             android:textColor="@color/text_title_color"
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 90c65a68e..c71b821d8 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,7 +69,7 @@
             android:id="@+id/tv_invite_fans_confirm"
             android:layout_width="160dp"
             android:layout_height="38dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:textColor="@color/text_title_color"
             android:gravity="center"
             android:layout_marginTop="@dimen/dp_35"
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 c40acbee2..9033f8ad6 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
@@ -59,7 +59,7 @@
             android:gravity="center"
             android:textSize="14sp"
             android:textColor="@color/white"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             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 da60a0684..c7c7ac4c1 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,7 +149,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="40dp"
             android:layout_marginBottom="45dp"
-            android:background="@drawable/bg_common_confirm"
+            android:background="@drawable/selector_common_confirm"
             android:gravity="center"
             android:text="@string/layout_dialog_newbie_filter_010"
             android:textColor="#ffffffff"
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java
index 32c5594ab..9f46c62f8 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java
@@ -43,6 +43,8 @@ public class BoxRankingActivity extends BaseViewBindingActivity<ActivityRoomBoxR
 
     @SuppressLint("CheckResult")
     public void init() {
+        EventBus.getDefault().register(this);
+
         binding.rootView.setOnClickListener(this);
 
         List<TabInfo> tabInfoList = new ArrayList<>(2);
@@ -66,14 +68,6 @@ public class BoxRankingActivity extends BaseViewBindingActivity<ActivityRoomBoxR
         return false;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_room_box_ranking);
-        EventBus.getDefault().register(this);
-        init();
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
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 729b1de91..c60fc29d1 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,7 +73,7 @@
             android:layout_height="34dp"
             android:layout_marginTop="@dimen/dp_30"
             android:scaleType="center"
-            android:background="@drawable/bg_common_confirm_normal"
+            android:background="@drawable/bg_common_confirm_30"
             android:text="@string/layout_dialog_erban_update_01"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_14"