From 792aa2cd5b2e6e0e75811b375c18a07df679eb62 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Tue, 30 Aug 2022 18:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yizhuan/erban/ui/user/UserInfoActivity.java     | 3 +--
 .../com/yizhuan/xchat_android_core/praise/PraiseModel.java   | 2 +-
 .../yizhuan/xchat_android_core/praise/event/PraiseEvent.java | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
index 4216b6540..14403796e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
@@ -557,16 +557,15 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onPraise(PraiseEvent event) {
+        getDialogManager().dismissDialog();
         if (event.getLikedUid() != userId ||
                 userId == AuthModel.get().getCurrentUid()) {
             return;
         }
         if (event.isFailed()) {
-            getDialogManager().dismissDialog();
             toast(event.getError());
             return;
         }
-        getDialogManager().dismissDialog();
         toast(event.isPraise() ? R.string.fan_success : R.string.cancel_fan_success);
         setLikedText(event.isPraise());
     }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java
index a6f78e2eb..3a991b050 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java
@@ -90,7 +90,7 @@ public class PraiseModel extends BaseModel implements IPraiseModel {
                     }
                 })
                 .doOnError(throwable -> {
-                    EventBus.getDefault().post(new PraiseEvent(throwable.getMessage()));
+                    EventBus.getDefault().post(new PraiseEvent(likedUid, throwable.getMessage()));
                 });
 
     }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java
index a596149d2..668373b8a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java
@@ -6,7 +6,7 @@ import lombok.Data;
  * create by lvzebiao on 2018/9/4
  */
 @Data
-public class PraiseEvent{
+public class PraiseEvent {
 
     private boolean praise;
 
@@ -22,7 +22,8 @@ public class PraiseEvent{
         this.likedUid = likedUid;
     }
 
-    public PraiseEvent(String error) {
+    public PraiseEvent(long likedUid, String error) {
+        this.likedUid = likedUid;
         this.failed = true;
         this.error = error;
     }