From 531d62ae3a5a6074c0184f3f2116a7807db92b48 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 14:54:06 +0800
Subject: [PATCH] fix bugs.71

---
 .../java/com/xscm/modulemain/Application.kt   |  7 ++++++-
 .../activity/main/activity/MainActivity.java  |  5 ++++-
 .../room/fragment/RoomKtvFragment.java        | 19 ++++++++++++-------
 gradle.properties                             |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
index 3cac930f..6a9f4730 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
@@ -66,9 +66,14 @@ open class Application : CommonAppContext() {
         initCrashUtils()
         initSmartRefreshLayout()
 
+
+    }
+
+
+    fun bgToForeground() {
         AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
             override fun onForeground(activity: Activity?) {//应用切换到前台
-                if (!CommonAppContext.getInstance().isPlaying && activity is MainActivity) {
+                if (!CommonAppContext.getInstance().isPlaying) {
                     RetrofitClient.getInstance()
                         .index_recommend_room(object : BaseObserver<IndexRecommendRoom>() {
                             override fun onSubscribe(d: Disposable) {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
index 9ee37482..e063016e 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
@@ -40,6 +40,7 @@ import com.permissionx.guolindev.callback.RequestCallback;
 import com.stx.xhb.xbanner.XBanner;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.xscm.modulemain.Application;
 import com.xscm.modulemain.BaseMvpActivity;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.main.contacts.HomeContacts;
@@ -176,6 +177,8 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         }
 
         MessageListenerSingleton.getInstance().ensureListenersAdded();
+        CommonAppContext.getInstance().upMqtt();
+        Application.Companion.getInstance().bgToForeground();
     }
 
     @Override
@@ -479,7 +482,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
 ////            RoomManager.instance( CommonAppContext.getInstance()).joinRoomWithRoomId(CommonAppContext.getInstance().playId, true);
 //            return;
 //        }
-        CommonAppContext.getInstance().upMqtt();
+
         MvpPre.loginIm();
         Logger.i("MainActivity", "onResume");
 //        Beta.checkAppUpgrade(false, false);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index 86e264d7..0e2b7445 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -48,6 +48,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.List;
+import java.util.Objects;
 
 import io.agora.karaoke_view.v11.KaraokeEvent;
 import io.agora.karaoke_view.v11.KaraokeView;
@@ -298,8 +299,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
             } else {
                 setVisibilityView(4);
             }
-        }catch (Exception e){
-            LogUtils.e("RoomKtvFragment","sv()"+e.getMessage());
+        } catch (Exception e) {
+            LogUtils.e("RoomKtvFragment", "sv()" + e.getMessage());
         }
     }
 
@@ -311,7 +312,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         mBinding.lyricsView.setActiveLineUpcomingTextColor(getResources().getColor(com.xscm.moduleutil.R.color.color_0DFFB9));
         mBinding.lyricsView.setCurrentLineHighlightedTextColor(getResources().getColor(com.xscm.moduleutil.R.color.color_0DFFB9));
         mBinding.lyricsView.setCurrentLineTextColor(getResources().getColor(com.xscm.moduleutil.R.color.color_0DFFB9));
-        ((RoomActivity) ActivityUtils.getTopActivity()).getBinding().recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        if (getActivity() != null && getActivity() instanceof RoomActivity) {
+            ((RoomActivity) getActivity()).getBinding().recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        }
         mBinding.muName.setText("暂无歌曲");
         mBinding.muXName.setText("暂无歌曲");
         startRotateAnimation();
@@ -350,7 +353,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 });
             }
         };
-        ((RoomActivity) ActivityUtils.getTopActivity()).getBinding().recyclerView.setAdapter(adapter);
+        if (getActivity() != null && getActivity() instanceof RoomActivity) {
+            Objects.requireNonNull(((RoomActivity) getActivity()).getBinding()).recyclerView.setAdapter(adapter);
+        }
 
         isRotate = false;
         RoomKtvWheatView muYc = mBinding.muYc;
@@ -426,8 +431,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 if (!muJb.getUserId().equals("")) {
                     RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), muJb.getUserId(), muJb.pitNumber, getHostUser(), false, 2, isNumberWhether(), getChildFragmentManager());
                 } else {
-                    if (ActivityUtils.getTopActivity() instanceof RoomActivity) {
-                        if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) {
+                    if (getActivity() != null && getActivity() instanceof RoomActivity) {
+                        if (((RoomActivity) getActivity()).getHostUser() < 4) {
                             RoomOnlineDialogFragment.show(roomInfoResp.getRoom_info().getRoom_id(), "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                         } else {
                             com.hjq.toast.ToastUtils.show("请等待主持抱麦");
@@ -546,7 +551,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
             AgoraManager.getInstance().stopMuisc();
             MvpPre.changeSong(roomInfoResp.getRoom_info().getRoom_id(), did);
         } else if (id == R.id.ll_ds) {
-            if (mBinding.muYc.pitBean.getUser_id() != null && !mBinding.muYc.pitBean.getUser_id().equals("")&& !mBinding.muYc.pitBean.getUser_id().equals("0")) {
+            if (mBinding.muYc.pitBean.getUser_id() != null && !mBinding.muYc.pitBean.getUser_id().equals("") && !mBinding.muYc.pitBean.getUser_id().equals("0")) {
                 UserInfo userInfo = new UserInfo();
                 userInfo.setAvatar(roomInfoResp.getSong_user_info().getAvatar());
                 userInfo.setNickname(roomInfoResp.getSong_user_info().getNickname());
diff --git a/gradle.properties b/gradle.properties
index 9f13af9e..68cbcf37 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.8.0
-APP_VERSION_CODE=70
+APP_VERSION_NAME=1.0.8.1
+APP_VERSION_CODE=71
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15