Browse Source

feat: 幸运礼物只取前两个进行插位

XiaodongLin 8 months ago
parent
commit
abc4e6632a

+ 2 - 2
module/gift/src/main/java/com/adealink/weparty/gift/GiftPageFragment.kt

@@ -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) })