merge

room/src/main/java/com/swago/room/anchor/AnchorRoomFragment.kt

@@ -55,7 +55,6 @@ class AnchorRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
             if (gameList.size == 1){
                 //直接弹出游戏弹窗
                 setGameDefaultData(0)
-                openGameDialog()
             }else{
                 //弹出游戏选择弹窗
                 //弹出游戏选择弹窗

room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -424,12 +424,10 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
                     if (it.is_repeat_game==1){
                         //多次弹出游戏
                         setGameDefaultData(0)
-                        openGameDialog()
                     }else{
                         if (isFirst) {
                             //只弹出一次
                             setGameDefaultData(0)
-                            openGameDialog()
                             isFirst = false
                         }
                     }
@@ -456,12 +454,13 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
 
     fun setGameDefaultData(index:Int) {
         SwagoRoomManager.iRoomInfo?.let {
-            if (it is UserRoomModel && gameList.isNotEmpty()) {
+            if (it is UserRoomModel && gameList.size>index) {
                 it.roomModel?.game_api_url = gameList[index].game_api_url
                 it.roomModel?.game_down_url = gameList[index].game_down_url
                 it.roomModel?.game_type = gameList[index].game_type
                 it.roomModel?.game_version = gameList[index].game_version
                 it.roomModel?.game_icon_url = gameList[index].game_icon_url
+                openGameDialog()
             }
         }
     }

room/src/main/java/com/swago/room/user/UserRoomFragment.kt

@@ -111,7 +111,6 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
             if (gameList.size == 1){
                 //直接弹出游戏弹窗
                 setGameDefaultData(0)
-                openGameDialog()
             }else{
                 //弹出游戏选择弹窗
                 GameListDialog.newInstance(gameList).apply {