From 85756d85c64e7db02d4913b8d14f00b61c51a248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 13 Oct 2025 03:11:33 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8B=8D=E5=8D=96?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=8F=91=E9=80=81=E8=83=8C=E5=8C=85=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/moduleutil/bean/UserInfo.java   |  3 ++-
 .../com/xscm/moduleutil/http/RetrofitClient.java  |  4 ++++
 .../moduleroom/dialog/RoomGiftDialogFragment.java | 15 ++++++++++-----
 .../fragment/PublicScreenEaseChatFragment.java    |  2 +-
 .../example/moduleroom/fragment/RoomFragment.java |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
index 1652495..6c64b59 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import com.google.gson.annotations.SerializedName;
 import com.xscm.moduleutil.bean.room.FriendInfo;
 
 import java.io.Serializable;
@@ -16,7 +17,7 @@ public class UserInfo implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String FEMALE = "2";
     public static final String MALE = "1";
-//    @SerializedName(value = "id", alternate = "user_id")
+    private int id;
     private int user_id; //用户id
     private String user_code;//用户id码
     private String avatar;//头像
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index cd11979..f926980 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -2264,6 +2264,10 @@ public class RetrofitClient {
                             observer.onNext(new RoomAuction.AuctionListBean());
                         }
                     }
+                    @Override
+                    public void onFailure(Throwable t) {
+                        t.printStackTrace();
+                    }
                 });
 //                .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() {
 //
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
index 42cbdfe..4ec1c56 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
@@ -91,7 +91,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
     private SelectGiftNumPopupWindow mSelectGiftNumPopupWindow;
     private KeyboardPopupWindow mKeyboardPopupWindow;
     private List<GiftNumBean> mGiftNumList;
-    private RoonGiftModel roonGiftModel = null;
+    private RoonGiftModel roonGiftModel = new RoonGiftModel();
     private GiftPackBean giftModel = null;
     private RoomInfoResp roomInfoResp;
     private String label_id;
@@ -648,11 +648,12 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
                         beibaoId = roonGiftModel.getGift_id();
                         MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id);
                     }else {
+                        beibaoId = roonGiftModel.getGift_id();
+                        MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2");
                         roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
                         EventBus.getDefault().post(roomGiftGiveEvent);
                         roomGiftGiveEvent = null;
-                        MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "1");
-                        dismiss();
+//                        dismiss();
                     }
                 } else{
                     giftNumber = num;
@@ -814,9 +815,13 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         if (roomGiftGiveEvent != null) {
             EventBus.getDefault().post(roomGiftGiveEvent);
             roomGiftGiveEvent = null;
-            dismiss();
+//            dismiss();
         }
-        dismiss();
+        GiftPackEvent giftPackEvent = new GiftPackEvent();
+        giftPackEvent.setBdid(beibaoId);
+        EventBus.getDefault().post(giftPackEvent);
+        MvpPre.getGiftPackListCount();
+//        dismiss();
     }
 
     @Override
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
index 82bbfb4..cb10d4d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
@@ -348,7 +348,7 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
             EMMessageInfo item = easeChatAdapter.getItem(position);
             RoomMessageEvent emMessage = item.getEmMessage();
             if (emMessage.getText().getFromUserInfo() != null) {
-                RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), emMessage.getText().getFromUserInfo().getUser_id() + "", emMessage.getText().getFromUserInfo().getPit_number(), getHostUser(roomInfoResp.getUser_info()), false, 5, isNumberWhether(), getChildFragmentManager());
+                RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), emMessage.getText().getFromUserInfo().getUser_id()!=0?emMessage.getText().getFromUserInfo().getUser_id()+"":emMessage.getText().getFromUserInfo().getId() + "", emMessage.getText().getFromUserInfo().getPit_number(), getHostUser(roomInfoResp.getUser_info()), false, 5, isNumberWhether(), getChildFragmentManager());
             }
 //            String userId = item.getEmMessage().getStringAttribute("user_id", "");
 //            if (!TextUtils.isEmpty(userId)) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
index 3b24b5a..09d950b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -1234,7 +1234,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                     if (AgoraManager.getInstance(getContext()).isLocalAudioEnabled()) {
                         roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone);
                     } else {
-                        roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off);
+//                        roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off);
                     }
                 }
             }