|
|
@@ -182,7 +182,7 @@ class GiftPageFragment : BaseGiftPageFragment(R.layout.fragment_gift_page),
|
|
|
gifts.forEachIndexed { _, giftInfo ->
|
|
|
if (giftInfo.isFreeGift()) {
|
|
|
freeGift = giftInfo
|
|
|
- } else if(giftInfo.isLuckyGift()) {
|
|
|
+ } else if (giftInfo.isLuckyGift() && luckyGiftList.size <= 2) {
|
|
|
luckyGiftList.add(NormalGiftListItemData(giftInfo))
|
|
|
} else {
|
|
|
giftItemList.add(NormalGiftListItemData(giftInfo))
|
|
|
@@ -201,7 +201,7 @@ class GiftPageFragment : BaseGiftPageFragment(R.layout.fragment_gift_page),
|
|
|
freeGiftItemData = itemData
|
|
|
}
|
|
|
if (luckyGiftList.isNotEmpty()) { //将幸运礼物的位置调整到第2、3位
|
|
|
- giftItemList.addAll(min(LUCKY_GIFT_INDEX, giftItemList.size), luckyGiftList.take(2))
|
|
|
+ giftItemList.addAll(min(LUCKY_GIFT_INDEX, giftItemList.size), luckyGiftList)
|
|
|
}
|
|
|
} else {
|
|
|
giftItemList.addAll(gifts.map { NormalGiftListItemData(it) })
|