1:修改练歌房点歌后,某些歌曲返回的类型错误,

2:修改启动页播放视频,黑屏后直接跳过播放
3:修改退出关闭mqtt
4:修改进入应用,会在登录页面和编辑页面弹起弹框和推荐的问题
5:修改房间,在推送了礼物后,多次判断是否布局打开
This commit is contained in:
2025-12-25 10:31:47 +08:00
parent 826469178e
commit bb31bafa55
8 changed files with 145 additions and 125 deletions

View File

@@ -13,6 +13,7 @@ import com.opensource.svgaplayer.utils.log.SVGALogger
import com.scwang.smartrefresh.layout.SmartRefreshLayout
import com.scwang.smartrefresh.layout.footer.ClassicsFooter
import com.scwang.smartrefresh.layout.header.ClassicsHeader
import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity
import com.xscm.modulemain.activity.room.activity.RoomActivity
import com.xscm.modulemain.dialog.InviteDialog
import com.xscm.modulemain.manager.RoomManager
@@ -240,7 +241,7 @@ open class Application : CommonAppContext() {
fun bgToForeground() {
AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
override fun onForeground(activity: Activity?) {//应用切换到前台
if (!CommonAppContext.getInstance().isPlaying) {
if (!CommonAppContext.getInstance().isPlaying && activity !is ImproveInfoActivity ) {
RetrofitClient.getInstance()
.index_recommend_room(object : BaseObserver<IndexRecommendRoom>() {
override fun onSubscribe(d: Disposable) {
@@ -265,7 +266,7 @@ open class Application : CommonAppContext() {
fun showInviteDialog(activity: Activity?, t: IndexRecommendRoom) {
if (isKeepScreenOn)
return
if (activity != null && activity == getCurDialogActivity() && inviteDialog != null) {
if (activity != null && activity == getCurDialogActivity() && inviteDialog != null && activity !is ImproveInfoActivity) {
inviteDialog?.setData(t)
return
}