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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-06-03 11:33:13 +08:00
commit 9641d90f32
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
View File

@ -48,7 +48,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("ispk")
private String ispk;
@SerializedName("pkuid")
private boolean pkuid;
private String pkuid;
@SerializedName("pkuid1")
private String pkuid1;
@SerializedName("pkuid2")
@ -60,7 +60,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("active_total")
private String activeTotal;
@SerializedName("blind_box_status")
private boolean blindBoxStatus;
private String blindBoxStatus;
@SerializedName("gift_id")
private String giftId;
@SerializedName("gift_type")
@ -78,7 +78,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("action")
private String action;
@SerializedName("dress_notification")
private boolean dressNotification;
private String dressNotification;
@SerializedName("dress_type")
private Object dressType;
@SerializedName("dress_id")
@ -313,11 +313,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this;
}
public boolean isPkuid() {
public String isPkuid() {
return pkuid;
}
public SendBlindGiftEvent setPkuid(boolean pkuid) {
public SendBlindGiftEvent setPkuid(String pkuid) {
this.pkuid = pkuid;
return this;
}
@ -367,11 +367,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this;
}
public boolean isBlindBoxStatus() {
public String isBlindBoxStatus() {
return blindBoxStatus;
}
public SendBlindGiftEvent setBlindBoxStatus(boolean blindBoxStatus) {
public SendBlindGiftEvent setBlindBoxStatus(String blindBoxStatus) {
this.blindBoxStatus = blindBoxStatus;
return this;
}
@ -449,11 +449,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this;
}
public boolean isDressNotification() {
public String isDressNotification() {
return dressNotification;
}
public SendBlindGiftEvent setDressNotification(boolean dressNotification) {
public SendBlindGiftEvent setDressNotification(String dressNotification) {
this.dressNotification = dressNotification;
return this;
}

22
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -1011,17 +1011,17 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
if (mTvGoldCoin != null) {
mTvGoldCoin.setText(goldCoin);
}
if (mContext != null && mGiftBean != null) {
((LiveActivity) mContext).onCoinChanged(coin);//
if (by != null) {
((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
, obj.getString("ancherName"), "1");
} else {
((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
, obj.getString("ancherName"), "0");
}
}
// if (mContext != null && mGiftBean != null) {
// ((LiveActivity) mContext).onCoinChanged(coin);//
// if (by != null) {
// ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
// , obj.getString("ancherName"), "1");
// } else {
// ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
// , obj.getString("ancherName"), "0");
// }
//
// }
if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) {
showLianBtn();
}

4
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -1002,7 +1002,7 @@ public class SocketRyClient {
// 玩家自己送礼物
private void sendGiftInSameRoom(JSONObject map) {
String ctJson = map.getString("ct");
SendBlindGiftEvent sendBlindGiftEvent = GsonUtils.fromJson(ctJson, SendBlindGiftEvent.class);
SendBlindGiftEvent sendBlindGiftEvent = JSON.parseObject(ctJson, SendBlindGiftEvent.class);
LiveReceiveGiftBean receiveGiftBean = JSON.parseObject(map.getString("ct"), LiveReceiveGiftBean.class);
sendBlindGiftEvent.setUserNiceName(map.getString("uname"));
receiveGiftBean.setAvatar(map.getString("uhead") + "");
@ -1051,7 +1051,7 @@ public class SocketRyClient {
try {
if (!TextUtils.isEmpty(mLiveUid)) {
if (mLiveUid.equals(map.getString("roomnum"))) {
mListener.onSendGift(receiveGiftBean, null);
mListener.onSendGift(receiveGiftBean, sendBlindGiftEvent);
mListener.onSendGiftPk(map.getLongValue("pktotal1"), map.getLongValue("pktotal2"), livePKUserListBean);
} else {
mListener.onSendGiftPk(map.getLongValue("pktotal2"), map.getLongValue("pktotal1"), livePKUserListBean);