MIDI/midi_ios
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改完成

Browse Source
This commit is contained in:
启星
2025-09-11 18:25:41 +08:00
parent 349cab1499
commit 35709d4e8e
67 changed files with 1344 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h
View File

@@ -8,6 +8,8 @@
#import <UIKit/UIKit.h>
#import "QXRoomModel.h"
#import "QXSongListModel.h"
#import "QXRoomSeatDelegate.h"
typedef NS_ENUM(NSInteger) {
/// 名称名称在下显示魅力
QXRoomSeatContentViewTypeNormal = 0,
@@ -32,6 +34,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong) NSString* numberString;
@property (nonatomic,assign) BOOL isPK;
@property (nonatomic,weak)id<QXRoomSeatDelegate>delegate;
/// 麦位视图类型
@property (nonatomic,assign)QXRoomSeatContentViewType type;

23
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m
View File

@@ -40,6 +40,8 @@
@property (nonatomic,strong) QXEffectSvgaView *micSvgaView;
@property (nonatomic,strong) VAPView *micMp4View;
@property (nonatomic,strong)UIButton *headerBtn;
@end
@implementation QXRoomSeatContentView
@@ -143,7 +145,13 @@
make.height.mas_equalTo(18);
}];
MJWeakSelf
self.charmBgView = [[UIView alloc] init];
[self.charmBgView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[weakSelf.delegate previewRoomUserCharmListWithUserId:weakSelf.pitModel.user_id];
}
}];
self.charmBgView.backgroundColor = RGB16A(0xffffff, 0.2);
[self.charmBgView addRoundedCornersWithRadius:ScaleWidth(7.5)];
self.charmBgView.hidden = YES;
@@ -174,8 +182,20 @@
make.centerX.equalTo(self.charmBgView).offset(7);
}];
self.headerBtn = [[UIButton alloc] init];
[self.headerBtn addTarget:self action:@selector(headerAction) forControlEvents:(UIControlEventTouchUpInside)];
[self addSubview:self.headerBtn];
[self.headerBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.noUserImageView);
}];
}
-(void)headerAction{
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:seatView:)]) {
[self.delegate didClickUserHeaderWithPitModel:self.pitModel seatView:self];
}
}
-(void)onlineStatusDidChanged:(NSNotification*)notice{
NSDictionary *parm = notice.object;
NSString *uid = [NSString stringWithFormat:@"%@",[parm objectForKey:@"user_id"]];
@@ -198,6 +218,7 @@
}
if ((info.uid == self.pitModel.user_id.longLongValue)) {
if (info.volume > 0) {
self.offlineImageView.hidden = YES;
[self startAudioAnimation];
}else{
[self stopAudioAnimation];

9
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatDelegate.h
View File

@@ -7,12 +7,16 @@
#import "QXRoomModel.h"
//#import "QXRoomSeatContentView.h"
@class QXRoomSeatContentView;
@protocol QXRoomSeatDelegate <NSObject>
@optional
//-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel*)pitModel userModel:(id)userModel;
/// 麦位视图
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel*)pitModel seatView:(QXRoomSeatContentView*)seatView;
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel*)pitModel userModel:(id)userModel isPkRoom:(BOOL)isPkRoom pkRoomId:(NSString*)pkRoomId isNoTakeOff:(BOOL)isNoTakeOff;
-(void)didHugSeatWithPitNumber:(NSString*)pitNumber;
@@ -30,4 +34,7 @@
/// 助力
-(void)friendPowerSendGiftWithUser:(QXRoomPitModel *)user heartId:(NSString*)heartId;
/// 查看房间内用户魅力
-(void)previewRoomUserCharmListWithUserId:(NSString *)userId;
@end

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.h
View File

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number;
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 设置魅力
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model;
/// 设置麦位锁麦状态

3
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.m
View File

@@ -297,6 +297,9 @@
-(void)clearCharm{
[self.leftSeatView clearCharm];
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
[self.leftSeatView roomClearUserCharmWithUserId:userId];
}
-(void)setSeatIsLock:(NSString *)isLock pitNumber:(NSString *)pitNumber{
[self.leftSeatView setSeatIsLock:isLock pitNumber:pitNumber];
}

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h
View File

@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model;
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 房间内用户信息发生变化
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;

201
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m
View File

