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

1：优化服务地址

Browse Source 
2：修改盲盒转盘声音，修改成0.2
3：修改红包声音，0.2
4：修改巡乐会，最后出现的空白
5：优化一键赠送背包礼物的时候，连续点击后，出现的错误
7：修改打包的应用图标
This commit is contained in:
梁小江
2026-01-13 16:04:21 +08:00
parent 0fd8ecd73d
commit 8f4c2d1b83
10 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -472,8 +472,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
"确认",
"取消",
v -> {
// 点击“确认”按钮时执行删除操作
MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
if (gifyuseradapter.getUserIdToString() != null) {
// 点击“确认”按钮时执行删除操作
MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
}
},
v -> {
// 点击“取消”按钮时什么都不做
@@ -597,7 +599,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
return currentItem;
}
private String gift_bag="";
private String gift_bag = "";
private void giveGift(String num) {
getSelectedGift();
int currentItem = mBinding.viewPager.getCurrentItem();
@@ -647,8 +651,8 @@ private String gift_bag="";
//礼物打赏
giftNumber = num;
if(roonGiftModel.getActivities_id()==4){
gift_bag=roonGiftModel.getGift_bag()+"";
if (roonGiftModel.getActivities_id() == 4) {
gift_bag = roonGiftModel.getGift_bag() + "";
}
if (userInfo != null) {
@@ -656,7 +660,7 @@ private String gift_bag="";
if (userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
if (userInfo.getPit_number().isEmpty() || jingp != 1) {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
EventBus.getDefault().post(roomGiftGiveEvent);
@@ -666,17 +670,17 @@ private String gift_bag="";
}
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id,gift_bag);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id, gift_bag);
}
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
}
} else {
if (all) {
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "",gift_bag);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "", gift_bag);
} else {
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
}
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
}
@@ -684,14 +688,14 @@ private String gift_bag="";
if (userInfo == null) {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
return;
}
if (userInfo.getPit_number() != null && userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
if (userInfo.getPit_number().isEmpty() || jingp != 1) {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
} else {
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2");
@@ -703,7 +707,7 @@ private String gift_bag="";
} else {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
}
} else {