小遊戲bug修改

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;

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() {

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

common/src/main/res/values-en-rUS/string.xml

@@ -1365,7 +1365,7 @@ Limited ride And limited avatar frame</string>
     <string name="choose_a_prank_gift_hint2">Input quantity</string>
     <string name="sud_in_game">IN GAME</string>
     <string name="currently_in_the_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.</string>
-    <string name="the_live_room">Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue</string>
+    <string name="the_live_room">Exiting the live room will synchronize with exiting the game room. \\n Do you want to continue</string>
     <string name="sud_in_game_minimize">minimize</string>
 
 </resources>

common/src/main/res/values/strings.xml

@@ -1367,7 +1367,7 @@ Limited ride And limited avatar frame</string>
     <string name="choose_a_prank_gift_hint">Enter the prank content...</string>
     <string name="choose_a_prank_gift_hint2">Input quantity</string>
     <string name="currently_in_the_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.</string>
-    <string name="the_live_room">Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue</string>
+    <string name="the_live_room">Exiting the live room will synchronize with exiting the game room. \\n Do you want to continue</string>
     <string name="sud_in_game">IN GAME</string>
     <string name="sud_in_game_minimize">minimize</string>
 </resources>

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",
 
 
 

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -1038,6 +1038,9 @@ public class LiveAudienceActivity extends LiveActivity {
 
                         @Override
                         public void interaction(long interactionID, List<CustomSidebarChildModel> child) {
+                            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)
@@ -1047,6 +1050,8 @@ public class LiveAudienceActivity extends LiveActivity {
 
                                         .show();
                             }
+
+                        }
                     });
                     new XPopup.Builder(mContext)
                             .hasShadowBg(false)
@@ -1757,6 +1762,9 @@ public class LiveAudienceActivity extends LiveActivity {
         //互动游戏
         if (event.isInteraction()) {
 //            callBack.interaction(event.getInteractionID());
+            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)
@@ -1769,6 +1777,8 @@ public class LiveAudienceActivity extends LiveActivity {
 
         }
 
+    }
+
     @SuppressLint("SetTextI18n")
     public void showMsgRed(int num) {
         if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) {

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;
 

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);
+        }
+    }
+
     /**
      * 私信的切换动画
      *

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