6.7.0用户端更新
This commit is contained in:
parent
c20147bf8f
commit
f59e5e527a
@ -1771,7 +1771,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
recycler_prank.setAdapter(comboAdapter);
|
recycler_prank.setAdapter(comboAdapter);
|
||||||
prank_group_title.setText(R.string.combo_vote);
|
prank_group_title.setText(R.string.combo_vote);
|
||||||
}
|
}
|
||||||
limitItem(Math.min(prankAndComboList.size(), 4));
|
limitItem(mPrankType,Math.min(prankAndComboList.size(), 4));
|
||||||
}else {
|
}else {
|
||||||
prank_group.setVisibility(View.GONE);
|
prank_group.setVisibility(View.GONE);
|
||||||
prank_small_icon.setVisibility(View.GONE);
|
prank_small_icon.setVisibility(View.GONE);
|
||||||
@ -1791,10 +1791,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
}
|
}
|
||||||
|
|
||||||
//设置最多显示4个项目
|
//设置最多显示4个项目
|
||||||
private void limitItem(int maxItem){
|
private void limitItem(int prankType,int maxItem){
|
||||||
recycler_prank.post(() -> {
|
recycler_prank.post(() -> {
|
||||||
View itemView = recycler_prank.getChildAt(0);
|
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();
|
ViewGroup.LayoutParams layoutParams = recycler_prank.getLayoutParams();
|
||||||
layoutParams.height = height;
|
layoutParams.height = height;
|
||||||
recycler_prank.setLayoutParams(layoutParams);
|
recycler_prank.setLayoutParams(layoutParams);
|
||||||
@ -4979,6 +4980,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
|||||||
starTimeloud(2, time);
|
starTimeloud(2, time);
|
||||||
} else {
|
} else {
|
||||||
lt_trickery.setVisibility(View.GONE);
|
lt_trickery.setVisibility(View.GONE);
|
||||||
|
prank_group_turntable_icon.setVisibility(View.VISIBLE);
|
||||||
timeOver();
|
timeOver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user