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

update 6.5.5

Browse Source
This commit is contained in:
zlzw 2023-08-24 09:43:33 +08:00
parent 52f1a78e36
commit 7f11195ede
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,13 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
private ImageView isAttention; private ImageView isAttention;
private RedPacketInfoModel redPacketInfoModel; private RedPacketInfoModel redPacketInfoModel;
private boolean isSuperJackpot; private boolean isSuperJackpot;
private boolean isFans=false;
public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream, public ReceiveRendPacketPopup(@NonNull Context context, int time, String mLiveUid, String stream,
String redPacketId, RedPacketInfoModel redPacketInfoModel, String redPacketId, RedPacketInfoModel redPacketInfoModel,
boolean isSuperJackpot) { boolean isSuperJackpot,
boolean isFans
) {
super(context); super(context);
this.time = time; this.time = time;
@ -58,7 +61,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
this.redPacketId = redPacketId; this.redPacketId = redPacketId;
this.redPacketInfoModel = redPacketInfoModel; this.redPacketInfoModel = redPacketInfoModel;
this.isSuperJackpot = isSuperJackpot; this.isSuperJackpot = isSuperJackpot;
this.isFans=isFans;
} }
// 返回自定义弹窗的布局离开 // 返回自定义弹窗的布局离开

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

@ -374,6 +374,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow; public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
private String mAnchorName;//主播名字 private String mAnchorName;//主播名字
private boolean isHinde = false; private boolean isHinde = false;
private boolean isFans=false;
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) { public void onUpdata(String str) {
@ -1509,7 +1510,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (TextUtils.equals(data.getReceiveStatus(), "0")) { if (TextUtils.equals(data.getReceiveStatus(), "0")) {
redTimeCountdown = redTimeCountdown - 1; redTimeCountdown = redTimeCountdown - 1;
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
.asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false)) .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false,isFans))
.show(); .show();
} else if (TextUtils.equals(data.getReceiveStatus(), "1")) { } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
@ -1546,7 +1547,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
.asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true)) .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true,isFans))
.show(); .show();
} }
@ -3941,6 +3942,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
voteManager.setCreateVoteModel(voteModel); voteManager.setCreateVoteModel(voteModel);
} }
public void setFansGroup(String isFans) {
this.isFans=isFans.equals("1");
}
private static class LiveRoomHandler extends Handler { private static class LiveRoomHandler extends Handler {

1
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -520,6 +520,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.updateTopBanner(); mLiveRoomViewHolder.updateTopBanner();
mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel()); mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel());
mLiveRoomViewHolder.updateFansMessageRed(); mLiveRoomViewHolder.updateFansMessageRed();
mLiveRoomViewHolder.setFansGroup(data.getEnterRoomInfo().getIsFans());
isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention()); isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention());
if (isattention == 0) { if (isattention == 0) {