遊戲bug修復

common/src/main/java/com/yunbao/common/bean/SudGameDateModel.java

@@ -19,6 +19,8 @@ public class SudGameDateModel extends BaseModel{
    private String roomStatus;
    @SerializedName("sud_game_name")
    private String sudGameName;
+   @SerializedName("sud_game_name_en")
+   private String sud_game_name_en;
    @SerializedName("room_name")
    private String roomName;
    @SerializedName("player_total")
@@ -40,6 +42,15 @@ public class SudGameDateModel extends BaseModel{
       return roomHolderId;
    }
 
+   public String getSud_game_name_en() {
+      return sud_game_name_en;
+   }
+
+   public SudGameDateModel setSud_game_name_en(String sud_game_name_en) {
+      this.sud_game_name_en = sud_game_name_en;
+      return this;
+   }
+
    public SudGameDateModel setRoomHolderId(String roomHolderId) {
       this.roomHolderId = roomHolderId;
       return this;

common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java

@@ -102,6 +102,7 @@ public class LiveSudGamePopup extends BottomPopupView {
                     dialog.hide();
                     Bus.get().post(new ShowHideEvent());
                 } else {
+                    IMLoginManager.get(getContext()).setSudGameMin();
                     new XPopup.Builder(getContext())
                             .asCustom(new HintCustomPopup(getContext(),
                                     getContext().getString(R.string.dialog_tip),
@@ -111,7 +112,7 @@ public class LiveSudGamePopup extends BottomPopupView {
                                     .setCallBack(new HintCustomPopup.HintCustomCallBack() {
                                         @Override
                                         public void onSure() {
-                                            IMLoginManager.get(getContext()).setSudGameMin();
+
                                             dialog.hide();
                                             Bus.get().post(new ShowHideEvent());
                                         }

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

@@ -1364,8 +1364,8 @@ 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="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="currently_in_the_game">You are currently in the game, please return in a timely manner.\n Failure to return for a long time will be considered a surrender. \n During the minimization, it will not be able to switch between live rooms</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="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-zh-rTW/strings.xml

@@ -1360,7 +1360,7 @@
     <string name="choose_a_prank_gift_hint">輸入整蠱內容...</string>
     <string name="choose_a_prank_gift_hint2">输入数量</string>
     <string name="sud_in_game">遊戲中</string>
-    <string name="currently_in_the_game">您正在遊戲中，請及時返回 長時間未返回將會視爲認輸哦</string>
+    <string name="currently_in_the_game">若您正在遊戲中，請及時返回\n長時間未返回將會視爲認輸哦\n【最小化期間將無法切換直播間】</string>
     <string name="the_live_room">退出直播間將會同步退出遊戲房間 是否继续</string>
     <string name="sud_in_game_minimize">最小化</string>
 </resources>

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

@@ -1360,7 +1360,7 @@
     <string name="choose_a_prank_gift_hint">輸入整蠱內容...</string>
     <string name="choose_a_prank_gift_hint2">输入数量</string>
     <string name="sud_in_game">遊戲中</string>
-    <string name="currently_in_the_game">您正在遊戲中，請及時返回\n長時間未返回將會視爲認輸哦</string>
+    <string name="currently_in_the_game">若您正在遊戲中，請及時返回\n長時間未返回將會視爲認輸哦\n【最小化期間將無法切換直播間】</string>
     <string name="the_live_room">退出直播間將會同步退出遊戲房間\n是否继续</string>
     <string name="sud_in_game_minimize">最小化</string>
 

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

@@ -1366,8 +1366,8 @@ Limited ride And limited avatar frame</string>
     <string name="choose_a_prank_gift">Choose a prank gift</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="currently_in_the_game">You are currently in the game, please return in a timely manner.\n Failure to return for a long time will be considered a surrender. \n During the minimization, it will not be able to switch between live rooms</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="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>

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

@@ -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();
+
+        }
+    }
+
     /**
      * 检查指定直播间连麦人数
      *

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

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -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();
+                if (getsudGameMin()) {
-                createSudRoomModel.setSudGameId(sudGameDateModel.getSudGameId());
+                    ToastUtil.show(WordUtil.isNewZh() ? "小遊戲進行中" : "Game in progress");
-                createSudRoomModel.setSudGameRoomId(sudGameDateModel.getSudGameRoomId());
+                } else {
-                createSudRoomModel.setAvatar(sudGameDateModel.getAvatar());
+                    CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
-                createSudRoomModel.setRoomName(sudGameDateModel.getRoomName());
+                    createSudRoomModel.setSudGameId(sudGameDateModel.getSudGameId());
-                createSudRoomModel.setSudGameName(sudGameDateModel.getSudGameName());
+                    createSudRoomModel.setSudGameRoomId(sudGameDateModel.getSudGameRoomId());
-                new XPopup.Builder(mContext)
+                    createSudRoomModel.setAvatar(sudGameDateModel.getAvatar());
-                        .enableDrag(false)
+                    createSudRoomModel.setRoomName(sudGameDateModel.getRoomName());
-                        .dismissOnTouchOutside(false)
+                    createSudRoomModel.setSudGameName(sudGameDateModel.getSudGameName());
-                        .dismissOnBackPressed(false)
+                    new XPopup.Builder(mContext)
-                        .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
+                            .enableDrag(false)
-                        .show();
+                            .dismissOnTouchOutside(false)
+                            .dismissOnBackPressed(false)
+                            .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
+                            .show();
+                }
+
             }
         });
         sudNameHandler.removeCallbacks(sudNameRunnable);

live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java

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