From d8e9cc21894e998fdd7d158e0f86dadaaa50e561 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 18 Jun 2024 15:09:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E6=88=BF=E5=B0=B1=E5=85=B3=E6=8E=89=E5=B0=8F=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/live/activity/SudRyGameActivity.java    | 5 +++++
 .../java/com/yunbao/live/activity/SudSwGameActivity.java    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/activity/SudRyGameActivity.java b/live/src/main/java/com/yunbao/live/activity/SudRyGameActivity.java
index 719666c70..1a568cb1f 100644
--- a/live/src/main/java/com/yunbao/live/activity/SudRyGameActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/SudRyGameActivity.java
@@ -19,6 +19,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
+import com.lzf.easyfloat.EasyFloat;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
@@ -56,6 +57,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.LiveSudGameHistoryPopup;
 import com.yunbao.common.views.TopGradual;
+import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
 
@@ -102,6 +104,9 @@ public class SudRyGameActivity extends AbsActivity implements GameRyMicManager.M
         Bus.getOn(this);
         super.main();
         initView();
+        //进游戏房就关掉小窗
+        EasyFloat.dismiss("LiveFloatView", true);
+        APPEasyFloat.getInstance().dismiss(mContext);
         initDate();
     }
 
diff --git a/live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java b/live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java
index ad8a9e2f5..4b8130988 100644
--- a/live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java
@@ -54,6 +54,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.LiveSudGameHistoryPopup;
 import com.yunbao.common.views.TopGradual;
+import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
 
@@ -106,6 +107,9 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
         Bus.getOn(this);
         super.main();
         initView();
+        //进游戏房就关掉小窗
+        EasyFloat.dismiss("LiveFloatView", true);
+        APPEasyFloat.getInstance().dismiss(mContext);
         initDate();
     }
 
@@ -129,8 +133,6 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
 
             }
         });
-        //进游戏房就关掉小窗
-        EasyFloat.dismiss("LiveFloatView", true);
 
         // 设置禁用麦克风采集
         //RCRTCEngine.getInstance().getDefaultAudioStream().setMicrophoneDisable(disable);