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

[BugFix]修复免费礼物赠送后不增加魅力值的bug

Browse Source
This commit is contained in:
wushaocheng
2022-12-26 11:38:39 +08:00
parent 9ca39e95cc
commit e0502a86e8
3 changed files with 79 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -1462,20 +1462,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
return;
}
for (List<GiftInfoVm> page : pagerList) {
// Iterator<GiftInfoVm> 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;

8
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java
View File

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

150
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
View File

@@ -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<ServiceResult<RoomPkData>, SingleSource<? extends String>>() {
@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<ServiceResult<RoomPkData>, SingleSource<String>>() {
@Override
public SingleSource<String> apply(ServiceResult<RoomPkData> response) throws Exception {
@@ -833,8 +833,8 @@ public class PkModel extends BaseModel implements IPkModel {
@Override
public Single<RoomPkData> loadPKDataByRoomId(long roomUid) {
return api.loadPKDataByRoomId(
roomUid
)
roomUid
)
.compose(RxHelper.handleSchedulers())
.flatMap(new Function<ServiceResult<RespPKData>, SingleSource<RoomPkData>>() {
@Override
@@ -867,25 +867,25 @@ public class PkModel extends BaseModel implements IPkModel {
@Override
public Single<String> inviteInTeam(List<RoomPKInvitedUpMicMember> roomPKInvitedUpMicMember) {
return Single.create(new SingleOnSubscribe<ChatRoomMessage>() {
@Override
public void subscribe(SingleEmitter<ChatRoomMessage> e) throws Exception {
//发送给自定义消息
RoomPkAttachment roomPkAttachment = new RoomPkAttachment(CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_INVITE);
Map<String, RoomPKInvitedUpMicMember> 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<ChatRoomMessage> e) throws Exception {
//发送给自定义消息
RoomPkAttachment roomPkAttachment = new RoomPkAttachment(CustomAttachment.CUSTOM_MESS_SUB_ROOM_PK_INVITE);
Map<String, RoomPKInvitedUpMicMember> 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<ChatRoomMessage, SingleSource<? extends ChatRoomMessage>>() {
@Override
public SingleSource<? extends ChatRoomMessage> 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<ServiceResult<RoomPkData>, SingleSource<? extends String>>() {
@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<ServiceResult<RoomPkData>, SingleSource<? extends String>>() {
@Override
@@ -1159,8 +1159,8 @@ public class PkModel extends BaseModel implements IPkModel {
@Override
public Single<RoomPkData> loadPKDataById(String pkId) {
return api.loadPKDataById(
pkId
)
pkId
)
.flatMap(new Function<ServiceResult<RoomPkData>, SingleSource<RoomPkData>>() {
@Override
public SingleSource<RoomPkData> apply(ServiceResult<RoomPkData> respPKDataServiceResult) throws Exception {