修复bug

YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h

@@ -18,6 +18,9 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType;
 ///退出房间
 +(void)closeRoomGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId;
+
+///首页得到房间详情
++(void)getRoomGameDetailsForHoem:(HttpRequestHelperCompletion)completion;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m

@@ -20,6 +20,10 @@
 +(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType{
     [self makeRequest:@"chatRoom/getByType" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomType,nil];
 }
+///首页得到房间详情
++(void)getRoomGameDetailsForHoem:(HttpRequestHelperCompletion)completion {
+    [self makeRequest:@"miniGame/nav/resumeRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,nil];
+}
 ///退出房间
 +(void)closeRoomGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId{
     [self makeRequest:@"miniGame/nav/close" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomId,nil];

YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m

@@ -50,7 +50,6 @@
     [super viewDidLoad];
     [self installUI];
     [self installConstraints];
-    [self.presenter getRoomGameDetailWithRoomType:@"0"];
     [[NIMSDK sharedSDK].chatroomManager addDelegate:self];
     [[NIMSDK sharedSDK].chatManager addDelegate:self];
     [[NIMSDK sharedSDK].loginManager addDelegate:self];
@@ -159,7 +158,13 @@
     self.headView.roomGameModel = model;
     self.headView.userInfo = self.userinfo;
     self.roomId = model.roomId;
-    [self.presenter enterNIMRoom:model.roomId user:self.userinfo];
+    
+    
+    
+    [self enterNIMRoomWithRoomId:self.roomId];
+    
+    
+    
     if(model.data.matchStatus == MSRoomGameInfoModelMatchSuccessfully && model.data.roundStatus == 0){
         self.roomGameView.gameModel = model;
         if(self.roomGameView.superview == nil){
@@ -177,6 +182,24 @@
         
     }
 }
+-(void)enterNIMRoomWithRoomId:(NSString *)roomUid{
+    NIMChatroomMemberRequest *request = [[NIMChatroomMemberRequest  alloc]init];
+    request. roomId = [NSString stringWithFormat:@"%@", self.roomId];
+    request. type = NIMChatroomFetchMemberTypeRegular;
+    [[NIMSDK sharedSDK]. chatroomManager fetchChatroomMembers:request completion:^(NSError * _Nullable error, NSArray<NIMChatroomMember *>  * _Nullable members) {
+        BOOL isEnterRoom = NO;
+        NSString *uid = [[AccountInfoStorage instance]getUid];
+        for (NIMChatroomMember *obj in members) {
+            if([obj.userId isEqualToString:uid]){
+                isEnterRoom = YES;
+                break;
+            }
+        }
+        if(isEnterRoom == NO){
+            [self.presenter enterNIMRoom:roomUid user:self.userinfo];
+        }
+    }];
+}
 #pragma mark -MSRoomGameVictoryViewDelegate
 - (void)closeGameAction{
     self.isShowResults = NO;
@@ -263,7 +286,7 @@
                     if(![self.roomId isEqualToString:model.roomId]){
                         [self.presenter exitNIMRoom:self.roomId];
                         self.roomId = model.roomId;
-                        [self.presenter enterNIMRoom:model.roomId user:self.userinfo];
+                        [self enterNIMRoomWithRoomId:self.roomId];
                     }
                     self.headView.roomGameModel = model;
                     self.roomGameView.gameModel = model;

YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.m

@@ -96,7 +96,7 @@
 - (void)setItemModel:(MSTabbarRoomGameItemModel *)itemModel{
     _itemModel = itemModel;
     _coinNumView.text = _itemModel.ticket;
-    _titleView.text = _itemModel.modeName;
+    _titleView.text =  [NSString stringWithFormat:YMLocalizedString(@"MSRoomGameHeadView4"),_itemModel.modeName];
 }
 -(void)ruleBtnAction{
     if(self.delegate && [self.delegate respondsToSelector:@selector(clickRuleActionWithModel:)]){

YuMi/Modules/YMTabbar/View/TabbarViewController.m

@@ -254,7 +254,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
     }
 }
 -(void)getRoomGameInfo{
-    [Api getRoomGameDetails:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+    [Api getRoomGameDetailsForHoem:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
         if(code == 200){
             MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:data.data];
             if(model.data.matchStatus == 1 && model.data.roundStatus == 0){
@@ -268,7 +268,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
                
             }
         }
-    } roomType:@"0"];
+    }];
 }
 #pragma mark -MSRoomGameQuitGameViewDelegate
 ///退出游戏

YuMi/ar.lproj/Localizable.strings

@@ -3817,6 +3817,7 @@ ineHeadView12" = "الحمل";
 "MSRoomGameHeadView1"="تمت المطابقة ";
 "MSRoomGameHeadView2"="الفوز بمكافأة %@ عملة ذهبية";
 "MSRoomGameHeadView3"="%@ عملة ذهبية";
+"MSRoomGameHeadView4"="(%@)رسوم الدخول ";
 //MSRoomGameVC
 "MSRoomGameVC0"="فشلت المطابقة";
 "MSRoomGameVC1"="المحفظة";

YuMi/en.lproj/Localizable.strings

@@ -3625,6 +3625,7 @@
 "MSRoomGameHeadView1"="Match successful";
 "MSRoomGameHeadView2"="Winning reward %@ gold coins";
 "MSRoomGameHeadView3"="%@ gold coins";
+"MSRoomGameHeadView4"="Entry Fee(%@)";
 //MSRoomGameVC
 "MSRoomGameVC0"="Match failed";
 "MSRoomGameVC1"="Wallet";

YuMi/zh-Hans.lproj/Localizable.strings

@@ -3280,6 +3280,7 @@
 "MSRoomGameHeadView1"="匹配成功";
 "MSRoomGameHeadView2"="获胜奖励%@金币";
 "MSRoomGameHeadView3"="%@金币";
+"MSRoomGameHeadView4"="入场费(%@)";
 //MSRoomGameVC
 "MSRoomGameVC0"="匹配失败";
 "MSRoomGameVC1"="钱包";

YuMi/zh-Hant.lproj/Localizable.strings

@@ -3274,6 +3274,7 @@
 "MSRoomGameHeadView1"="匹配成功";
 "MSRoomGameHeadView2"="获胜奖励%@金币";
 "MSRoomGameHeadView3"="%@金币";
+"MSRoomGameHeadView4"="入場費(%@)";
 //MSRoomGameVC
 "MSRoomGameVC0"="匹配失败";
 "MSRoomGameVC1"="钱包";