From 2589b97f29aa3ed76346a3e74fadb132322919ed Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Fri, 9 Jan 2026 14:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E4=BA=A4=E5=8F=8B=E6=88=BF?= =?UTF-8?q?=20getGiftList=20=E9=98=B2=E6=AD=A2=E8=B6=8A=E7=95=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room/fragment/RoomPrivateFragment.kt | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt index 0371dffb..51cf1e55 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt @@ -198,14 +198,31 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) : } override fun getGiftList(list: List) { + if (list.isEmpty()) + return if (giftList.isEmpty()) { giftList = list.toMutableList() - val showList = list.shuffled().take(6) + + val showList = if (giftList.size > 6) { + list.shuffled().take(6) + }else{ + list.shuffled().take(giftList.size-1) + } for (i in showList.indices) { val itemImage = giftViewList[i] - val price = showList[i].gift_price.toInt() - itemImage.tag = showList[i].gift_id + + val price = if (showList.size > i){ + showList[i].gift_price.toInt() + }else{ + showList[showList.size - 1].gift_price.toInt() + } + + itemImage.tag = if (showList.size > i){ + showList[i].gift_id + }else{ + showList[showList.size - 1].gift_id + } // 根据价格设置不同的宽高 val (width, height) = when { price > 500 -> Pair(64, 64)