修改提交

QXLive/Base/QXGlobal.m

@@ -242,6 +242,9 @@
     }
     if ([roomId isEqualToString:self.roomId]) {
         if ([navagationController.viewControllers containsObject:self.roomVC]) {
+            if (![navagationController.visibleViewController isEqual:self.roomVC]) {
+                [navagationController popToViewController:self.roomVC animated:YES];
+            }
             return;
         }else{
             [UIApplication sharedApplication].idleTimerDisabled = YES;
@@ -296,7 +299,7 @@
             [[QXRoomMessageManager shared] joinGroupWithRoomId:roomId];
             [QXMineNetwork joinRoomWithRoomId:roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
                 if (weakSelf.roomId && ![weakSelf.roomId isEqualToString:roomId]) {
-                    [weakSelf quitRoomWithRoomId:weakSelf.roomId];
+                    [weakSelf quitRoomWithRoomId:weakSelf.roomId removeListener:NO];
                 }
 //                hideLoadingInView(KEYWINDOW)
         //        roomModel.room_info.pk_room_id = @"33";
@@ -371,7 +374,7 @@
         }
     }
 }
--(void)quitRoomWithRoomId:(NSString *)roomId{
+-(void)quitRoomWithRoomId:(NSString *)roomId removeListener:(BOOL)removeListener{
     [self stopKeepTimer];
     [UIApplication sharedApplication].idleTimerDisabled = NO;
     /// 移除所有红包
@@ -389,7 +392,7 @@
     /// 销毁整个声网示例
     [[QXAgoraEngine sharedEngine] destroyEngine];
     /// 退出直播群
-    [[QXRoomMessageManager shared] quitGroupWithRoomId:roomId];
+    [[QXRoomMessageManager shared] quitGroupWithRoomId:roomId removeListener:removeListener];
     [[QXGlobal shareGlobal].offLineDict removeAllObjects];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     if (_roomVC) {