yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复

Browse Source
This commit is contained in:
18401019693 2023-07-08 15:15:40 +08:00
parent f55e9c0cfe
commit 124b18dcb0
3 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@ -156,12 +156,19 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
@Override @Override
public void onSuccess(RedPacketInfoModel data) { public void onSuccess(RedPacketInfoModel data) {
dismiss(); dismiss();
new XPopup.Builder(getContext()) if (data.getGiftModels().size() > 0) {
.asCustom(new ResultRendPacketPopup(getContext(), new XPopup.Builder(getContext())
false, .asCustom(new ResultRendPacketPopup(getContext(),
data.setSuperJackpotId(redPacketInfoModel.getSuperJackpotId()), false,
isSuperJackpot)) data.setSuperJackpotId(redPacketInfoModel.getSuperJackpotId()),
.show(); isSuperJackpot))
.show();
} else {
new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(), true, data.setRedPacketId(redPacketInfoModel.getSuperJackpotId()), false))
.show();
}
} }
@Override @Override
@ -171,7 +178,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
} }
}); });
} else { } else {
if (TextUtils.equals(redPacketInfoModel.getConditions(),"1")){ if (TextUtils.equals(redPacketInfoModel.getConditions(), "1")) {
LiveRoomViewHolder.follow(); LiveRoomViewHolder.follow();
} }

36
live/src/main/java/com/yunbao/live/dialog/ResultRendPacketPopup.java
View File

@ -105,18 +105,18 @@ public class ResultRendPacketPopup extends CenterPopupView {
new HttpCallback<List<RedPacketGiftModel>>() { new HttpCallback<List<RedPacketGiftModel>>() {
@Override @Override
public void onSuccess(List<RedPacketGiftModel> data) { public void onSuccess(List<RedPacketGiftModel> data) {
if (data.size() > 0) { // if (data.size() > 0) {
new XPopup.Builder(getContext()) new XPopup.Builder(getContext())
.asCustom(new LuckUserRedPacketPopup(getContext(), data)) .asCustom(new LuckUserRedPacketPopup(getContext(), data))
.show(); .show();
} else { // } else {
new XPopup.Builder(getContext()) // new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(), // .asCustom(new ResultRendPacketPopup(getContext(),
true, // true,
redPacketInfoModel, // redPacketInfoModel,
isSuperJackpot)) // isSuperJackpot))
.show(); // .show();
} // }
} }
@ -131,18 +131,18 @@ public class ResultRendPacketPopup extends CenterPopupView {
new HttpCallback<List<RedPacketGiftModel>>() { new HttpCallback<List<RedPacketGiftModel>>() {
@Override @Override
public void onSuccess(List<RedPacketGiftModel> data) { public void onSuccess(List<RedPacketGiftModel> data) {
if (data.size() > 0) { // if (data.size() > 0) {
new XPopup.Builder(getContext()) new XPopup.Builder(getContext())
.asCustom(new LuckUserRedPacketPopup(getContext(), data)) .asCustom(new LuckUserRedPacketPopup(getContext(), data))
.show(); .show();
} else { // } else {
new XPopup.Builder(getContext()) // new XPopup.Builder(getContext())
.asCustom(new ResultRendPacketPopup(getContext(), // .asCustom(new ResultRendPacketPopup(getContext(),
true, // true,
redPacketInfoModel, // redPacketInfoModel,
isSuperJackpot)) // isSuperJackpot))
.show(); // .show();
} // }
} }

12
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1500,9 +1500,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.asCustom(new ResultRendPacketPopup(mContext, true, data.setRedPacketId(redPacketModel.getRedPacketId()), false)) .asCustom(new ResultRendPacketPopup(mContext, true, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
.show(); .show();
} else { } else {
new XPopup.Builder(mContext) if (data.getGiftModels().size() > 0) {
.asCustom(new ResultRendPacketPopup(mContext, false, data.setRedPacketId(redPacketModel.getRedPacketId()), false)) new XPopup.Builder(mContext)
.show(); .asCustom(new ResultRendPacketPopup(mContext, false, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
.show();
} else {
new XPopup.Builder(mContext)
.asCustom(new ResultRendPacketPopup(mContext, true, data.setRedPacketId(redPacketModel.getRedPacketId()), false))
.show();
}
} }
} }