修改提交

QXLive/Room(房间)/Controller/QXRoomViewController.m

@@ -319,7 +319,7 @@ QXRoomUserInfoViewDelegate
             
         }failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
             showToast(msg);
-           [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
+            [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                [weakSelf.navigationController popViewControllerAnimated:YES];
            });
@@ -655,7 +655,11 @@ QXRoomUserInfoViewDelegate
     }
     BOOL hasSong = NO;
     if ((self.roomModel.room_info.type_id.intValue == 1) && self.roomModel.room_info.label_id.intValue == 2) {
-        hasSong = YES;
+        if (self.roomModel.pk_info) {
+            hasSong = NO;
+        }else{
+            hasSong = YES;
+        }
     }
     /// 暂时不要pk
 //    hasPK = NO;
@@ -906,7 +910,7 @@ QXRoomUserInfoViewDelegate
 // 踢出房间
 -(void)userDidTakeOffWithUserInfo:(QXUserHomeModel *)userInfo{
     if ([userInfo.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
-        [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
+        [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
 //        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
         [self.navigationController popViewControllerAnimated:YES];
     }