From f59e5e527a2917238a42b96b8d1a4f5cb94d5c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=89=8D=E5=8D=AB?= <2298122580@qq.com> Date: Tue, 11 Jun 2024 09:40:24 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=E7=94=A8=E6=88=B7=E7=AB=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/live/views/LiveRoomViewHolder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 172b13db9..361d38488 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1771,7 +1771,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis recycler_prank.setAdapter(comboAdapter); prank_group_title.setText(R.string.combo_vote); } - limitItem(Math.min(prankAndComboList.size(), 4)); + limitItem(mPrankType,Math.min(prankAndComboList.size(), 4)); }else { prank_group.setVisibility(View.GONE); prank_small_icon.setVisibility(View.GONE); @@ -1791,10 +1791,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } //设置最多显示4个项目 - private void limitItem(int maxItem){ + private void limitItem(int prankType,int maxItem){ recycler_prank.post(() -> { View itemView = recycler_prank.getChildAt(0); - int height = (itemView.getHeight()+ SizeUtils.dp2px(3f))*maxItem; + int gap = prankType == 1 ? SizeUtils.dp2px(3f) : 0; + int height = (itemView.getHeight() + gap)*maxItem; ViewGroup.LayoutParams layoutParams = recycler_prank.getLayoutParams(); layoutParams.height = height; recycler_prank.setLayoutParams(layoutParams); @@ -4979,6 +4980,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis starTimeloud(2, time); } else { lt_trickery.setVisibility(View.GONE); + prank_group_turntable_icon.setVisibility(View.VISIBLE); timeOver(); } }