diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
index 827bb6d..d7fd1a3 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
@@ -59,6 +59,7 @@ import com.example.moduleroom.R;
 import com.example.moduleroom.contacts.RoomContacts;
 import com.example.moduleroom.databinding.ActivityRoomBinding;
 import com.example.moduleroom.dialog.CardRelationshipFragment;
+import com.example.moduleroom.dialog.CustomCenterDialogFragment;
 import com.example.moduleroom.dialog.ExitRoomBottomSheet;
 import com.example.moduleroom.dialog.FriendsDialogFragment;
 import com.example.moduleroom.dialog.PublishCommentDialogFragment;
@@ -613,6 +614,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 }
             }
             roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")){
+                roomFragment.handleAuctionMessageEvent(messageEvent);
+            }
+
         } else if (messageEvent.getMsgType() == 123) {
             EventBus.getDefault().post(new RoomSettingEvent());
         } else if (messageEvent.getMsgType() == 1014) {
@@ -724,29 +729,21 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 switchMic(2);
             }
 
-
         } else if (messageEvent.getMsgType() == 1022) {
             if (messageEvent.getText().getType() == 1) {//拍卖位上麦
                 if (messageEvent.getText().getPit_number().equals("888")) {
-                    mRoomInfoResp.getRoom_auction().setAuction_user(getPitBean3(messageEvent));
+                    int type = -1; // 或其他默认值
+                    if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
+                        type = (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) ? 1 : 2;
+                    }
                     if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
                         setRoleType(3, 888);
                         switchMic(2);
-//                            parentFragment.setRoleType(3, 888);
-//                            parentFragment.switchMic(2);
+                        CardRelationshipFragment.show(mRoomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getSupportFragmentManager());
                     }
                 }
-                int type = -1; // 或其他默认值
-                if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-                    type = (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) ? 1 : 2;
-                }
-                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                    CardRelationshipFragment.show(mRoomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type+"", getSupportFragmentManager());
-                }
             } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
                 if (messageEvent.getText().getPit_number().equals("9")) {
-                    mRoomInfoResp.getRoom_info().getPit_list().set(0, getPitBean2(messageEvent, "9"));
-                    mRoomInfoResp.getUser_info().setPit_number(0);
                     setRoleType(0, 0);
                     switchMic(2);
                 } else if (messageEvent.getText().getPit_number().equals("888")) {
@@ -757,7 +754,25 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                     }
                 }
             }
-        } else if (messageEvent.getMsgType() == 1020) {
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            roomFragment.handleAuctionMessageEvent(messageEvent);
+        }else if(messageEvent.getMsgType() == 1023){
+            mRoomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
+            SpUtil.setAuctionId(messageEvent.getText().getAuction_user().getAuction_id());
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+        }else if (messageEvent.getMsgType() == 1024) {//竞拍，拍卖列表变化
+            mRoomInfoResp.getRoom_auction().setAuction_list(messageEvent.getText().getAuction_list());
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+        }else if (messageEvent.getMsgType() == 1025) {//结束
+           roomFragment.handleAuctionMessageEvent(messageEvent);
+        }else if (messageEvent.getMsgType() == 1026) {//主持延迟
+            roomFragment.handleAuctionMessageEvent(messageEvent);
+        }else if (messageEvent.getMsgType() == 1027) {//拍卖类型变化
+//            mRoomInfoResp.getRoom_info().setLabel_id(messageEvent.getText().getText()+"");
+//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            roomFragment.handleAuctionMessageEvent(messageEvent);
+        }
+        else if (messageEvent.getMsgType() == 1020) {
             mRoomBean = messageEvent.getText().getRoomInfo();
             EventBus.getDefault().post(mRoomBean);
             changeBackgroundColor(mRoomBean.getRoom_background());
@@ -779,11 +794,15 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             }
         } else if (messageEvent.getMsgType() == 1021) {
 //            EventBus.getDefault().post(new RoomClearCardiacRunnable(messageEvent.getRoomId()));
-            for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-                roomPitBean.setCharm("");
-                mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
+            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")){
+                roomFragment.handleAuctionMessageEvent(messageEvent);
+            }else {
+                for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
+                    roomPitBean.setCharm("");
+                    mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
+                }
+                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
             }
