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

遊戲bug修復

Browse Source
This commit is contained in:
18401019693
2023-10-28 14:19:11 +08:00
parent f356446c03
commit 86d730cdf1
10 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -53,6 +53,7 @@ import com.yunbao.common.dialog.NotCancelableDialog;
import com.yunbao.common.event.GiftWallIlluminateEvent;
import com.yunbao.common.event.LoginInvalidEvent;
import com.yunbao.common.event.SendBlindGiftEvent;
import com.yunbao.common.event.ShowHideEvent;
import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
@@ -1705,6 +1706,14 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onShowHideEvent(ShowHideEvent event) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.onShowHideEvent();
}
}
/**
* 检查指定直播间连麦人数
*

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

@@ -754,7 +754,7 @@ public class SocketRyClient {
case "SudGameCreateRoom":
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.SUD_GAME_CREATE_ROOM)
.setAvatar(map.getString("sud_game_name"))
.setAvatar(WordUtil.isNewZh()?map.getString("sud_game_name"):map.getString("sud_game_name_en"))
.setCreateSudRoomModel(GsonUtils.fromJson(map.toString(), SudGameDateModel.class)));
break;

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

@@ -660,18 +660,23 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
ViewClicksAntiShake.clicksAntiShake(sud_layout_name, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
createSudRoomModel.setSudGameId(sudGameDateModel.getSudGameId());
createSudRoomModel.setSudGameRoomId(sudGameDateModel.getSudGameRoomId());
createSudRoomModel.setAvatar(sudGameDateModel.getAvatar());
createSudRoomModel.setRoomName(sudGameDateModel.getRoomName());
createSudRoomModel.setSudGameName(sudGameDateModel.getSudGameName());
new XPopup.Builder(mContext)
.enableDrag(false)
.dismissOnTouchOutside(false)
.dismissOnBackPressed(false)
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
.show();
if (getsudGameMin()) {
ToastUtil.show(WordUtil.isNewZh() ? "小遊戲進行中" : "Game in progress");
} else {
CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
createSudRoomModel.setSudGameId(sudGameDateModel.getSudGameId());
createSudRoomModel.setSudGameRoomId(sudGameDateModel.getSudGameRoomId());
createSudRoomModel.setAvatar(sudGameDateModel.getAvatar());
createSudRoomModel.setRoomName(sudGameDateModel.getRoomName());
createSudRoomModel.setSudGameName(sudGameDateModel.getSudGameName());
new XPopup.Builder(mContext)
.enableDrag(false)
.dismissOnTouchOutside(false)
.dismissOnBackPressed(false)
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
.show();
}
}
});
sudNameHandler.removeCallbacks(sudNameRunnable);

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

@@ -723,7 +723,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.hindeRedPacket();
}
if (TextUtils.equals(data.getSudGameRoomStatus(), "1")) {
mLiveRoomViewHolder.setSudName(data.getSudGameDateModel().getSudGameName(), data.getSudGameDateModel());
mLiveRoomViewHolder.setSudName(WordUtil.isNewZh() ? data.getSudGameDateModel().getSudGameName() : data.getSudGameDateModel().getSud_game_name_en(), data.getSudGameDateModel());
}
}