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

修改盲盒问题

Browse Source
This commit is contained in:
18401019693
2023-06-03 10:35:52 +08:00
parent 7201fd37f3
commit 067bbc70c5
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);