-            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         } else if (messageEvent.getMsgType() == 1036) {
             if (messageEvent.getText().getRoom_id().equals(roomId)) {
                 if (!mBinding.roomTop.tvNum.getText().toString().equals(messageEvent.getText().getOnline_number() + "")) {
@@ -874,6 +893,8 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 //                MvpPre.getRoomIn(AgoraManager.getInstance(context).getLastRoomId(), "");
 //                AgoraManager.getInstance(context).setLastRoomId("");
             }
+        }else if (messageEvent.getMsgType() == 1035) {
+            roomFragment.handleAuctionMessageEvent(messageEvent);
         }
 
     }
@@ -906,7 +927,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 
     // TODO: 2025/8/29 排麦位上麦
     private RoomAuction.AuctionUserBean getPitBean3(RoomMessageEvent messageEvent) {
-        RoomAuction.AuctionUserBean roomAuction = new RoomAuction().getAuction_user();
+        RoomAuction.AuctionUserBean roomAuction = new RoomAuction.AuctionUserBean();
         roomAuction.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
         roomAuction.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
         roomAuction.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java
index b29023d..307ff47 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java
@@ -89,7 +89,7 @@ public class WheatFeedingDialogFragment extends BaseMvpDialogFragment<WheatPrese
                 mBinding.tvQk.setVisibility(VISIBLE);
                 mBinding.tvWheatRefuse.setVisibility(VISIBLE);
                 mBinding.tvWheatAccept.setVisibility(VISIBLE);
-                mBinding.tvWheatSq.setVisibility(VISIBLE);
+                mBinding.tvWheatSq.setVisibility(GONE);
                 mBinding.tv3.setVisibility(VISIBLE);
                 mBinding.tv3.setText("设置");
                 // ... 设置其他控件的可见性
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
index 1be153c..b729119 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
@@ -206,6 +206,8 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 imActionYs.setVisibility(INVISIBLE);
             }
         }
+        getTextView();
+        steView(type);
     }
 
     @Override
@@ -214,21 +216,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
     }
 
     ///主持上麦
-    public void auctionData(RoomMessageEvent messageEvent){
-//        wheatView.setData(getPitBean(messageEvent));
-        if (messageEvent.getText().getPit_number().equals("9")) {
-            wheatView.setData(getPitBean(messageEvent));
-            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                imActionJs.setVisibility(View.VISIBLE);
-                imActionYs.setVisibility(View.VISIBLE);
-
-                parentFragment.updateWheatStatus(getPitBean(messageEvent), 9, true, true);
-            } else {
-                getvjs();
-                imActionYs.setVisibility(INVISIBLE);
-            }
-        }
-    }
 
     public void initOverlayButtons() {
 //        if (isButtonsInflated) return;
@@ -305,9 +292,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         mBinding.user4.setOnClickListener(this::onChock);
         mBinding.user5.setOnClickListener(this::onChock);
         mBinding.user6.setOnClickListener(this::onChock);
-        getTextView();
-        initOverlayButtons();
-        steView(type);
+//        getTextView();
+//        initOverlayButtons();
+//        steView(type);
 
         mBinding.qinmi.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
     }
@@ -620,200 +607,202 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
     }
 
 //    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void roomInfoEvent(RoomMessageEvent messageEvent) {
