From 0bc1023c991afd6f71f7c61c352cbd41c6f08578 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Tue, 6 Aug 2024 19:27:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/chwl/app/ui/user/activity/UserInfoActivity.java  | 3 +++
 .../java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt  | 3 +++
 core/src/main/java/com/chwl/core/user/UserModel.java          | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
index cc57b5ecd..9b4cd45f9 100644
--- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
+++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
@@ -245,6 +245,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
             initPhoto(dataBean.getPrivatePhoto());
             setWhereVisible();
         });
+        viewModel.getUserInfoDetailError().observe(this, String -> {
+            finish();
+        });
     }
 
     private void setTitleVisible(boolean visible) {
diff --git a/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt
index 3b2024640..149237dc9 100644
--- a/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt
+++ b/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt
@@ -26,7 +26,9 @@ class UserInfoViewModel : BaseViewModel() {
     val userInfoData: LiveData<UserInfo> = _userInfoData
 
     private val _userInfoDetailData = MutableLiveData<UserDetailInfo.DataBean>()
+    private val _userInfoDetailError = MutableLiveData<String>()
     val userInfoDetailData: LiveData<UserDetailInfo.DataBean> = _userInfoDetailData
+    val userInfoDetailError: LiveData<String> = _userInfoDetailError
 
     val userClanData = MutableLiveData<UserClanInfo>()
 
@@ -55,6 +57,7 @@ class UserInfoViewModel : BaseViewModel() {
             .subscribe(object : BeanObserver<UserDetailInfo?>() {
                 override fun onErrorMsg(error: String) {
                     error.toast()
+                    _userInfoDetailError.postValue(error)
                 }
 
                 override fun onSuccess(info: UserDetailInfo) {
diff --git a/core/src/main/java/com/chwl/core/user/UserModel.java b/core/src/main/java/com/chwl/core/user/UserModel.java
index 52e501f36..6887262b3 100644
--- a/core/src/main/java/com/chwl/core/user/UserModel.java
+++ b/core/src/main/java/com/chwl/core/user/UserModel.java
@@ -48,6 +48,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -307,6 +308,9 @@ public final class UserModel extends BaseModel implements IUserModel {
                     if (null == userDetailInfo) {
                         return Single.error(new Exception(ResUtil.getString(R.string.xchat_android_core_user_usermodel_06)));
                     }
+                    if (userDetailInfo.getCode() != 200) {
+                        return Single.error(new Exception(userDetailInfo.getMessage()));
+                    }
                     return Single.just(userDetailInfo);
                 });
     }