YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/branch_new' into branch_new

Browse Source
This commit is contained in:
梁小江
2025-12-19 18:42:30 +08:00
parent 6bd210217a 6c8065711d
commit f34a67c2e8
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -2850,6 +2850,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
return
}
switchMic(2)
}else{
mBinding?.ivSoundEffects?.visibility = View.GONE
}
} else {
if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id) == RoomType.JUKEBOX

4
MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java
View File

@@ -134,7 +134,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
int num = Integer.parseInt(numStr);
int text = Integer.parseInt(textStr);
if (text <= num) {
if (text < num) {
diaj=false;
ToastUtils.show("金额必须大于数量");
return;
@@ -281,7 +281,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
int num = Integer.parseInt(numStr);
int text = Integer.parseInt(textStr);
if (text <= num) {
if (text < num) {
diaj=false;
ToastUtils.show("金额必须大于数量");
return;