From 716f292fa5419f195a61179350a1ccf9dfbf1860 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Mon, 12 Jan 2026 17:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E6=88=BF=E9=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=89=8D=E5=85=AD=E4=B8=AA=E8=83=BD=E8=AF=B4?=
 =?UTF-8?q?=E8=AF=9D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 551a9028..119eb9ac 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1055,6 +1055,26 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
         MvpPre?.roomRedPackets(roomId)
 
+
+        if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION){
+            var userId = 0
+            mRoomInfoResp?.room_auction?.auction_list?.forEachIndexed { idx, auction ->
+                if (idx < 6) {
+                    if (auction.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) {
+                        if (mRoomInfoResp?.room_info?.pit_list!![0].user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) {
+                            userId = -1
+                        } else {
+                            userId = auction.user_id.toInt()
+                        }
+                        mRoomInfoResp?.user_info?.pit_number = 1
+
+                        roomBtnShowIsHide(userId)
+                    }
+                }
+            }
+        }
+
+
         roomBtnShowIsHide()
 
         softRebuildUI()
@@ -1926,11 +1946,18 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     mRoomInfoResp?.user_info?.pit_number = 0
                 }
                 mRoomInfoResp?.room_info?.pit_list!![0] = RoomPitBean(pitNumber)
+                var userId = 0
+                mRoomInfoResp?.room_auction?.auction_list?.forEachIndexed { idx, auction ->
+                    if (idx < 6) {
+                        if (auction.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) {
+                            if (mRoomInfoResp?.room_info?.pit_list!![0].user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) {
+                                userId = -1
+                            } else {
+                                userId = auction.user_id.toInt()
+                            }
+                            mRoomInfoResp?.user_info?.pit_number = 1
 
-                if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION){
-                    mRoomInfoResp?.room_auction?.auction_list?.forEach { it ->
-                        if (it.user_id.equals(SpUtil.getUserId().toString())) {
-                            mRoomInfoResp?.user_info?.pit_number = 9527
+                            roomBtnShowIsHide(userId)
                         }
                     }
                 }
@@ -2004,6 +2031,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (text == null || mRoomInfoResp == null || mRoomInfoResp?.room_auction == null) return
         if (mRoomInfoResp?.room_auction?.auction_list != null) {
             mRoomInfoResp?.room_auction?.auction_list!!.clear()
+        } else {
+            mRoomInfoResp?.room_auction?.auction_list = arrayListOf()
         }
 
         var userId = 0
@@ -3071,14 +3100,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             mBinding?.rlMisc?.visibility = View.GONE
         }
 
-        if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION){
-            mRoomInfoResp?.room_auction?.auction_list?.forEach { it ->
-                if (it.user_id.equals(SpUtil.getUserId().toString())) {
-                    mRoomInfoResp?.user_info?.pit_number = 9527
-                }
-            }
-        }
-
         //是否在麦上显示状态
         if (mRoomInfoResp?.user_info?.pit_number != 0) {
             maiStatus = false