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

2
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);
}
/**