@@ -15,7 +15,7 @@
#import "QXAlertView.h"
#import "QXRoomAuctionRankView.h"
@interface QXRoomSeatTypeAuctionView()
@interface QXRoomSeatTypeAuctionView()<QXRoomSeatDelegate>
@property (nonatomic,strong)UIButton *delayBtn;
@property (nonatomic,strong)UIButton *endBtn;
@@ -155,6 +155,7 @@
self.compereView = [[QXRoomSeatContentView alloc] init];
[self.bgView addSubview:self.compereView];
self.compereView.tagString = @"主持";
self.compereView.number = 9;
// self.compereView.isAutionSeat = YES;
// self.compereView.type = QXRoomSeatContentViewTypeAuction;
[self.compereView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -162,19 +163,7 @@
make.left.mas_equalTo(10);
make.size.mas_equalTo(CGSizeMake(ScaleWidth(50), ScaleWidth(50)+5+18));
}];
[self.compereView addTapBlock:^(id _Nonnull obj) {
if (self.compereView.pitModel.user_id.intValue > 0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.compereView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
}else{
[QXMineNetwork roomUpSeatWithRoomId:weakSelf.roomModel.room_info.room_id pit_number:@"9" isUpSeat:YES successBlock:^(NSDictionary * _Nonnull dict) {
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
}];
}
}];
self.compereView.delegate = self;
//
//
//
@@ -239,20 +228,7 @@
self.auctionView = [[QXRoomSeatContentView alloc] init];
[self.auctionBgView addSubview:self.auctionView];
[self.auctionView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.auctionView.pitModel == nil || weakSelf.auctionView.pitModel.user_id.intValue <= 0) {
if (weakSelf.myPitNumber == 9 || weakSelf.roomModel.user_info.is_room_owner.intValue == 1 || weakSelf.roomModel.user_info.is_host.intValue == 1 || weakSelf.roomModel.user_info.is_management.intValue == 1) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[weakSelf.delegate didHugSeatWithPitNumber:@"888"];
}
}
}else{
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.auctionView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
}
}];
self.auctionView.delegate = self;
self.auctionView.isAutionSeat = YES;
self.auctionView.numberString = @"拍卖位";
[self.auctionView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -263,6 +239,14 @@
//
self.auctionCharmView = [[UIView alloc] init];
self.auctionCharmView.hidden = YES;
[self.auctionCharmView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.auctionView.pitModel.user_id.longLongValue <= 0) {
return;
}
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[weakSelf.delegate previewRoomUserCharmListWithUserId:weakSelf.auctionView.pitModel.user_id];
}
}];
[self.auctionBgView addSubview:self.auctionCharmView];
[self.auctionCharmView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(73);
@@ -348,13 +332,15 @@
self.firstSeatView.bgImageView.image = [UIImage imageNamed:@"room_auction_first_bg"];
self.firstSeatView.rankView.image = [UIImage imageNamed:@"room_auction_first"];
self.firstSeatView.seatView.numberString = @"一号麦";
[self.firstSeatView.seatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.firstSeatView.seatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.firstSeatView.seatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
[self.firstSeatView.auctionCharmView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.firstSeatView.seatView.pitModel.user_id.intValue<=0) {
return;
}
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[weakSelf.delegate previewRoomUserCharmListWithUserId:weakSelf.firstSeatView.seatView.pitModel.user_id];
}
}];
self.firstSeatView.seatView.delegate = self;
[self.bgView addSubview:self.firstSeatView];
[self.firstSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.auctionBgView.mas_right).offset(6);
@@ -367,13 +353,15 @@
self.secondSeatView.bgImageView.image = [UIImage imageNamed:@"room_auction_second_bg"];
self.secondSeatView.rankView.image = [UIImage imageNamed:@"room_auction_second"];
self.secondSeatView.seatView.numberString = @"二号麦";
[self.secondSeatView.seatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.secondSeatView.seatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.secondSeatView.seatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
[self.secondSeatView.auctionCharmView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.secondSeatView.seatView.pitModel.user_id.intValue<=0) {
return;
}
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[weakSelf.delegate previewRoomUserCharmListWithUserId:weakSelf.secondSeatView.seatView.pitModel.user_id];
}
}];
self.secondSeatView.seatView.delegate = self;
[self.bgView addSubview:self.secondSeatView];
[self.secondSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.firstSeatView);
@@ -386,13 +374,15 @@
self.thirdSeatView.bgImageView.image = [UIImage imageNamed:@"room_auction_third_bg"];
self.thirdSeatView.rankView.image = [UIImage imageNamed:@"room_auction_third"];
self.thirdSeatView.seatView.numberString = @"三号麦";
[self.thirdSeatView.seatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.thirdSeatView.seatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.thirdSeatView.seatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
[self.thirdSeatView.auctionCharmView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.thirdSeatView.seatView.pitModel.user_id.intValue<=0) {
return;
}
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[weakSelf.delegate previewRoomUserCharmListWithUserId:weakSelf.thirdSeatView.seatView.pitModel.user_id];
}
}];
self.thirdSeatView.seatView.delegate = self;
[self.bgView addSubview:self.thirdSeatView];
[self.thirdSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.firstSeatView);
@@ -405,13 +395,14 @@
[self.bgView addSubview:self.forthSeatView];
// self.forthSeatView.isAutionSeat = YES;
self.forthSeatView.numberString = @"4";
[self.forthSeatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.forthSeatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.forthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
}
}];
// [self.forthSeatView addTapBlock:^(id _Nonnull obj) {
// if (weakSelf.forthSeatView.pitModel.user_id.intValue>0) {
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
// [weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.forthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
// }
// }
// }];
self.forthSeatView.delegate = self;
[self.forthSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.thirdSeatView);
make.width.mas_equalTo(ScaleWidth(42));
@@ -423,13 +414,14 @@
[self.bgView addSubview:self.fifthSeatView];
// self.fifthSeatView.isAutionSeat = YES;
self.fifthSeatView.numberString = @"5";
[self.fifthSeatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.fifthSeatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.fifthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
}
}];
// [self.fifthSeatView addTapBlock:^(id _Nonnull obj) {
// if (weakSelf.fifthSeatView.pitModel.user_id.intValue>0) {
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
// [weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.fifthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
// }
// }
// }];
self.fifthSeatView.delegate = self;
[self.fifthSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.forthSeatView.mas_right).offset(5);
make.width.mas_equalTo(ScaleWidth(42));
@@ -441,13 +433,14 @@
[self.bgView addSubview:self.sixthSeatView];
// self.sixthSeatView.isAutionSeat = YES;
self.sixthSeatView.numberString = @"6";
[self.sixthSeatView addTapBlock:^(id _Nonnull obj) {
if (weakSelf.sixthSeatView.pitModel.user_id.intValue>0) {
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.sixthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
}
}];
// [self.sixthSeatView addTapBlock:^(id _Nonnull obj) {
// if (weakSelf.sixthSeatView.pitModel.user_id.intValue>0) {
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
// [weakSelf.delegate didClickUserHeaderWithPitModel:weakSelf.sixthSeatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
// }
// }
// }];
self.sixthSeatView.delegate = self;
[self.sixthSeatView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.fifthSeatView.mas_right).offset(5);
make.width.mas_equalTo(ScaleWidth(42));
@@ -571,7 +564,7 @@
break;
}
}
self.myPitNumber = roomModel.user_info.pit_number;
self.myPitNumber = roomModel.user_info.pit_number.integerValue;
if (self.roomModel.room_auction.auction_user) {
QXRoomPitModel *model = [[QXRoomPitModel alloc] init];
model.user_id = self.roomModel.room_auction.auction_user.user_id;
@@ -649,7 +642,45 @@
}
}
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel seatView:(QXRoomSeatContentView *)seatView{
if (seatView.number == 9) {
if (self.compereView.pitModel.user_id.intValue > 0) {
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[self.delegate didClickUserHeaderWithPitModel:self.compereView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
}else{
[QXMineNetwork roomUpSeatWithRoomId:self.roomModel.room_info.room_id pit_number:@"9" isUpSeat:YES successBlock:^(NSDictionary * _Nonnull dict) {
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
}];
}
return;
}
if (seatView.isAutionSeat) {
/// 拍卖位
if (self.auctionView.pitModel == nil || self.auctionView.pitModel.user_id.intValue <= 0) {
if (self.myPitNumber == 9 || self.roomModel.user_info.is_room_owner.intValue == 1 || self.roomModel.user_info.is_host.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1) {
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[self.delegate didHugSeatWithPitNumber:@"888"];
}
}
}else{
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[self.delegate didClickUserHeaderWithPitModel:self.auctionView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
}
return;
}
if (seatView.pitModel.user_id <= 0) {
return;
}
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[self.delegate didClickUserHeaderWithPitModel:seatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:YES];
}
}
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number{
QXRoomSeatContentView *contentView;
if (pit_number == 9) {
@@ -853,12 +884,48 @@
QXRoomPitModel*model1 = self.compereView.pitModel;
model1.charm = @"0";
self.compereView.pitModel = model1;
[self.compereView hideCharm];
QXRoomPitModel*model2 = self.auctionView.pitModel;
model2.charm = @"0";
self.auctionView.pitModel = model2;
[self.auctionView hideCharm];
self.charmLabel.text = @"0";
self.firstSeatView.charmLabel.text = @"0";
self.secondSeatView.charmLabel.text = @"0";
self.thirdSeatView.charmLabel.text = @"0";
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
for (int i = 0; i < self.roomModel.room_auction.auction_list.count; i++) {
if (i < 6) {
QXRoomPitModel*pitModel = self.roomModel.room_auction.auction_list[i];
if ([pitModel.user_id isEqualToString:userId]) {
pitModel.charm = @"0";
UIView *contentView = self.seatArray[i];
if ([contentView isKindOfClass:[QXRoomAuctionSeatView class]]) {
QXRoomAuctionSeatView *seatView = (QXRoomAuctionSeatView *)contentView;
seatView.pitModel = pitModel;
}
break;
}
}
}
QXRoomPitModel*model1 = self.compereView.pitModel;
if ([model1.user_id isEqualToString:userId]) {
model1.charm = @"0";
self.compereView.pitModel = model1;
[self.compereView hideCharm];
}
QXRoomPitModel*model2 = self.auctionView.pitModel;
if ([model2.user_id isEqualToString:userId]) {
model2.charm = @"0";
self.auctionView.pitModel = model2;
[self.auctionView hideCharm];
self.charmLabel.text = @"0";
}
}
-(void)auctionListDidChanged:(NSArray<QXRoomPitModel *> *)list{
[self reSetPitList];
self.roomModel.room_auction.auction_list = list;

3
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.m
View File

@@ -343,6 +343,9 @@
}
na.viewControllers = viewControllers;
[na popViewControllerAnimated:YES];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[UIApplication sharedApplication].idleTimerDisabled = YES;
});
QXGlobal.shareGlobal.superRoomId = @"";
}else{
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomModel.room_info.room_id];

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.h
View File

