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:
18142669586
2023-06-03 11:48:37 +08:00
parent fbc50229e8 1edb07d76c
commit 6e595ff1e4
7 changed files with 40 additions and 28 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);

7
live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java
View File

@@ -71,6 +71,11 @@ public class LiveRoomVoteManager {
}
private void close() {
if(mClose.getTag()!=null){
mClose.setTag(null);
hide();
return;
}
mTitle.setText(R.string.live_vote_close_title);
mSubmit.setText(R.string.live_vote_close_yes);
mCancel.setText(R.string.live_vote_close_no);
@@ -131,7 +136,7 @@ public class LiveRoomVoteManager {
ToastUtil.show(bean);
return;
}
mClose.setVisibility(View.INVISIBLE);
mClose.setTag(true);
});
}