-        boolean b = false;
-//        if (messageEvent.getMsgType() == 1003) {//上麦
-//            if (messageEvent.getText().getPit_number().equals("9")) {
-//                wheatView.setData(getPitBean(messageEvent));
-//                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                    imActionJs.setVisibility(View.VISIBLE);
-//                    imActionYs.setVisibility(View.VISIBLE);
+//    public void roomInfoEvent(RoomMessageEvent messageEvent) {
+//        boolean b = false;
+////        if (messageEvent.getMsgType() == 1003) {//上麦
+////            if (messageEvent.getText().getPit_number().equals("9")) {
+////                wheatView.setData(getPitBean(messageEvent));
+////                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+////                    imActionJs.setVisibility(View.VISIBLE);
+////                    imActionYs.setVisibility(View.VISIBLE);
+////
+////                    parentFragment.updateWheatStatus(getPitBean(messageEvent), 9, true, true);
+////                } else {
+////                    getvjs();
+////                    imActionYs.setVisibility(INVISIBLE);
+////                }
+////            }
+////        } else
+////            if (messageEvent.getMsgType() == 1004) {
+////            if (messageEvent.getText().getPit_number().equals("9")) {
+////                wheatView.setData(getPitBean2(messageEvent, "9"));
+////                getvjs();
+////                imActionYs.setVisibility(GONE);
+////
+////
+////                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+////                    RoomPitBean pitBean = wheatView.pitBean;
+////                    pitBean.setUser_id("");
+////                    pitBean.setAvatar("");
+////                    pitBean.setNickname("");
+////                    pitBean.setSex("");
+////                    pitBean.setCharm("");
+////                    parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, true);
+//////                    parentFragment.setRoleType(0, 0);
+//////                    parentFragment.switchMic(2);
+////                }
+////
+////            } else if (messageEvent.getText().getPit_number().equals("888")) {
+////                wheatView2.setData(getPitBean2(messageEvent, "888"));
+////                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+////                    if (getActivity() instanceof RoomActivity) {
+////                        ((RoomActivity) getActivity()).setRoleType(0, 0);
+////                        ((RoomActivity) getActivity()).switchMic(2);
+////                    }
+//////                    parentFragment.setRoleType(0, 0);
+//////                    parentFragment.switchMic(2);
+////                }
+////            }
+////
+//////            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+//////                parentFragment.setRoleType(0, 0);
+//////                parentFragment.switchMic(2);
+//////            }
+////        } else
+//            if (messageEvent.getMsgType() == 1022) {
 //
-//                    parentFragment.updateWheatStatus(getPitBean(messageEvent), 9, true, true);
-//                } else {
+//            if (messageEvent.getText().getType() == 1) {//拍卖位上麦
+//                if (messageEvent.getText().getPit_number().equals("888")) {
+//                    wheatView2.setData(getPitBean(messageEvent));
 //                    getvjs();
