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 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