diff --git a/live/src/main/java/com/yunbao/live/dialog/LuckUserRedPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/LuckUserRedPacketPopup.java index 745a62622..d371f3358 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LuckUserRedPacketPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LuckUserRedPacketPopup.java @@ -44,7 +44,7 @@ public class LuckUserRedPacketPopup extends CenterPopupView { userList = findViewById(R.id.user_list); redPacketLuckUserAdapter = new RedPacketLuckUserAdapter(); redPacketLuckUserAdapter.addData(packetGiftModels); - userList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, true)); + userList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); userList.setAdapter(redPacketLuckUserAdapter); ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.illustrate_close), () -> dismiss()); } diff --git a/live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java index 67a2484ba..8c592072e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java @@ -73,14 +73,14 @@ public class ResultRendPacketPopup extends CenterPopupView { ImageView giftImage = findViewById(R.id.gift_image); ImageView goldenIconBeans = findViewById(R.id.golden_icon_beans); if (redPacketInfoModel.getGiftModels() != null) { - if (redPacketInfoModel.getGiftModels().size() > 1) { + if (redPacketInfoModel.getGiftModels().size() == 2) { goldenLayout.setVisibility(VISIBLE); giftLayout.setVisibility(VISIBLE); giftTitle.setText(redPacketInfoModel.getGiftModels().get(0).getGiftname()); ImgLoader.displayAvatar(getContext(), redPacketInfoModel.getGiftModels().get(0).getGifticon(), giftImage); ImgLoader.displayAvatar(getContext(), redPacketInfoModel.getGiftModels().get(1).getGifticon(), goldenIconBeans); goldenName.setText(redPacketInfoModel.getGiftModels().get(1).getGiftname()); - } else { + } else if (redPacketInfoModel.getGiftModels().size() == 1) { if (redPacketInfoModel.getGiftModels().size() > 0) { ImgLoader.displayAvatar(getContext(), redPacketInfoModel.getGiftModels().get(0).getGifticon(), goldenIconBeans); goldenName.setText(redPacketInfoModel.getGiftModels().get(0).getGiftname()); @@ -88,6 +88,10 @@ public class ResultRendPacketPopup extends CenterPopupView { goldenLayout.setVisibility(VISIBLE); giftLayout.setVisibility(GONE); + } else { + goldenLayout.setVisibility(GONE); + giftLayout.setVisibility(GONE); + findViewById(R.id.view_lucky_viewers).setVisibility(GONE); } } } @@ -102,9 +106,9 @@ public class ResultRendPacketPopup extends CenterPopupView { @Override public void onSuccess(List data) { // if (data.size() > 0) { - new XPopup.Builder(getContext()) - .asCustom(new LuckUserRedPacketPopup(getContext(), data)) - .show(); + new XPopup.Builder(getContext()) + .asCustom(new LuckUserRedPacketPopup(getContext(), data)) + .show(); // } else { // ToastUtil.show(R.string.no_data); // } @@ -123,9 +127,9 @@ public class ResultRendPacketPopup extends CenterPopupView { @Override public void onSuccess(List data) { // if (data.size() > 0) { - new XPopup.Builder(getContext()) - .asCustom(new LuckUserRedPacketPopup(getContext(), data)) - .show(); + new XPopup.Builder(getContext()) + .asCustom(new LuckUserRedPacketPopup(getContext(), data)) + .show(); // } else { // ToastUtil.show(R.string.no_data); // }