-//                    imActionYs.setVisibility(INVISIBLE);
+//                    imActionYs.setVisibility(GONE);
+//                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+//                        if (getActivity() instanceof RoomActivity) {
+//                            ((RoomActivity) getActivity()).setRoleType(3, 888);
+//                            ((RoomActivity) getActivity()).switchMic(2);
+//                        }
+////                            parentFragment.setRoleType(3, 888);
+////                            parentFragment.switchMic(2);
+//                    }
+//                }
+//
+//                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+//                    CardRelationshipFragment.show(roomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getActivity().getSupportFragmentManager());
+//                }
+//            } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
+//                if (messageEvent.getText().getPit_number().equals("9")) {
+//                    wheatView.setData(getPitBean2(messageEvent, "9"));
+////                    assert parentFragment != null;
+////                    parentFragment.setRoleType(0, 0);
+////                    parentFragment.switchMic(2);
+//                    if (getActivity() instanceof RoomActivity) {
+//                        ((RoomActivity) getActivity()).setRoleType(0, 0);
+//                        ((RoomActivity) getActivity()).switchMic(2);
+//                    }
+//                } else if (messageEvent.getText().getPit_number().equals("888")) {
+//                    wheatView2.setData(getPitBean2(messageEvent, "888"));
+////                    if (parentFragment != null) {
+//                        if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+////                            parentFragment.setRoleType(0, 0);
+////                            parentFragment.switchMic(2);
+//                            if (getActivity() instanceof RoomActivity) {
+//                                ((RoomActivity) getActivity()).setRoleType(0, 0);
+//                                ((RoomActivity) getActivity()).switchMic(2);
+//                            }
+//                        }
+////                    }
+//                }
+//                yinc();
+//            }
+//
+//        } else
+//            if (messageEvent.getMsgType() == 1023) {//开始竞拍
+//            mBinding.ivJp.setVisibility(VISIBLE);
+//            if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
+//                imActionYs.setVisibility(VISIBLE);
+//                imActionJs.setVisibility(VISIBLE);
+//            } else {
+//                getvjs();
+//                imActionYs.setVisibility(GONE);
+//            }
+//            if (messageEvent.getText().getAuction_user().getUser_id().equals(SpUtil.getUserId() + "")) {
+//                mBinding.ivJp.setVisibility(INVISIBLE);
+//            }
+//            roomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
+//            auctionId = messageEvent.getText().getAuction_user().getAuction_id();
+//            SpUtil.setAuctionId(auctionId);
+//            countDownTime(messageEvent.getText().getAuction_user().getDuration());
+//            auctionUserBean = messageEvent.getText().getAuction_user();
+//            gengv();
+//        } else if (messageEvent.getMsgType() == 1024) {//竞拍，拍卖列表变化
+//            auctionList = messageEvent.getText().getAuction_list();
+//            gexList();
+//        } else if (messageEvent.getMsgType() == 1025) {//结束
+//            if (messageEvent.getText().getRecipient() != null) {//成功
+//                CustomCenterDialogFragment.showWithAutoDismiss(messageEvent.getText().getRecipient(), messageEvent.getText().getAuction_user(), getActivity().getSupportFragmentManager());
+//            } else {//失败
+//                showCountDownDialog(getContext());
+//            }
+//            SpUtil.setAuctionId("");
+//            mBinding.ivJp.setVisibility(INVISIBLE);
+//            imActionYs.setVisibility(INVISIBLE);
+//            getvjs();
+//            releaseCountDownTimer();
+//            auctionList = null;
+//            gexList();
+//            steView(type);
+//            isButtonsInflated = false;
+//        } else if (messageEvent.getMsgType() == 1012) {
+//            stub.setVisibility(GONE);
+//        } else if (messageEvent.getMsgType() == 1026) {//主持延迟
+//            countDownTime(messageEvent.getText().getDuration());
+//        } else if (messageEvent.getMsgType() == 1027) {//拍卖类型变化
+//            type = messageEvent.getText().getType();
+//            getTextView();
+//            steView(type);
+//        } else if (messageEvent.getMsgType() == 1005) {
+//            if (mBinding.roomMakeWheat2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+//                mBinding.tvPB.setText(messageEvent.getText().getToUserInfo().getCharm() + "");
+//            } else {
+//                if (mBinding.ivAuction1 != null && mBinding.ivAuction1.getUserId() != null) {
+//                    if (mBinding.ivAuction1.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+//                        RoomMakeWheatView wheatView = mBinding.ivAuction1;
+//                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+//                        wheatView.setData(wheatView.pitBean);
+//                    } else if (mBinding.ivAuction2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+//                        RoomMakeWheatView wheatView = mBinding.ivAuction2;
+//                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+//                        wheatView.setData(wheatView.pitBean);
+//                    } else if (mBinding.ivAuction3.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+//                        RoomMakeWheatView wheatView = mBinding.ivAuction3;
+//                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+//                        wheatView.setData(wheatView.pitBean);
+//                    }
 //                }
 //            }
-//        } else
-            if (messageEvent.getMsgType() == 1004) {
-            if (messageEvent.getText().getPit_number().equals("9")) {
-                wheatView.setData(getPitBean2(messageEvent, "9"));
-                getvjs();
-                imActionYs.setVisibility(GONE);
-
-
-                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                    RoomPitBean pitBean = wheatView.pitBean;
-                    pitBean.setUser_id("");
-                    pitBean.setAvatar("");
-                    pitBean.setNickname("");
-                    pitBean.setSex("");
-                    pitBean.setCharm("");
-                    parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, true);
-//                    parentFragment.setRoleType(0, 0);
-//                    parentFragment.switchMic(2);
-                }
-
-            } else if (messageEvent.getText().getPit_number().equals("888")) {
-                wheatView2.setData(getPitBean2(messageEvent, "888"));
-                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                    if (getActivity() instanceof RoomActivity) {
-                        ((RoomActivity) getActivity()).setRoleType(0, 0);
-                        ((RoomActivity) getActivity()).switchMic(2);
-                    }
-//                    parentFragment.setRoleType(0, 0);
-//                    parentFragment.switchMic(2);
-                }
-            }
-
-//            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                parentFragment.setRoleType(0, 0);
-//                parentFragment.switchMic(2);
+//        } else if (messageEvent.getMsgType() == 1035) {
+//            RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
+//            if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+//                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+//                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+//                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+//                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
+//                mBinding.roomMakeWheat.setData(pitBean);
 //            }
