YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

首页弹窗推荐接口数据类型不对添加判断。

Browse Source
This commit is contained in:
骆召亮
2025-12-10 11:15:32 +08:00
parent 75f11fdb06
commit a9c2bd9878
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -2452,7 +2452,11 @@ public class RetrofitClient {
if (response.code() == 200) { if (response.code() == 200) {
BaseModel<IndexRecommendRoom> indexRecommendRoomBaseModel = response.body(); BaseModel<IndexRecommendRoom> indexRecommendRoomBaseModel = response.body();
if (indexRecommendRoomBaseModel.getCode() == 1) { if (indexRecommendRoomBaseModel.getCode() == 1) {
if (indexRecommendRoomBaseModel.getData() == null) {
observer.onNext(new IndexRecommendRoom());
}else {
observer.onNext(indexRecommendRoomBaseModel.getData()); observer.onNext(indexRecommendRoomBaseModel.getData());
}
} else if (indexRecommendRoomBaseModel.getCode() == 0) { } else if (indexRecommendRoomBaseModel.getCode() == 0) {
ToastUtils.showShort(indexRecommendRoomBaseModel.getMsg()); ToastUtils.showShort(indexRecommendRoomBaseModel.getMsg());
} else if (indexRecommendRoomBaseModel.getCode() == 301) { } else if (indexRecommendRoomBaseModel.getCode() == 301) {

2
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -75,7 +75,7 @@ open class Application : CommonAppContext() {
} }
override fun onNext(t: IndexRecommendRoom) { override fun onNext(t: IndexRecommendRoom) {
if (t != null) { if (!t.room_id.isNullOrEmpty()) {
inviteDialog = activity?.let { InviteDialog(it, t) } inviteDialog = activity?.let { InviteDialog(it, t) }
if (inviteDialog?.isShowing == false) { if (inviteDialog?.isShowing == false) {
inviteDialog?.setData(t) inviteDialog?.setData(t)

3
MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
View File

@@ -89,6 +89,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
@@ -889,7 +890,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
@Override @Override
public void index_recommend_room(IndexRecommendRoom indexRecommendRoom) { 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 = new InviteDialog(this, indexRecommendRoom);
inviteDialog.setData(indexRecommendRoom); inviteDialog.setData(indexRecommendRoom);
inviteDialog.show(); inviteDialog.show();