From b7320cb51a29f166c2f125603a36f246d98832e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Tue, 23 Dec 2025 00:44:52 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=B8=85=E9=99=A4=E9=AD=85?=
 =?UTF-8?q?=E5=8A=9B=E6=8A=A5=E9=94=99=202=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=E8=AF=B7=E6=B1=82=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF=EF=BC=8Clogin?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/moduleutil/base/CommonAppContext.java   | 2 +-
 .../java/com/xscm/moduleutil/http/RetrofitClient.java     | 8 +++++++-
 .../activity/room/fragment/SingSongFragment.java          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 57b520f5..fc43960c 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -133,7 +133,7 @@ public class CommonAppContext extends MultiDexApplication implements Application
     @Getter
     public UnreadCountEvent unreadCountEvent;
 
-    public static int selectRelease = -1;
+    public static int selectRelease = 1;
 
     @Override
     public void onCreate() {
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 258110a5..eaf6271c 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -2337,12 +2337,18 @@ public class RetrofitClient {
                     }else {
                         observer.onNext(new BeforeJoinRoomCheckBean());
                     }
+                }else {
+                    if (joinRoomLoadListener != null) {
+                        joinRoomLoadListener.onJoinRoomLoad("网络异常");
+                    }
                 }
             }
 
             @Override
             public void onFailure(Call<BaseModel<BeforeJoinRoomCheckBean>> call, Throwable t) {
-
+                if (joinRoomLoadListener != null) {
+                    joinRoomLoadListener.onJoinRoomLoad("网络异常");
+                }
             }
         });
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
index 565f920c..65b596ef 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
@@ -1045,7 +1045,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 
         if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
             if (pitBean != null) {
-                if (pitBean.getUser_id() != null) {
+                if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
                     wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
                     return;
                 }