-        } else if (messageEvent.getMsgType() == 1022) {
-
-            if (messageEvent.getText().getType() == 1) {//拍卖位上麦
-                if (messageEvent.getText().getPit_number().equals("888")) {
-                    wheatView2.setData(getPitBean(messageEvent));
-                    getvjs();
-                    imActionYs.setVisibility(GONE);
-                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                        if (getActivity() instanceof RoomActivity) {
-                            ((RoomActivity) getActivity()).setRoleType(3, 888);
-                            ((RoomActivity) getActivity()).switchMic(2);
-                        }
-//                            parentFragment.setRoleType(3, 888);
-//                            parentFragment.switchMic(2);
-                    }
-                }
-
-                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-                    CardRelationshipFragment.show(roomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getActivity().getSupportFragmentManager());
-                }
-            } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
-                if (messageEvent.getText().getPit_number().equals("9")) {
-                    wheatView.setData(getPitBean2(messageEvent, "9"));
-//                    assert parentFragment != null;
-//                    parentFragment.setRoleType(0, 0);
-//                    parentFragment.switchMic(2);
-                    if (getActivity() instanceof RoomActivity) {
-                        ((RoomActivity) getActivity()).setRoleType(0, 0);
-                        ((RoomActivity) getActivity()).switchMic(2);
-                    }
-                } else if (messageEvent.getText().getPit_number().equals("888")) {
-                    wheatView2.setData(getPitBean2(messageEvent, "888"));
-//                    if (parentFragment != null) {
-                        if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                            parentFragment.setRoleType(0, 0);
-//                            parentFragment.switchMic(2);
-                            if (getActivity() instanceof RoomActivity) {
-                                ((RoomActivity) getActivity()).setRoleType(0, 0);
-                                ((RoomActivity) getActivity()).switchMic(2);
-                            }
-                        }
+//            RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
+//            if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+//                pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+//                pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+//                pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+//                pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
+//                mBinding.roomMakeWheat2.setData(pitBean2);
+//            }
+//
+//            if (auctionList != null && auctionList.size() > 0) {
+//                for (int i = 0; i < auctionList.size(); i++) {
+//                    if (auctionList.get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+//                        auctionList.get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
+//                        auctionList.get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+//                        auctionList.get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+//                        auctionList.get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+//                        gexList();
 //                    }
