diff --git a/common/src/main/java/com/yunbao/common/event/HideShowEvent.java b/common/src/main/java/com/yunbao/common/event/HideShowEvent.java index d4cc47921..85b0dabb2 100644 --- a/common/src/main/java/com/yunbao/common/event/HideShowEvent.java +++ b/common/src/main/java/com/yunbao/common/event/HideShowEvent.java @@ -3,7 +3,17 @@ package com.yunbao.common.event; import com.yunbao.common.bean.BaseModel; public class HideShowEvent extends BaseModel { -private boolean isClose = false; + private boolean isClose = false; + private boolean hide = false; + + public boolean isHide() { + return hide; + } + + public HideShowEvent setHide(boolean hide) { + this.hide = hide; + return this; + } public boolean isClose() { return isClose; diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 6de7f1981..bab23995e 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -62,7 +62,7 @@ public class IMLoginManager extends BaseCacheManager { } public void setSudGameMin() { - put("SudGameMin", "1"); + put("SudGameMin", "0"); } public boolean getSudGameMin() { diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java index e3663c012..994096b36 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java @@ -163,9 +163,12 @@ public class LiveSudGamePopup extends BottomPopupView { @Subscribe(threadMode = ThreadMode.MAIN) public void onHideShow(HideShowEvent event) { - if (event.isClose()){ + if (event.isClose()) { dialog.dismiss(); - }else { + } else { + if (event.isHide()) { + findViewById(R.id.min_game).setVisibility(GONE); + } dialog.show(); } diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index f1400cc91..44f0584a7 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1365,7 +1365,7 @@ Limited ride And limited avatar frame Input quantity IN GAME You are currently in the game, please return in a timely manner.\\nFailure to return for a long time will be considered a surrender. - Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue + Exiting the live room will synchronize with exiting the game room. \\n Do you want to continue minimize diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 21e449365..2af184fd4 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1367,7 +1367,7 @@ Limited ride And limited avatar frame Enter the prank content... Input quantity You are currently in the game, please return in a timely manner.\\nFailure to return for a long time will be considered a surrender. - Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue + Exiting the live room will synchronize with exiting the game room. \\n Do you want to continue IN GAME minimize diff --git a/config.gradle b/config.gradle index a4c1d2a21..808d3435f 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : " https://ceshi.yaoulive.com", + serverHost : " https://ceshi.yaoulive.com", diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 3712281bc..74bf1aa8a 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1038,14 +1038,19 @@ public class LiveAudienceActivity extends LiveActivity { @Override public void interaction(long interactionID, List child) { - new XPopup.Builder(mContext) - .enableDrag(false) + if (manager != null && manager.getsudGameMin()) { + ToastUtil.show(WordUtil.isNewZh() ? "您已在游戏房间中" : "You are already in the game room"); + } else { + new XPopup.Builder(mContext) + .enableDrag(false) // .dismissOnTouchOutside(false) // .dismissOnBackPressed(false) - .moveUpToKeyboard(false) - .asCustom(new SudGameListPopup(mContext, interactionID, child, mLiveUid)) + .moveUpToKeyboard(false) + .asCustom(new SudGameListPopup(mContext, interactionID, child, mLiveUid)) + + .show(); + } - .show(); } }); new XPopup.Builder(mContext) @@ -1757,14 +1762,19 @@ public class LiveAudienceActivity extends LiveActivity { //互动游戏 if (event.isInteraction()) { // callBack.interaction(event.getInteractionID()); - new XPopup.Builder(mContext) - .enableDrag(false) + if (manager != null && manager.getsudGameMin()) { + ToastUtil.show(WordUtil.isNewZh() ? "您已在游戏房间中" : "You are already in the game room"); + } else { + new XPopup.Builder(mContext) + .enableDrag(false) // .dismissOnTouchOutside(false) // .dismissOnBackPressed(false) - .moveUpToKeyboard(false) - .asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(), mLiveUid)) + .moveUpToKeyboard(false) + .asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(), mLiveUid)) + + .show(); + } - .show(); } } diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index ada6fc712..533b3281a 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -754,7 +754,7 @@ public class SocketRyClient { case "SudGameCreateRoom": Bus.get().post(new LiveAudienceEvent() .setType(LiveAudienceEvent.LiveAudienceType.SUD_GAME_CREATE_ROOM) - .setAvatar(map.getString("room_name")) + .setAvatar(map.getString("sud_game_name")) .setCreateSudRoomModel(GsonUtils.fromJson(map.toString(), SudGameDateModel.class))); break; diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 240a922f9..350f44ae3 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -3123,6 +3123,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis return sudGameMin != null && sudGameMin.getVisibility() == View.VISIBLE; } + public void hidesudGameMin() { + if (sudGameMin != null) { + sudGameMin.setVisibility(View.GONE); + } + } + /** * 私信的切换动画 * diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 4264096d6..74affda03 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -52,6 +52,7 @@ import com.yunbao.common.bean.XydCompleteModel; import com.yunbao.common.custom.MyViewPager; import com.yunbao.common.event.AllServerNotifyEvent; import com.yunbao.common.event.FollowEvent; +import com.yunbao.common.event.HideShowEvent; import com.yunbao.common.event.LiveFloatEvent; import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.event.LiveRoomChangeEvent; @@ -722,7 +723,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.hindeRedPacket(); } if (TextUtils.equals(data.getSudGameRoomStatus(), "1")) { - mLiveRoomViewHolder.setSudName(data.getSudGameRoomName(), data.getSudGameDateModel()); + mLiveRoomViewHolder.setSudName(data.getSudGameDateModel().getSudGameName(), data.getSudGameDateModel()); } } @@ -1325,6 +1326,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveEndViewHolder.subscribeActivityLifeCycle(); mLiveEndViewHolder.addToParent(); Bus.get().post(new LiveGiftDialogEvent()); + Bus.get().post(new HideShowEvent().setClose(false).setHide(true)); + mLiveRoomViewHolder.hidesudGameMin(); } mLiveBean.setIsattention(isattention + ""); mLiveEndViewHolder.showData(mLiveBean, mLiveBean.getStream());