YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

提交

Browse Source
This commit is contained in:
启星
2025-11-21 16:17:05 +08:00
parent 7ac937ddbf
commit 8913ea6f48
283 changed files with 8474 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
QXLive/Room(房间)/Controller/QXRoomViewController.m
View File

@@ -39,6 +39,8 @@
#import "QXGiftDisplayManager.h"
#import "QXRoomDayTaskTagView.h"
#import "QXTaskViewController.h"
#import "QXRoomViewController+Singer.h"
#import "QXDrifNobilityJoinRoomView.h"
@interface QXRoomViewController ()<
QXRoomBottomViewDelegate,
@@ -98,6 +100,7 @@ QXRoomUserInfoViewDelegate
[self initRedpacketManager];
[self initGiftDriftManager];
[self initActivityObeserver];
[[QXDrifNobilityJoinRoomView shareView] setupDisplayViewInContainer:self.view];
// [self performSelector:@selector(test) afterDelay:5];
}
//-(void)test{
@@ -146,6 +149,7 @@ QXRoomUserInfoViewDelegate
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[[QXGiftPlayerManager shareManager] startPlay];
[[QXGiftDisplayManager sharedManager] becomeFront];
// [[QXDrifNobilityJoinRoomView shareView] dirfViewBecomeToFront];
});
self.navigationController.viewControllers = marr;
// self.navigationController.interactivePopGestureRecognizer.enabled = NO;
@@ -155,12 +159,12 @@ QXRoomUserInfoViewDelegate
// [[QXGiftPlayerManager shareManager] stopPlay];
self.continuousView.hidden = YES;
[self stopHWDMP4];
}
-(void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
[[QXGiftPlayerManager shareManager] stopPlay];
[[QXGiftDisplayManager sharedManager] inBackGround];
[[QXDrifNobilityJoinRoomView shareView] dirfViewDidToBackground];
}
-(void)initSubViews{
@@ -364,7 +368,7 @@ QXRoomUserInfoViewDelegate
if (self.roomModel.room_info.type_id.intValue == 1 || self.roomModel.room_info.type_id.intValue == 3 || self.roomModel.room_info.type_id.intValue == 4 || self.roomModel.room_info.type_id.intValue == 8) {
// 点唱房
if (self.roomModel.room_info.label_id.intValue == 1) {
if (self.roomModel.pk_info.pk_room_id.intValue>0) {
/// 在pk状态
[self.seatContentView setType:(QXRoomSeatViewTypePK)];
@@ -452,6 +456,8 @@ QXRoomUserInfoViewDelegate
}else if (self.roomModel.room_info.type_id.intValue == 7) {
/// 交友房
[self resetFriendViews];
}else if (self.roomModel.room_info.type_id.intValue == 9) {
[self resetSingerViews];
}
if (self.roomModel.room_info.last_pk_room_id.isExist) {
@@ -513,9 +519,12 @@ QXRoomUserInfoViewDelegate
//音效按钮
if (self.seatContentView.myPitNumber == 9) {
self.soundBtn.hidden = NO;
self.titleView.isCompere = YES;
}else{
self.soundBtn.hidden = YES;
}
if (self.roomModel.user_info.is_host.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1 || self.roomModel.user_info.is_room_owner.intValue == 1) {
self.titleView.isCompere = YES;
}else{
self.titleView.isCompere = NO;
}
if (self.roomModel.room_info.head_line != nil) {
@@ -554,10 +563,7 @@ QXRoomUserInfoViewDelegate
}else{
uid = weakSelf.roomModel.cp_user.user_id1.longLongValue;
}
//// if (_movieView) {
//// [_movieView removeFromSuperview];
//// _movieView = nil;
//// }
[[QXAgoraEngine sharedEngine] startPreViewWithUid:uid view:self.movieView.videoView];
[[QXAgoraEngine sharedEngine] setClientRoleBroadcaster:YES];
[[QXAgoraEngine sharedEngine] enableAudio:NO];
@@ -610,6 +616,7 @@ QXRoomUserInfoViewDelegate
if (self.roomModel.room_info.type_id.intValue == 2) {
[self auctionListDidChanged:self.roomModel.room_auction.auction_list];
}
[self configSingerData];
}
-(void)configMicType:(BOOL)isOnSeat{
@@ -810,6 +817,32 @@ QXRoomUserInfoViewDelegate
[self.seatContentView didUpDownSeatWithUser:user isUpSeat:isUpSeat pit_number:pit_number isPK:isPK];
if ([user.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
///点唱房的特殊处理
if ([self.roomModel.singer_info.song_info.singer_user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
if (!isUpSeat) {
self.seatContentView.myPitNumber = -1;
self.upSeatBtn.selected = NO;
}else{
self.seatContentView.myPitNumber = pit_number;
self.upSeatBtn.selected = YES;
}
if (self.seatContentView.myPitNumber <= 0) {
self.bottomView.status = 2;
if ([QXAgoraEngine sharedEngine].isOpenMic) {
[self.bottomView setMuteAudioStatus:YES];
}else{
[self.bottomView setMuteAudioStatus:NO];
}
}else{
self.bottomView.status = 2;
if ([QXAgoraEngine sharedEngine].isOpenMic) {
[self.bottomView setMuteAudioStatus:YES];
}else{
[self.bottomView setMuteAudioStatus:NO];
}
}
return;
}
[[QXAgoraEngine sharedEngine] setClientRoleBroadcaster:isUpSeat];
self.bottomView.status = isUpSeat?2:1;
if (!isUpSeat) {
@@ -830,10 +863,10 @@ QXRoomUserInfoViewDelegate
}
if (self.seatContentView.myPitNumber == 9) {
self.soundBtn.hidden = NO;
self.titleView.isCompere = YES;
// self.titleView.isCompere = YES;
}else{
self.soundBtn.hidden = YES;
self.titleView.isCompere = NO;
// self.titleView.isCompere = NO;
}
[self configBottomTools];
}
@@ -877,6 +910,11 @@ QXRoomUserInfoViewDelegate
self.roomModel.user_info.is_host = @"0";
}
}
if (self.roomModel.user_info.is_host.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1 || self.roomModel.user_info.is_room_owner.intValue == 1) {
self.titleView.isCompere = YES;
}else{
self.titleView.isCompere = NO;
}
}
}
/// 清除魅力
@@ -917,10 +955,10 @@ QXRoomUserInfoViewDelegate
}
if (self.seatContentView.myPitNumber == 9) {
self.soundBtn.hidden = NO;
self.titleView.isCompere = YES;
// self.titleView.isCompere = YES;
}else{
self.soundBtn.hidden = YES;
self.titleView.isCompere = NO;
// self.titleView.isCompere = NO;
}
[self configBottomTools];
}