-                }
-                yinc();
-            }
-
-        } else if (messageEvent.getMsgType() == 1023) {//开始竞拍
-            mBinding.ivJp.setVisibility(VISIBLE);
-            if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
-                imActionYs.setVisibility(VISIBLE);
-                imActionJs.setVisibility(VISIBLE);
-            } else {
-                getvjs();
-                imActionYs.setVisibility(GONE);
-            }
-            if (messageEvent.getText().getAuction_user().getUser_id().equals(SpUtil.getUserId() + "")) {
-                mBinding.ivJp.setVisibility(INVISIBLE);
-            }
-            roomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
-            auctionId = messageEvent.getText().getAuction_user().getAuction_id();
-            SpUtil.setAuctionId(auctionId);
-            countDownTime(messageEvent.getText().getAuction_user().getDuration());
-            auctionUserBean = messageEvent.getText().getAuction_user();
-            gengv();
-        } else if (messageEvent.getMsgType() == 1024) {//竞拍，拍卖列表变化
-            auctionList = messageEvent.getText().getAuction_list();
-            gexList();
-        } else if (messageEvent.getMsgType() == 1025) {//结束
-            if (messageEvent.getText().getRecipient() != null) {//成功
-                CustomCenterDialogFragment.showWithAutoDismiss(messageEvent.getText().getRecipient(), messageEvent.getText().getAuction_user(), getActivity().getSupportFragmentManager());
-            } else {//失败
-                showCountDownDialog(getContext());
-            }
-            SpUtil.setAuctionId("");
-            mBinding.ivJp.setVisibility(INVISIBLE);
-            imActionYs.setVisibility(INVISIBLE);
-            getvjs();
-            releaseCountDownTimer();
-            auctionList = null;
-            gexList();
-            steView(type);
-            isButtonsInflated = false;
-        } else if (messageEvent.getMsgType() == 1012) {
-            stub.setVisibility(GONE);
-        } else if (messageEvent.getMsgType() == 1026) {//主持延迟
-            countDownTime(messageEvent.getText().getDuration());
-        } else if (messageEvent.getMsgType() == 1027) {//拍卖类型变化
-            type = messageEvent.getText().getType();
-            getTextView();
-            steView(type);
-        } else if (messageEvent.getMsgType() == 1005) {
-            if (mBinding.roomMakeWheat2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-                mBinding.tvPB.setText(messageEvent.getText().getToUserInfo().getCharm() + "");
-            } else {
-                if (mBinding.ivAuction1 != null && mBinding.ivAuction1.getUserId() != null) {
-                    if (mBinding.ivAuction1.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-                        RoomMakeWheatView wheatView = mBinding.ivAuction1;
-                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-                        wheatView.setData(wheatView.pitBean);
-                    } else if (mBinding.ivAuction2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-                        RoomMakeWheatView wheatView = mBinding.ivAuction2;
-                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-                        wheatView.setData(wheatView.pitBean);
-                    } else if (mBinding.ivAuction3.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-                        RoomMakeWheatView wheatView = mBinding.ivAuction3;
-                        wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-                        wheatView.setData(wheatView.pitBean);
-                    }
-                }
-            }
-        } else if (messageEvent.getMsgType() == 1035) {
-            RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
-            if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-                mBinding.roomMakeWheat.setData(pitBean);
-            }
-            RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
-            if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-                pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-                pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-                pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-                pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
-                mBinding.roomMakeWheat2.setData(pitBean2);
-            }
-
-            if (auctionList != null && auctionList.size() > 0) {
-                for (int i = 0; i < auctionList.size(); i++) {
-                    if (auctionList.get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-                        auctionList.get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
-                        auctionList.get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-                        auctionList.get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-                        auctionList.get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-                        gexList();
-                    }
-                }
-
-            }
-        }
-
-    }
+//                }
+//
+//            }
+//        }
+//
+//    }
 
     private void gengv() {
         if (auctionUserBean != null) {
@@ -827,6 +816,102 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         }
     }
 