@@ -45,6 +45,8 @@ typedef NS_ENUM(NSInteger) {
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 设置魅力
-(void)setSeatCharmWithUser:(QXUserHomeModel*)model;
/// 用户信息发生改变

55
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m
View File

@@ -101,9 +101,7 @@
self.compereView = [[QXRoomSeatContentView alloc] init];
[self.compereView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.compereView.delegate = self;
self.compereView.tagString = QXText(@"主持");
self.compereView.number = 9;
[self addSubview:self.compereView];
@@ -119,9 +117,7 @@
self.guestView = [[QXRoomSeatContentView alloc] init];
self.guestView.tagString = QXText(@"嘉宾");
self.guestView.number = 10;
[self.guestView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.guestView.delegate = self;
[self addSubview:self.guestView];
[self.guestView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self);
@@ -493,24 +489,12 @@
make.edges.equalTo(self.heartBottomLineImageView);
}];
[self.leftSeatView1.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
[self.leftSeatView2.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
[self.leftSeatView3.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
[self.rightSeatView1.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
[self.rightSeatView2.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
[self.rightSeatView3.contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.leftSeatView1.contentView.delegate = self;
self.leftSeatView2.contentView.delegate = self;
self.leftSeatView3.contentView.delegate = self;
self.rightSeatView1.contentView.delegate = self;
self.rightSeatView2.contentView.delegate = self;
self.rightSeatView3.contentView.delegate = self;
[self.allSeatViewArray replaceObjectAtIndex:8 withObject:self.compereView];
@@ -529,6 +513,7 @@
self.heartTopImageView.hidden = YES;
self.heartCenterImageView.hidden = YES;
self.heartBottomImageView.hidden = YES;
[self bringSubviewToFront:self.tenSecondLabel];
}
#pragma mark - QXRoomSeatDelegate
-(void)friendPowerSendGiftWithUser:(QXRoomPitModel *)user heartId:(NSString *)heartId{
@@ -536,6 +521,11 @@
[self.delegate friendPowerSendGiftWithUser:user heartId:heartId];
}
}
-(void)previewRoomUserCharmListWithUserId:(NSString *)userId{
if (self.delegate && [self.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[self.delegate previewRoomUserCharmListWithUserId:userId];
}
}
-(void)setRoomModel:(QXRoomModel *)roomModel{
_roomModel = roomModel;
@@ -889,7 +879,7 @@
fromSeatView.pitModel = totModel;
}
}
-(void)didClickSeatView:(QXRoomSeatContentView*)seatView{
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel seatView:(QXRoomSeatContentView *)seatView{
NSString *pit_number = [NSString stringWithFormat:@"%ld",seatView.number] ;
QXLOG(@"点击了%ld麦位",seatView.number);
@@ -1050,6 +1040,7 @@
if (step.intValue == 1) {
self.roomModel.friend_info.heart_list = @[];
self.tenSecondLabel.hidden = YES;
[self.cpView removeFromSuperview];
}
self.roomModel.friend_info.step = [NSString stringWithFormat:@"%@",step];
self.roomModel.friend_info.friend_id = friend_id;
@@ -1097,6 +1088,20 @@
}
}
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
for (id object in self.allSeatViewArray) {
if ([object isKindOfClass:[QXRoomSeatContentView class]]) {
QXRoomSeatContentView *contentView = (QXRoomSeatContentView *)object;
QXRoomPitModel *model = contentView.pitModel;
if ([model.user_id isEqualToString:userId]) {
model.charm = @"0";
contentView.pitModel = model;
break;
}
}
}
}
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model{
for (id object in self.allSeatViewArray) {
if ([object isKindOfClass:[QXRoomSeatContentView class]]) {

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.h
View File

@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number;
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 设置魅力
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model;
/// 设置麦位锁麦状态

52
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m
View File

@@ -11,7 +11,7 @@
#import "QXRoomSeatSettingView.h"
static NSInteger maxSeat = 8;
@interface QXRoomSeatTypeNormalView()
@interface QXRoomSeatTypeNormalView()<QXRoomSeatDelegate>
/// 主持
@property (nonatomic,strong)QXRoomSeatContentView *compereView;
/// 嘉宾
@@ -35,9 +35,10 @@ static NSInteger maxSeat = 8;
-(void)initSubviews{
MJWeakSelf
self.compereView = [[QXRoomSeatContentView alloc] init];
[self.compereView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
// [self.compereView addTapBlock:^(id _Nonnull obj) {
// [weakSelf didClickSeatView:obj];
// }];
self.compereView.delegate = self;
self.compereView.tagString = QXText(@"主持");
self.compereView.number = 9;
[self addSubview:self.compereView];
@@ -53,9 +54,10 @@ static NSInteger maxSeat = 8;
self.guestView = [[QXRoomSeatContentView alloc] init];
self.guestView.tagString = QXText(@"嘉宾");
self.guestView.number = 10;
[self.guestView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
// [self.guestView addTapBlock:^(id _Nonnull obj) {
// [weakSelf didClickSeatView:obj];
// }];
self.guestView.delegate = self;
[self addSubview:self.guestView];
[self.guestView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self);
@@ -72,9 +74,10 @@ static NSInteger maxSeat = 8;
for (int i = 0 ; i < maxSeat ; i++) {
QXRoomSeatContentView *contentView = [[QXRoomSeatContentView alloc] init];
contentView.number = i+1;
[contentView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
// [contentView addTapBlock:^(id _Nonnull obj) {
// [weakSelf didClickSeatView:obj];
// }];
contentView.delegate = self;
[self addSubview:contentView];
[contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.compereView.mas_bottom).offset(1+(seatHeight+topSpace)*(i/4));
@@ -90,9 +93,7 @@ static NSInteger maxSeat = 8;
-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.viewController.view endEditing:YES];
}
-(void)didClickSeatView:(QXRoomSeatContentView*)seatView{
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel seatView:(QXRoomSeatContentView *)seatView{
NSString *pit_number = [NSString stringWithFormat:@"%ld",seatView.number] ;
QXLOG(@"点击了%ld麦位",seatView.number);
if (seatView.pitModel.user_id.longLongValue > 0) {
@@ -180,6 +181,11 @@ static NSInteger maxSeat = 8;
}
}
-(void)previewRoomUserCharmListWithUserId:(NSString *)userId{
if (self.delegate && [self.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[self.delegate previewRoomUserCharmListWithUserId:userId];
}
}
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number{
if (pit_number > 10) {
@@ -316,11 +322,25 @@ static NSInteger maxSeat = 8;
QXRoomPitModel *model = seatView.pitModel;
model.charm = @"0";
seatView.pitModel = model;
if (self.isPKMyRoom || self.isPKOtherRoom) {
[seatView hideCharm];
}
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// }
}
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
for (QXRoomSeatContentView *seatView in self.seatArray) {
QXRoomPitModel *model = seatView.pitModel;
if ([model.user_id isEqualToString:userId]) {
model.charm = @"0";
seatView.pitModel = model;
break;
}
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// }
}
}
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model{
for (QXRoomSeatContentView *seatView in self.seatArray) {
QXRoomPitModel *md = seatView.pitModel;

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.h
View File

@@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 设置魅力
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model;

59
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.m
View File

@@ -18,7 +18,8 @@
@import AgoraLyricsScore;
@interface QXRoomSeatTypeSongView()<KaraokeDelegate
,UICollectionViewDelegate,UICollectionViewDataSource
,UICollectionViewDelegate,UICollectionViewDataSource,
QXRoomSeatDelegate
>
/// 左侧背景
@property (nonatomic,strong)UIView *leftBgView;
@@ -177,9 +178,7 @@
MJWeakSelf
self.singerSeatView = [[QXRoomSeatContentView alloc] init];
self.singerSeatView.tagString = QXText(@"演唱者");
[self.singerSeatView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.singerSeatView.delegate = self;
[self.leftBgView addSubview:self.singerSeatView];
[self.leftBgView addSubview:self.originalBtn];
@@ -193,9 +192,7 @@
self.compereView = [[QXRoomSeatContentView alloc] init];
[self.compereView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.compereView.delegate = self;
self.compereView.tagString = QXText(@"主持");
self.compereView.number = 9;
[self addSubview:self.compereView];
@@ -204,9 +201,7 @@
self.guestView = [[QXRoomSeatContentView alloc] init];
self.guestView.tagString = QXText(@"嘉宾");
self.guestView.number = 10;
[self.guestView addTapBlock:^(id _Nonnull obj) {
[weakSelf didClickSeatView:obj];
}];
self.guestView.delegate = self;
[self addSubview:self.guestView];
@@ -230,7 +225,7 @@
-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
[self.viewController.view endEditing:YES];
}
-(void)didClickSeatView:(QXRoomSeatContentView*)seatView{
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel seatView:(QXRoomSeatContentView *)seatView{
NSString *pit_number = [NSString stringWithFormat:@"%ld",seatView.number] ;
QXLOG(@"点击了%ld麦位",seatView.number);
@@ -267,6 +262,11 @@
}
}
}
-(void)previewRoomUserCharmListWithUserId:(NSString *)userId{
if (self.delegate && [self.delegate respondsToSelector:@selector(previewRoomUserCharmListWithUserId:)]) {
[self.delegate previewRoomUserCharmListWithUserId:userId];
}
}
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number{
// if (pit_number==9999) {
// for (<#type *object#> in <#collection#>) {
@@ -502,7 +502,33 @@
}
[self.collectionView reloadData];
}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
QXRoomPitModel *singerModel = self.singerSeatView.pitModel;
if ([singerModel.user_id isEqualToString:userId]) {
singerModel.charm = @"0";
self.singerSeatView.pitModel = singerModel;
}
QXRoomPitModel *compereModel = self.compereView.pitModel;
if ([compereModel.user_id isEqualToString:userId]) {
compereModel.charm = @"0";
self.compereView.pitModel = compereModel;
}
QXRoomPitModel *guestModel = self.guestView.pitModel;
if ([guestModel.user_id isEqualToString:userId]) {
guestModel.charm = @"0";
self.guestView.pitModel = guestModel;
}
for (QXRoomPitModel *md in self.dataArray) {
if ([userId isEqualToString:md.user_id]) {
md.charm = @"0";
break;
}
}
[self.collectionView reloadData];
}
-(void)setSeatCharmWithUser:(QXUserHomeModel *)model{
QXRoomPitModel *singerModel = self.singerSeatView.pitModel;
if ([singerModel.user_id isEqualToString:model.user_id]) {
@@ -577,18 +603,19 @@
QXSongSeatCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXSongSeatCell" forIndexPath:indexPath];
QXRoomPitModel *model = self.dataArray[indexPath.row];
cell.seatContentView.pitModel = model;
cell.seatContentView.delegate = self;
return cell;
}
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
QXRoomPitModel *model = self.dataArray[indexPath.row];
// QXRoomPitModel *model = self.dataArray[indexPath.row];
// self.userInfoView.isUpSeat = YES;
// self.userInfoView.roomId = self.roomModel.room_info.room_id;
//// self.userInfoView.pitNumber = [NSString stringWithFormat:@"%ld",seatView.number];
// self.userInfoView.userId = model.user_id;
// [self.userInfoView showInView:self.viewController.view];
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[self.delegate didClickUserHeaderWithPitModel:model userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
// if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
// [self.delegate didClickUserHeaderWithPitModel:model userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
// }
}
-(void)nextAction{

2
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.h
View File

@@ -49,6 +49,8 @@ typedef NS_ENUM(NSInteger) {
/// 清除魅力
-(void)clearCharm;
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 设置魅力
-(void)setSeatCharmWithUser:(QXUserHomeModel*)model;
/// 设置麦位锁麦状态

43
QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m
View File

@@ -13,6 +13,7 @@
#import "QXRoomSeatTypeCabinView.h"
#import "QXRoomSeatPKView.h"
#import "QXRoomSeatTypeFrientView.h"
#import "QXRoomUserCharmView.h"
@interface QXRoomSeatView()<QXRoomSeatDelegate>
@property (nonatomic,strong)QXRoomSeatTypeNormalView *normalSeatView;
@@ -27,6 +28,8 @@
@property (nonatomic,strong)QXRoomSeatPKView *roomPkView;
@property (nonatomic,strong)QXRoomSeatTypeFrientView *roomFriendView;
@property (nonatomic,strong)QXRoomUserCharmView *charmListView;
@end
@@ -627,6 +630,7 @@
return;
}
if (_songView) {
[[QXAgoraEngine sharedEngine] ktv_EndSing];
_songView.transform = CGAffineTransformIdentity;
// 弹性动画
[UIView animateWithDuration:0.5
@@ -813,6 +817,12 @@
}
}
-(void)previewRoomUserCharmListWithUserId:(NSString *)userId{
self.charmListView.roomId = self.roomModel.room_info.room_id;
self.charmListView.userId = userId;
[self.charmListView showInView:self.viewController.view];
}
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel userModel:(id)userModel isPkRoom:(BOOL)isPkRoom pkRoomId:(NSString *)pkRoomId isNoTakeOff:(BOOL)isNoTakeOff{
if (self.delegate && [self.delegate respondsToSelector:@selector(didClickUserHeaderWithPitModel:userModel:isPkRoom:pkRoomId:isNoTakeOff:)]) {
[self.delegate didClickUserHeaderWithPitModel:pitModel userModel:userModel isPkRoom:isPkRoom pkRoomId:pkRoomId isNoTakeOff:isNoTakeOff];
@@ -850,6 +860,7 @@
[self.songView clearCharm];
break;
case QXRoomSeatViewTypeAuction:
[self.auctionView clearCharm];
break;
case QXRoomSeatViewTypeCabin:
break;
@@ -863,6 +874,30 @@
break;
}
}
/// 清除个人魅力
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
switch (self.type) {
case QXRoomSeatViewTypeNormal:
[self.normalSeatView roomClearUserCharmWithUserId:userId];
break;
case QXRoomSeatViewTypeSing:
[self.songView roomClearUserCharmWithUserId:userId];
break;
case QXRoomSeatViewTypeAuction:
[self.auctionView roomClearUserCharmWithUserId:userId];
break;
case QXRoomSeatViewTypeCabin:
break;
case QXRoomSeatViewTypePK:
[self.roomPkView roomClearUserCharmWithUserId:userId];
break;
case QXRoomSeatViewTypeFriend:
[self.roomFriendView roomClearUserCharmWithUserId:userId];
break;
default:
break;
}
}
/// 房间内换麦
-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
switch (self.type) {
@@ -1227,4 +1262,12 @@
}
return _roomFriendView;
}
-(QXRoomUserCharmView *)charmListView{
if (!_charmListView) {
_charmListView = [[QXRoomUserCharmView alloc] initWithFrame:[UIScreen mainScreen].bounds];
_charmListView.delegate = self;
}
return _charmListView;
}
@end