From 56bb9943778b545d810bf5c31c7fbbd0f1bb9cfa Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Thu, 4 Dec 2025 18:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=94=B1=E6=97=A0=E5=94=B1=E8=80=85?=
 =?UTF-8?q?=E9=97=AA=E9=80=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/fragment/RoomJukeboxFragment.java | 13 ++++++++++---
 gradle.properties                                   |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
index 26f7035e..f4f9677c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
@@ -18,6 +18,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.activity.RoomActivity;
 import com.xscm.modulemain.activity.room.contacts.JukeboxContacts;
@@ -500,11 +501,17 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
             pitBean.setCharm(fromUserInfo.getCharm());
             pitBean.setDress(fromUserInfo.getDress());
             pitBean.setIs_online(fromUserInfo.getIs_online());
-            if (roomInfoResp.getSinger_info().getSong_info().getSinger_user_id() == userId) {
-                pitBean.setImageType(true);
-            } else {
+            try {
+                if (roomInfoResp.getSinger_info().getSong_info().getSinger_user_id() == userId) {
+                    pitBean.setImageType(true);
+                } else {
+                    pitBean.setImageType(false);
+                }
+            }catch (NullPointerException e){
+                LogUtils.e("juke",e.getMessage());
                 pitBean.setImageType(false);
             }
+
             // 使用set方法更新数据，然后通知适配器
             dataList.set(position, pitBean);
             adapter.notifyItemChanged(position);
diff --git a/gradle.properties b/gradle.properties
index 59f8ddcc..f42ac63a 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.6.9
-APP_VERSION_CODE=59
+APP_VERSION_NAME=1.0.7.1
+APP_VERSION_CODE=61
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15