+    public void event1022(RoomMessageEvent messageEvent) {
+        if (messageEvent.getText().getType() == 1) {//拍卖位上麦
+            if (messageEvent.getText().getPit_number().equals("888")) {
+                wheatView2.setData(getPitBean(messageEvent));
+                getvjs();
+                imActionYs.setVisibility(GONE);
+            }
+        } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
+            if (messageEvent.getText().getPit_number().equals("9")) {
+                wheatView.setData(getPitBean2(messageEvent, "9"));
+            } else if (messageEvent.getText().getPit_number().equals("888")) {
+                wheatView2.setData(getPitBean2(messageEvent, "888"));
+            }
+            yinc();
+        }
+    }
+    public void event1025(RoomMessageEvent messageEvent) {
+        if (messageEvent.getText().getRecipient() != null) {//成功
+            CustomCenterDialogFragment.showWithAutoDismiss(messageEvent.getText().getRecipient(), messageEvent.getText().getAuction_user(), getActivity().getSupportFragmentManager());
+        } else {//失败
+            showCountDownDialog(getContext());
+        }
+        SpUtil.setAuctionId("");
+        releaseCountDownTimer();
+        auctionList = null;
+        gexList();
+        steView(type);
+        isButtonsInflated = false;
+    }
+
+    public void event1021(RoomMessageEvent messageEvent) {
+        mBinding.tvPB.setText("0");
+    }
+    public void event1027(RoomMessageEvent messageEvent) {
+        type = messageEvent.getText().getType();
+        getTextView();
+        steView(type);
+    }
+
+    public void event1026(RoomMessageEvent messageEvent) {
+        countDownTime(messageEvent.getText().getDuration());
+    }
+    public void event1035(RoomMessageEvent messageEvent) {
+        RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
+        if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+            pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+            pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+            pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+            pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
+            mBinding.roomMakeWheat.setData(pitBean);
+        }
+        RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
+        if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+            pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+            pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+            pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+            pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
+            mBinding.roomMakeWheat2.setData(pitBean2);
+        }
+
+        if (auctionList != null && auctionList.size() > 0) {
+            for (int i = 0; i < auctionList.size(); i++) {
+                if (auctionList.get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+                    auctionList.get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
+                    auctionList.get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+                    auctionList.get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+                    auctionList.get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+                    gexList();
+                }
+            }
+
+        }
+    }
+
+    public void event1005(RoomMessageEvent messageEvent) {
+        if (mBinding.roomMakeWheat2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+            mBinding.tvPB.setText(messageEvent.getText().getToUserInfo().getCharm() + "");
+        } else {
+            if (mBinding.ivAuction1 != null && mBinding.ivAuction1.getUserId() != null) {
+                if (mBinding.ivAuction1.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+                    RoomMakeWheatView wheatView = mBinding.ivAuction1;
+                    wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+                    wheatView.setData(wheatView.pitBean);
+                } else if (mBinding.ivAuction2.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+                    RoomMakeWheatView wheatView = mBinding.ivAuction2;
+                    wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+                    wheatView.setData(wheatView.pitBean);
+                } else if (mBinding.ivAuction3.getUserId().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
+                    RoomMakeWheatView wheatView = mBinding.ivAuction3;
+                    wheatView.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
+                    wheatView.setData(wheatView.pitBean);
+                }
+            }
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
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 4f24f0b..1d47363 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -382,13 +382,13 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 replaceNestedFragment(RoomKtvFragment.newInstance(mRoomInfoResp), R.id.container);
             }
         } else if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
+//            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
                 replaceNestedFragment(RoomAuctionFragment.newInstance(), R.id.container);
 //                replaceNestedFragment(RoomAuctionFragment.newInstance(mRoomInfoResp, 1), R.id.container);
-            } else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
+//            } else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
                 replaceNestedFragment(RoomAuctionFragment.newInstance(), R.id.container);
 //                replaceNestedFragment(RoomAuctionFragment.newInstance(mRoomInfoResp, 2), R.id.container);
-            }
+//            }
         } else if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
             replaceNestedFragment(RoomCabinFragment.newInstance(mRoomInfoResp), R.id.container);
             setviewyc();
@@ -1225,14 +1225,41 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 //        mBinding.inputMenu1.show();
 //        mBinding.inputMenu1.setText("@" + messageEvent.getNickname());
 //    }
-
-
-    ///拍卖房上麦数据
-    public void auctionData(RoomMessageEvent messageEvent){
+// TODO: 2025/8/29 拍卖房的方法
+    public void handleAuctionMessageEvent(RoomMessageEvent messageEvent) {
         RoomAuctionFragment auctionFragment = (RoomAuctionFragment) getChildFragmentManager()
-                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
-        if (auctionFragment != null)
-            auctionFragment.auctionData(messageEvent);
+                .findFragmentByTag(RoomAuctionFragment.class.getSimpleName());
+
+        if (auctionFragment != null) {
+            switch (messageEvent.getMsgType()) {
+                case 1022:
+                    auctionFragment.event1022(messageEvent);
+                    break;
+                case 1025:
+                    auctionFragment.event1025(messageEvent);
+                    break;
+                case 1026:
+                    auctionFragment.event1026(messageEvent);
+                    break;
+                case 1005:
+                    auctionFragment.event1005(messageEvent);
+                    break;
+                case 1035:
+                    auctionFragment.event1035(messageEvent);
+                    break;
+                case 1021:
+                    auctionFragment.event1021(messageEvent);
+                    break;
+                    case 1027:
+                    auctionFragment.event1027(messageEvent);
+                    break;
+                default:
+                    // 可以添加默认处理或日志记录
+                    LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());
+                    break;
+            }
+        }
     }
 
+
 }
\ No newline at end of file