moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]确认取消控件全局统一

Browse Source
This commit is contained in:
wushaocheng
2023-03-01 12:51:18 +08:00
parent dc96733fc6
commit bd469c0c39
90 changed files with 124 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
View File

@@ -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);
}

4
app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
View File

@@ -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 {

4
app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
View File

@@ -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));
}
}

4
app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
View File

@@ -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);

2
app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
View File

@@ -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));

11
app/src/main/res/drawable/bg_common_cancel.xml
View File

@@ -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>

7
app/src/main/res/drawable/bg_common_disable.xml → app/src/main/res/drawable/bg_common_cancel_30.xml
View File

@@ -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>

7
app/src/main/res/drawable/bg_common_confirm.xml
View File

@@ -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>

13
app/src/main/res/drawable/bg_common_confirm_normal.xml
View File

@@ -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>

14
app/src/main/res/drawable/bg_common_confirm_press.xml
View File

@@ -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>

6
app/src/main/res/drawable/selector_common_button.xml
View File

@@ -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>

7
app/src/main/res/drawable/selector_common_confirm.xml Normal file
View File

@@ -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>

2
app/src/main/res/layout/activity_bind_phone.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_bind_withdraw_msg.xml
View File

@@ -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"

4
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_charge.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_convert_diamond.xml
View File

@@ -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"/>

6
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -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" />

2
app/src/main/res/layout/activity_decoration_store.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_earn_withdraw.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_feedback.xml
View File

@@ -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" />

2
app/src/main/res/layout/activity_give_gold_to_user.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_patriarch_mode.xml
View File

@@ -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" />

2
app/src/main/res/layout/activity_patriarch_pwd.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_reset_login_pwd.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_room_title_edit.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_show_bind_phone.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_splash.xml
View File

@@ -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"

4
app/src/main/res/layout/activity_user_info.xml
View File

@@ -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">

2
app/src/main/res/layout/activity_verify_phone.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_attention_hint.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_bind_success.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_buy_decoration.xml
View File

@@ -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"/>

2
app/src/main/res/layout/dialog_charge.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_common_edit.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_exit_room.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_family_join.xml
View File

@@ -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"/>

2
app/src/main/res/layout/dialog_mic_queue.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_pk_mic_queue.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_pk_select_people.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_privacy_agreement.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_protocol_update.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_pub_room_shutup.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_recommend_room.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_request_upmic.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_room_free_gift.xml
View File

@@ -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"

4
app/src/main/res/layout/dialog_room_pk_received.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_select_pay_type.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_task.xml
View File

@@ -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>

2
app/src/main/res/layout/fans_list_item_new.xml
View File

@@ -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"

2
app/src/main/res/layout/fragment_add_user_info.xml
View File

@@ -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"

2
app/src/main/res/layout/fragment_association_room.xml
View File

@@ -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"

2
app/src/main/res/layout/fragment_dialog_room_title.xml
View File

@@ -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>

2
app/src/main/res/layout/include_dialog_common_ok_cancel_btn.xml
View File

@@ -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>

2
app/src/main/res/layout/item_attention_in_room.xml
View File

@@ -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"/>

2
app/src/main/res/layout/item_car_garage_normal.xml
View File

@@ -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"/>

4
app/src/main/res/layout/item_decoration_common.xml
View File

@@ -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"

4
app/src/main/res/layout/item_decoration_user_card.xml
View File

@@ -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"

6
app/src/main/res/layout/item_my_chat_bubble.xml
View File

@@ -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" />

4
app/src/main/res/layout/item_my_head_wear.xml
View File

@@ -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" />

6
app/src/main/res/layout/item_my_user_card_wear.xml
View File

@@ -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" />

2
app/src/main/res/layout/item_room_history.xml
View File

@@ -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"

2
app/src/main/res/layout/item_room_shield.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_agree_apply_dialog.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_anchor_card_view.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_close_exchange_dialog.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_common_dialog.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_exchange_diamond_dialog.xml
View File

@@ -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"

2
app/src/main/res/layout/layout_give_diamond_dialog.xml
View File

@@ -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"

4
app/src/main/res/layout/layout_ok_cancel_dialog.xml
View File

@@ -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"

4
app/src/main/res/layout/layout_pic_login_dialog.xml
View File

@@ -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>

2
app/src/main/res/layout/layout_refuse_apply_dialog.xml
View File

@@ -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"

2
app/src/main/res/layout/list_item_search.xml
View File

@@ -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"

2
app/src/main/res/layout/user_info_bottom_layout.xml
View File

@@ -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"

2
app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml
View File

@@ -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"

2
app/src/module_community/res/layout/activity_give_gold.xml
View File

@@ -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"

4
app/src/module_community/res/layout/dialog_dating_select.xml
View File

@@ -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"

2
app/src/module_labour_union/res/layout/activity_super_admin_manege.xml
View File

@@ -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"

2
app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml
View File

@@ -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"

2
app/src/module_labour_union/res/layout/item_search_admin.xml
View File

@@ -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"

2
app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
View File

@@ -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"

12
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java
View File

@@ -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;

4
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/utils/InViteFansTimer.java
View File

@@ -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);
}

2
app/src/module_room_chat/res/layout/activity_newbie_message.xml
View File

@@ -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"

2
app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
View File

@@ -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"

2
app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
View File

@@ -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"
/>

2
app/src/module_room_chat/res/layout/dialog_newbie_filter.xml
View File

@@ -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"

10
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java
View File

@@ -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();

2
app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
View File

@@ -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"