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

77 红包非当前房间的不添加。

Browse Source
This commit is contained in:
骆召亮
2025-12-17 09:31:54 +08:00
parent 81b41ef392
commit 90077d24f6
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BaseModule/src/main/java/com/xscm/moduleutil/utils/QXRedPacketManager.java
View File

@@ -50,15 +50,16 @@ public class QXRedPacketManager {
* *
* @param redPackets 红包模型列表 * @param redPackets 红包模型列表
*/ */
public void addRedPackets(List<RedPacketInfo> redPackets) { public void addRedPackets(String roomId,List<RedPacketInfo> redPackets) {
if (redPackets == null || redPackets.isEmpty()) { if (redPackets == null || redPackets.isEmpty()) {
return; return;
} }
this.redPackets.entrySet().removeIf(entry ->
!(entry.getValue().getRoom_id()+"").equals(roomId));
for (RedPacketInfo model : redPackets) { for (RedPacketInfo model : redPackets) {
this.redPackets.put(model.getRedpacket_id(), model); this.redPackets.put(model.getRedpacket_id(), model);
} }
// 在添加数据后启动定时器（如果尚未启动） // 在添加数据后启动定时器（如果尚未启动）
startCheckTimer(); startCheckTimer();
if (this.delegate != null && this.delegate instanceof QXRedPacketManagerDelegate) { if (this.delegate != null && this.delegate instanceof QXRedPacketManagerDelegate) {
@@ -71,11 +72,12 @@ public class QXRedPacketManager {
* *
* @param redPacket 红包模型 * @param redPacket 红包模型
*/ */
public void addRedPacket(RedPacketInfo redPacket) { public void addRedPacket(String roomId,RedPacketInfo redPacket) {
if (redPacket == null || redPacket.getRedpacket_id() == null) { if (redPacket == null || redPacket.getRedpacket_id() == null) {
return; return;
} }
this.redPackets.entrySet().removeIf(entry ->
!(entry.getValue().getRoom_id()+"").equals(roomId));
this.redPackets.put(redPacket.getRedpacket_id(), redPacket); this.redPackets.put(redPacket.getRedpacket_id(), redPacket);
// 在添加数据后启动定时器（如果尚未启动） // 在添加数据后启动定时器（如果尚未启动）

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

@@ -1498,7 +1498,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
xlhDjs(messageEvent.text.end_time) xlhDjs(messageEvent.text.end_time)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRed) { } else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRed) {
qxRedPacketManager!!.addRedPacket(messageEvent.text.redpacketInfo) qxRedPacketManager!!.addRedPacket(roomId,messageEvent.text.redpacketInfo)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRedRemove) { } else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRedRemove) {
qxRedPacketManager!!.removeRedPacket(messageEvent.text.redpacket_id) qxRedPacketManager!!.removeRedPacket(messageEvent.text.redpacket_id)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeSongerNum || //房间点歌数量变化 } else if (msgType == EMMessageInfo.QXRoomMessageTypeSongerNum || //房间点歌数量变化
@@ -3711,7 +3711,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
MvpPre?.quitRoom(roomId, SpUtil.getUserId().toString()) MvpPre?.quitRoom(roomId, SpUtil.getUserId().toString())
ClickUtils.clearAllClickRecords() ClickUtils.clearAllClickRecords()
AgoraManager.getInstance().cleanup() AgoraManager.getInstance().cleanup()
roomId = roomId2 roomId = roomId2
@@ -4105,7 +4104,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun roomRedPackets(list: MutableList<RedPacketInfo>?) { override fun roomRedPackets(list: MutableList<RedPacketInfo>?) {
if (list != null) { if (list != null) {
qxRedPacketManager!!.addRedPackets(list!!) mBinding?.drvRed?.visibility = View.VISIBLE
qxRedPacketManager!!.addRedPackets(roomId,list!!)
}else{
mBinding?.drvRed?.visibility = View.GONE
} }
} }

2
app/build.gradle
View File

@@ -118,7 +118,7 @@ android {
def versionCode = variant.versionCode def versionCode = variant.versionCode
// 获取当前时间戳（格式：yyyyMMddHHmmss） // 获取当前时间戳（格式：yyyyMMddHHmmss）
def buildTimes = new Date().format("yyyy-MM-dd-HH-mm") def buildTimes = new Date().format("yyyy-MM-dd-HH-mm")
def fileName = "羽声_${versionName}_${versionCode}_${buildTimes}.apk" def fileName = "yusheng_${versionName}_${versionCode}_${buildTimes}.apk"
output.outputFileName = fileName output.outputFileName = fileName
} }
} }