Merge remote-tracking branch 'origin/master'

main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java

@@ -8,9 +8,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.lzf.easyfloat.EasyFloat;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.main.R;
 import com.yunbao.main.fragment.MainHomeCommunityVideoFragment;
 
@@ -36,6 +38,11 @@ public class MainHomeCommunityActivity extends AbsActivity {
         FT.replace(R.id.fragment, communityVideoFragment);//替换碎片
         FT.addToBackStack(null);//是否启动回退栈
         FT.commit();//提交
+        //判断是否有直播悬浮窗，有直接关闭
+        if (EasyFloat.isShow("LiveFloatView")) {
+            EasyFloat.dismiss("LiveFloatView", true);
+        }
+        APPEasyFloat.getInstance().dismiss(mContext);
 
     }