This commit is contained in:
启星
2025-09-24 09:28:49 +08:00
parent dad4a5164d
commit 6b15cc818f
11 changed files with 75 additions and 39 deletions

View File

@@ -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,12 +242,28 @@ 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";
//
//
//
//
// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
// showToast(msg);
// [[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
@@ -884,7 +907,7 @@ QXRoomUserInfoViewDelegate
self.sendGiftView.roomId = self.roomId;
[self.sendGiftView showInView:self.view];
// [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
//
//
// }];
}
///
@@ -985,7 +1008,7 @@ QXRoomUserInfoViewDelegate
#pragma mark - pk
-(void)recievePKInviteWithSendRoomId:(NSString *)SendRoomId AcceptRoomId:(NSString *)AcceptRoomId PkId:(NSString *)PkId message:(nonnull NSString *)message{
if (self.seatContentView.myPitNumber == 9) {
///
///
MJWeakSelf
QXAlertView *al = [[QXAlertView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(175))];
al.type = QXAlertViewTypeAgreeSong;
@@ -999,7 +1022,7 @@ QXRoomUserInfoViewDelegate
};
al.cancelBlock = ^{
// [QXMineNetwork roomPkAgreeWithPk_id:PkId type:@"2" successBlock:^(NSDictionary * _Nonnull dict) {
//
//
// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
// showToast(msg);
// }];
@@ -1143,34 +1166,34 @@ QXRoomUserInfoViewDelegate
// ScaleWidth(429));
// CGRect initialFrame = CGRectOffset(finalFrame, 0, finalFrame.size.height);
// vc.view.frame = initialFrame;
//
//
// //
// vc.view.layer.cornerRadius = 10;
// vc.view.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner;
// vc.view.clipsToBounds = YES;
//
//
// //
// vc.view.layer.shadowColor = [UIColor blackColor].CGColor;
// vc.view.layer.shadowOffset = CGSizeMake(0, -5);
// vc.view.layer.shadowOpacity = 0.3;
// vc.view.layer.shadowRadius = 10;
//
//
// //
// [self addChildViewController:vc];
// [self.view addSubview:vc.view];
// [vc didMoveToParentViewController:self];
//
//
// //
// UIView *dimmingView = [[UIView alloc] initWithFrame:self.view.bounds];
// dimmingView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
// dimmingView.alpha = 0;
// dimmingView.tag = 212;
// [self.view insertSubview:dimmingView belowSubview:vc.view];
//
//
// //
// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissHalfScreenView)];
// [dimmingView addGestureRecognizer:tap];
//
//
// //
// [UIView animateWithDuration:0.3 animations:^{
// vc.view.frame = finalFrame;
@@ -1326,7 +1349,7 @@ QXRoomUserInfoViewDelegate
self.sendGiftView.roomId = self.roomId;
[self.sendGiftView showInView:self.view];
// [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
//
//
// }];
}
@@ -1547,7 +1570,7 @@ QXRoomUserInfoViewDelegate
self.sendGiftView.roomId = self.userInfoView.roomId;
[self.sendGiftView showInView:self.view];
// [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
//
//
// }];
}
break;
@@ -1570,7 +1593,7 @@ QXRoomUserInfoViewDelegate
self.sendGiftView.roomId = self.roomId;
[self.sendGiftView showInView:self.view];
// [[QXGlobal shareGlobal] showView:self.sendGiftView controller:self popType:(PopViewTypeBottomToUpActionSheet) tapDismiss:YES finishBlock:^{
//
//
// }];
}
#pragma - mark