From 98cedafaae86f74456e33bec05301ab46cd7c660 Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Mon, 3 Jun 2024 16:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/MenuContainerView/XPRoomMenuContainerView.m     | 6 +++---
 .../YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m | 2 +-
 YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m    | 9 +++++----
 .../YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m       | 2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
index 757281d7..156319bb 100644
--- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
+++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
@@ -271,7 +271,7 @@
 
 - (void)initSubViewConstraints {
     [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(self).offset(40);
+        make.leading.mas_equalTo(self).offset(15);
         make.trailing.mas_equalTo(self.gameButton.mas_leading).offset(-11);
         make.top.mas_equalTo(self).offset(16);
         make.height.mas_equalTo(29);
@@ -286,7 +286,7 @@
     }];
     [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.scrollView);
-        make.trailing.mas_equalTo(self).offset(-40);
+        make.trailing.mas_equalTo(self).offset(-15);
         make.size.mas_equalTo(CGSizeMake(32, 32));
     }];
     [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -294,7 +294,7 @@
     }];
     [self.gameButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.scrollView);
-        make.trailing.mas_equalTo(self).offset(-83);
+        make.trailing.equalTo(self.svgDisplayView.mas_leading).mas_offset(-11);
         make.size.mas_equalTo(CGSizeMake(29, 29));
     }];
 }
diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m
index 1ef39df7..1c086fb3 100644
--- a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m
+++ b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m
@@ -123,7 +123,7 @@
 ///退出房间
 -(void)closeRoomGameWithRoomId:(NSString *)roomId{
     [Api closeRoomGame:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-        
+        NSLog(@"111");
     } roomId:roomId];
 }
 @end
diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m
index 49eb699a..5bfb98cd 100644
--- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m
+++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m
@@ -260,11 +260,12 @@
                 AttachmentModel * attachment = (AttachmentModel *)obj.attachment;
                 if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Match_Success){
                     MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:attachment.data];
-                    [self.presenter exitNIMRoom:self.roomId];
-                    self.roomId = model.roomId;
+                    if(![self.roomId isEqualToString:model.roomId]){
+                        [self.presenter exitNIMRoom:self.roomId];
+                        self.roomId = model.roomId;
+                        [self.presenter enterNIMRoom:model.roomId user:self.userinfo];
+                    }
                     self.headView.roomGameModel = model;
-                    
-                    [self.presenter enterNIMRoom:model.roomId user:self.userinfo];
                     self.roomGameView.gameModel = model;
                     if(self.roomGameView.superview == nil){
                         [self.bgImageView addSubview:self.roomGameView];
diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m
index 55781033..ec63889f 100644
--- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m
+++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m
@@ -31,7 +31,9 @@
 }
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    if(self.gameModel == nil){
     [self.presenter getRoomGameConfig];
+    }
     [self.presenter getCoinNum];
     
 }