Merge branch 'google' into qiye

app/src/main/java/com/swago/app/SplashVm.kt

@@ -108,7 +108,6 @@ class SplashVm(application: Application) : BaseViewModel(application) {
             UrlConstant.BASE_URL =   "http:test-api.swago.cn"
 //            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
 //            UrlConstant.BASE_URL =    "https://api.swagobei.com"
-//            UrlConstant.BASE_URL =   "http://advance.swago.cn"
 //            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
             UrlConstant.BASE_URL = baseUrl

baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -17,7 +17,6 @@ object UrlConstant {
             "http:test-api.swago.cn"
 //            "http:huawei.swago.cn"
 //        "https://api.swagobei.com"
-//        "http://advance.swago.cn"
 //        "https://pro-api.swago.cn"
     } else {
             "https://pro-api.swago.cn"

baseswago/src/main/java/com/swago/baseswago/model/live/RoomConfig.java

@@ -24,7 +24,7 @@ public class RoomConfig implements Parcelable {
     * rotation_img_url : http://image2.vv-tool.com/2021/09/13/03/09/30/47067.jpg
     * rotation_url : d
     */
-   private int is_show_game; //1展示 0不展示  是否显示线上游戏图标
+   private int is_show_game; //1展示 0不展示  是否显示线上游戏图标 1.1.6版本需求废弃 改用游戏列表是否有数据来显示和隐藏游戏图标
    private int auto_show_game;//是否自动弹出游戏（1是0否）
    private int is_repeat_game;//当日是否多次弹出游戏（1是0否）
    private ArrayList<BannersBean> banners;

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

@@ -230,8 +230,11 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         }
         //飘条
         msgVm.waftFun = {
-            if (it is GamePrize && roomConfig?.is_show_game == 1){
-                waftManager.addNewMessage(it)
+            //如果是游戏飘条 要判断游戏列表是否有数据有则展示游戏飘条
+            if (it is GamePrize){
+                if (gameList.isNotEmpty()){
+                    waftManager.addNewMessage(it)
+                }
             }else{
                 waftManager.addNewMessage(it)
             }
@@ -261,6 +264,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         //游戏列表
         roomVm.gameListModelLiveData.observe(this){
             it.game?.let { gameData ->
+                iFooter.setGameIcon(gameData.isNotEmpty())
                 gameList.addAll(gameData)
             }
         }
@@ -268,7 +272,6 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         //直播间配置
         roomVm.roomConfigLiveData.observe(this){
             this.roomConfig = it
-            iFooter.setGameIcon(it.is_show_game==1)
             //轮播图
             binding.bannerView.setData(it.banners)
             binding.bannerView.jumpToWebFun = { banner ->
@@ -420,7 +423,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         lifecycleScope.launch(Dispatchers.Main){
             delay(2000)
             roomConfig?.let {
-                if (it.is_show_game==1&&it.auto_show_game==1){
+                if (gameList.isNotEmpty()&&it.auto_show_game==1){
                     if (it.is_repeat_game==1){
                         //多次弹出游戏
                         setGameDefaultData(0)