From e0502a86e8458612601d876075fe4853de5da9b1 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 26 Dec 2022 11:38:39 +0800 Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D=E5=85=8D=E8=B4=B9?= =?UTF-8?q?=E7=A4=BC=E7=89=A9=E8=B5=A0=E9=80=81=E5=90=8E=E4=B8=8D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=AD=85=E5=8A=9B=E5=80=BC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/ui/widget/GiftDialog.java | 14 -- .../giftvalue/bean/GiftValueCommonUpdate.java | 8 +- .../room/pk/model/PkModel.java | 150 +++++++++--------- 3 files changed, 79 insertions(+), 93 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 62b60a0e0..14e8d68e5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -1462,20 +1462,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene return; } for (List page : pagerList) { -// Iterator iterator = page.iterator(); -// while (iterator.hasNext()) { -// GiftInfoVm item = iterator.next(); -// if (item.data.getGiftId() == giftId) { -// int count = item.data.getCount() - sendNum; -// if(count == 0){ -// iterator.remove(); -// }else { -// item.data.setCount(Math.max(count, 0)); -// item.updateCount(); -// } -// break; -// } -// } for (GiftInfoVm item : page) { if (item.data.getGiftId() == giftId) { int count = item.data.getCount() - sendNum; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java index e06ef455b..d3d4ace9e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java @@ -43,7 +43,7 @@ public class GiftValueCommonUpdate { gift = GiftModel.get().findGiftInfoById(giftReceiveInfo.getGiftId()); } if (gift != null) { - giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD); + giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD || gift.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT); } RoomGiftValue roomGiftValue = new RoomGiftValue(); roomGiftValue.setGiftValueVos(giftReceiveInfo.getGiftValueVos()); @@ -62,7 +62,7 @@ public class GiftValueCommonUpdate { gift = GiftModel.get().findGiftInfoById(multiGiftReceiveInfo.getGiftId()); } if (gift != null) { - giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD); + giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD || gift.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT); } RoomGiftValue roomGiftValue = new RoomGiftValue(); roomGiftValue.setGiftValueVos(multiGiftReceiveInfo.getGiftValueVos()); @@ -81,7 +81,7 @@ public class GiftValueCommonUpdate { gift = GiftModel.get().findGiftInfoById(giftMultiReceiverInfo.getGiftId()); } if (gift != null) { - giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD); + giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD || gift.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT); } RoomGiftValue roomGiftValue = new RoomGiftValue(); roomGiftValue.setGiftValueVos(giftMultiReceiverInfo.getGiftValueVos()); @@ -100,7 +100,7 @@ public class GiftValueCommonUpdate { gift = GiftModel.get().findGiftInfoById(multiLuckyGiftReceiveInfo.getGiftId()); } if (gift != null) { - giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD); + giftValueCommonUpdate.setGoldGift(gift.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD || gift.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT); } RoomGiftValue roomGiftValue = new RoomGiftValue(); roomGiftValue.setGiftValueVos(multiLuckyGiftReceiveInfo.getGiftValueVos()); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java index c99b47e6b..cfe8129ef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java @@ -237,7 +237,7 @@ public class PkModel extends BaseModel implements IPkModel { * @return */ private boolean isGoldGift(GiftInfo giftInfo) { - return giftInfo != null && giftInfo.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD; + return giftInfo != null && (giftInfo.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD || giftInfo.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT); } /** @@ -435,9 +435,9 @@ public class PkModel extends BaseModel implements IPkModel { return Single.error(new Throwable(ResUtil.getString(R.string.pk_model_pkmodel_02))); } return api.openPKMode( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid() - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid() + ) .flatMap(stringServiceResult -> { if (stringServiceResult.isSuccess()) { return Single.just(ResUtil.getString(R.string.pk_model_pkmodel_03)); @@ -463,9 +463,9 @@ public class PkModel extends BaseModel implements IPkModel { return Single.error(new Throwable(ResUtil.getString(R.string.pk_model_pkmodel_05))); } return api.closePKMode( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid() - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid() + ) .flatMap(stringServiceResult -> { if (stringServiceResult.isSuccess()) { //后台发自定义消息通知所有房间内的人关闭了pk @@ -497,10 +497,10 @@ public class PkModel extends BaseModel implements IPkModel { } return api.joinPK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid(), - groupType - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid(), + groupType + ) .compose(RxHelper.handleBeanData()) .compose(RxHelper.handleSchedulers()) @@ -522,9 +522,9 @@ public class PkModel extends BaseModel implements IPkModel { return Single.error(new Throwable(ResUtil.getString(R.string.pk_model_pkmodel_010))); } return api.leavePK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid() - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid() + ) .compose(RxHelper.handleBeanData()) .compose(RxHelper.handleSchedulers()) ; @@ -560,11 +560,11 @@ public class PkModel extends BaseModel implements IPkModel { } return api.loadPKMicQueueList( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid(), - page, - pageSize - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid(), + page, + pageSize + ) .flatMap(respQueuingMicListInfoServiceResult -> { if (respQueuingMicListInfoServiceResult.isSuccess()) { if (respQueuingMicListInfoServiceResult.getData() == null) { @@ -592,10 +592,10 @@ public class PkModel extends BaseModel implements IPkModel { int page, int pageSize) { return api.loadPKRecordList( - roomUid, - page, - pageSize - ) + roomUid, + page, + pageSize + ) .flatMap(pkRecordListInfoServiceResult -> { if (pkRecordListInfoServiceResult.isSuccess()) { return Single.just(pkRecordListInfoServiceResult.getData()); @@ -632,12 +632,12 @@ public class PkModel extends BaseModel implements IPkModel { } return api.createPK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid(), - pkMode, - voteMode, - duration - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid(), + pkMode, + voteMode, + duration + ) .compose(RxHelper.handleSchedulers()) .flatMap(new Function, SingleSource>() { @Override @@ -711,10 +711,10 @@ public class PkModel extends BaseModel implements IPkModel { pkMemberInfo.getUserInfo().setGroupType(roomQueueInfo.mChatRoomMember.getGroupType()); //改变麦状态 AvRoomModel.get().updateMyMicQueue( - key, - String.valueOf(AvRoomDataManager.get().mCurrentRoomInfo.getRoomId()), - pkMemberInfo.getUserInfo() - ) + key, + String.valueOf(AvRoomDataManager.get().mCurrentRoomInfo.getRoomId()), + pkMemberInfo.getUserInfo() + ) .subscribe(); } } @@ -770,10 +770,10 @@ public class PkModel extends BaseModel implements IPkModel { } return api.beginPK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - curPkInfo.getPkId(), - new Gson().toJson(createPKMembers) - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + curPkInfo.getPkId(), + new Gson().toJson(createPKMembers) + ) .flatMap(new Function, SingleSource>() { @Override public SingleSource apply(ServiceResult response) throws Exception { @@ -833,8 +833,8 @@ public class PkModel extends BaseModel implements IPkModel { @Override public Single loadPKDataByRoomId(long roomUid) { return api.loadPKDataByRoomId( - roomUid - ) + roomUid + ) .compose(RxHelper.handleSchedulers()) .flatMap(new Function, SingleSource>() { @Override @@ -867,25 +867,25 @@ public class PkModel extends BaseModel implements IPkModel { @Override public Single inviteInTeam(List roomPKInvitedUpMicMember) { return Single.create(new SingleOnSubscribe() { - @Override - public void subscribe(SingleEmitter e) throws Exception { - //发送给自定义消息 - RoomPkAttachment roomPkAttachment = new RoomPkAttachment(CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_INVITE); - Map micMemberMap = new HashMap<>(); - for (RoomPKInvitedUpMicMember pkInvitedUpMicMember : roomPKInvitedUpMicMember) { - micMemberMap.put(pkInvitedUpMicMember.getUid(), pkInvitedUpMicMember); - } - roomPkAttachment.setRoomPKInvitedUpMicMember(micMemberMap); - ChatRoomMessage inviteToTeamMsg = ChatRoomMessageBuilder.createChatRoomCustomMessage( - // 聊天室id - AvRoomDataManager.get().mCurrentRoomInfo.getRoomId() + "", - //attachment - roomPkAttachment - ); + @Override + public void subscribe(SingleEmitter e) throws Exception { + //发送给自定义消息 + RoomPkAttachment roomPkAttachment = new RoomPkAttachment(CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_INVITE); + Map micMemberMap = new HashMap<>(); + for (RoomPKInvitedUpMicMember pkInvitedUpMicMember : roomPKInvitedUpMicMember) { + micMemberMap.put(pkInvitedUpMicMember.getUid(), pkInvitedUpMicMember); + } + roomPkAttachment.setRoomPKInvitedUpMicMember(micMemberMap); + ChatRoomMessage inviteToTeamMsg = ChatRoomMessageBuilder.createChatRoomCustomMessage( + // 聊天室id + AvRoomDataManager.get().mCurrentRoomInfo.getRoomId() + "", + //attachment + roomPkAttachment + ); - e.onSuccess(inviteToTeamMsg); - } - }) + e.onSuccess(inviteToTeamMsg); + } + }) .flatMap(new Function>() { @Override public SingleSource apply(ChatRoomMessage msg) throws Exception { @@ -922,10 +922,10 @@ public class PkModel extends BaseModel implements IPkModel { if (self != null) { UserModel.get().getCacheLoginUserInfo().setGroupType(self.getGroupType()); AvRoomModel.get().updateMyMicQueue( - self.getPosition(), - String.valueOf(AvRoomDataManager.get().mCurrentRoomInfo.getRoomId()), - UserModel.get().getCacheLoginUserInfo() - ) + self.getPosition(), + String.valueOf(AvRoomDataManager.get().mCurrentRoomInfo.getRoomId()), + UserModel.get().getCacheLoginUserInfo() + ) .subscribe(); } return Single.just(ResUtil.getString(R.string.pk_model_pkmodel_022)); @@ -1086,12 +1086,12 @@ public class PkModel extends BaseModel implements IPkModel { return beginPK(); } else if (curPkInfo.getPkStatus() == RoomPkData.PK_STATUS_IN_PK) { return api.createPK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid(), - curPkInfo.getPkMode(), - curPkInfo.getVoteMode(), - curPkInfo.getDuration() - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid(), + curPkInfo.getPkMode(), + curPkInfo.getVoteMode(), + curPkInfo.getDuration() + ) .compose(RxHelper.handleSchedulers()) .flatMap(new Function, SingleSource>() { @Override @@ -1110,12 +1110,12 @@ public class PkModel extends BaseModel implements IPkModel { } return api.createPK( - AvRoomDataManager.get().mCurrentRoomInfo.getUid(), - AuthModel.get().getCurrentUid(), - curPkInfo.getPkMode(), - curPkInfo.getVoteMode(), - curPkInfo.getDuration() - ) + AvRoomDataManager.get().mCurrentRoomInfo.getUid(), + AuthModel.get().getCurrentUid(), + curPkInfo.getPkMode(), + curPkInfo.getVoteMode(), + curPkInfo.getDuration() + ) .compose(RxHelper.handleSchedulers()) .flatMap(new Function, SingleSource>() { @Override @@ -1159,8 +1159,8 @@ public class PkModel extends BaseModel implements IPkModel { @Override public Single loadPKDataById(String pkId) { return api.loadPKDataById( - pkId - ) + pkId + ) .flatMap(new Function, SingleSource>() { @Override public SingleSource apply(ServiceResult respPKDataServiceResult) throws Exception {