From 233c6926aded3947e5ffef5e5d99123e6dd8633d Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Sun, 7 Dec 2025 16:08:13 +0800
Subject: [PATCH] 69 1

---
 .../room/fragment/RoomKtvFragment.java        | 28 +++++++++++--------
 gradle.properties                             |  4 +--
 2 files changed, 18 insertions(+), 14 deletions(-)

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 45e22827..56b81dec 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
@@ -283,19 +283,23 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         // 提前获取相关对象引用，避免多次调用 getter
         MusicSongBean songUserInfo = roomInfoResp.getSong_user_info();
 
-        if (songUserInfo != null) {
-            //演唱者and主持
-            if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) {
-                setVisibilityView(1);
-            } else if (roomDefaultWheatView.getUserId().equals(userIdStr)) {//主持 非演唱者
-                setVisibilityView(2);
-            } else if (songUserInfo.getUser_id().equals(userIdStr)) {//演唱者
-                setVisibilityView(3);
-            } else {//观众
+        try {
+            if (songUserInfo != null && songUserInfo.getUser_id() != null) {
+                //演唱者and主持
+                if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) {
+                    setVisibilityView(1);
+                } else if (roomDefaultWheatView.getUserId().equals(userIdStr)) {//主持 非演唱者
+                    setVisibilityView(2);
+                } else if (songUserInfo.getUser_id().equals(userIdStr)) {//演唱者
+                    setVisibilityView(3);
+                } else {//观众
+                    setVisibilityView(4);
+                }
+            } else {
                 setVisibilityView(4);
             }
-        } else {
-            setVisibilityView(5);
+        }catch (Exception e){
+            LogUtils.e("RoomKtvFragment","sv()"+e.getMessage());
         }
     }
 
@@ -720,7 +724,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 pitBean.setDress("");
                 pitBean.setUser_code("");
                 mBinding.muYc.setData(pitBean);
-                roomInfoResp.setSong_user_info(new MusicSongBean());
+                roomInfoResp.setSong_user_info(null);
                 ((RoomActivity) getActivity()).setRoleType(0, 0);
                 did = "";
                 mBinding.muName.setText("无");
diff --git a/gradle.properties b/gradle.properties
index e7c523f9..3cc49b90 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.7.8
-APP_VERSION_CODE=68
+APP_VERSION_NAME=1.0.7.9
+APP_VERSION_CODE=69
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15