提交

QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m

@@ -102,6 +102,9 @@ QXRoomUserInfoViewDelegate
         }
     }
     [self playHWDMP4];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [[QXGiftPlayerManager shareManager] startPlay];
+    });
     self.navigationController.viewControllers = marr;
 //    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
 }
@@ -110,8 +113,12 @@ QXRoomUserInfoViewDelegate
 //    [[QXGiftPlayerManager shareManager] stopPlay];
     self.continuousView.hidden = YES;
     [self stopHWDMP4];
+    
+}
+-(void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:animated];
+    [[QXGiftPlayerManager shareManager] stopPlay];
 }
-
 -(void)initSubViews{
     
 //    [self updateBgImage:@"room_background"];
@@ -235,9 +242,25 @@ QXRoomUserInfoViewDelegate
 }
 #pragma mark - 获取房间信息
 -(void)joinRoom{
+    if (self.roomModel) {
+        [self resetSubviews];
+        [self configRoomDataIsJoin:YES];
+    }else{
+        MJWeakSelf
+        [[QXRoomMessageManager shared] joinGroupWithRoomId:self.roomId];
+        [QXMineNetwork joinRoomWithRoomId:self.roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
+            weakSelf.roomModel = roomModel;
+            [self resetSubviews];
+            [self configRoomDataIsJoin:YES];
+        } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+            showToast(msg);
+           [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
+           dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+               [weakSelf.navigationController popViewControllerAnimated:YES];
+           });
+        }];
+    }
     
-    [self resetSubviews];
-    [self configRoomDataIsJoin:YES];
 ////        roomModel.room_info.pk_room_id = @"33";
 //        
 //