From a9c2bd98783f56b64fb252d097c1ad1078b152b9 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 11:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BC=B9=E7=AA=97=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xscm/moduleutil/http/RetrofitClient.java  | 6 +++++-
 MainModule/src/main/java/com/xscm/modulemain/Application.kt | 2 +-
 .../modulemain/activity/main/activity/MainActivity.java     | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

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 16b8d168..bbbea4b9 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -2452,7 +2452,11 @@ public class RetrofitClient {
                 if (response.code() == 200) {
                     BaseModel<IndexRecommendRoom> indexRecommendRoomBaseModel = response.body();
                     if (indexRecommendRoomBaseModel.getCode() == 1) {
-                        observer.onNext(indexRecommendRoomBaseModel.getData());
+                        if (indexRecommendRoomBaseModel.getData() == null) {
+                            observer.onNext(new IndexRecommendRoom());
+                        }else {
+                            observer.onNext(indexRecommendRoomBaseModel.getData());
+                        }
                     } else if (indexRecommendRoomBaseModel.getCode() == 0) {
                         ToastUtils.showShort(indexRecommendRoomBaseModel.getMsg());
                     } else if (indexRecommendRoomBaseModel.getCode() == 301) {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
index 5f6e1f00..bf5285b4 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
@@ -75,7 +75,7 @@ open class Application : CommonAppContext() {
                             }
 
                             override fun onNext(t: IndexRecommendRoom) {
-                                if (t != null) {
+                                if (!t.room_id.isNullOrEmpty()) {
                                     inviteDialog = activity?.let { InviteDialog(it, t) }
                                     if (inviteDialog?.isShowing == false) {
                                         inviteDialog?.setData(t)
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 818e12ce..9ee37482 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
@@ -89,6 +89,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
@@ -889,7 +890,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
     @Override
     public void index_recommend_room(IndexRecommendRoom indexRecommendRoom) {
 
-        if (indexRecommendRoom != null) {
+        if (indexRecommendRoom != null && !Objects.requireNonNull(indexRecommendRoom.getRoom_id()).isEmpty()) {
             inviteDialog = new InviteDialog(this, indexRecommendRoom);
             inviteDialog.setData(indexRecommendRoom);
             inviteDialog.show();