diff --git a/config.gradle b/config.gradle index 58279b97c..9e6022e26 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // 测试 - serverHost : " https://ceshi.yaoulive.com", +// serverHost : " https://ceshi.yaoulive.com", //百度语音识别 diff --git a/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java b/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java index 6eb1db028..ab211b57e 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java +++ b/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); }