diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate
index 8f506ac..ba8e913 100644
Binary files a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate and b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index cbe15de..961a479 100644
--- a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -202,8 +202,8 @@
filePath = "QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1130"
- endingLineNumber = "1130"
+ startingLineNumber = "1133"
+ endingLineNumber = "1133"
landmarkName = "-roomUserInfoDidChanged:"
landmarkType = "7">
@@ -227,48 +227,32 @@
-
-
-
-
diff --git a/QXLive/Base/QXAppStartViewController.m b/QXLive/Base/QXAppStartViewController.m
index eae3f87..ad782a8 100644
--- a/QXLive/Base/QXAppStartViewController.m
+++ b/QXLive/Base/QXAppStartViewController.m
@@ -17,7 +17,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
self.bgImaegView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds];
- self.bgImaegView.image = [UIImage imageNamed:@"app_start_midi"];;
+ self.bgImaegView.image = [UIImage imageNamed:@"app_start_midi1"];;
self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill;
[self.view addSubview:self.bgImaegView];
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil];
diff --git a/QXLive/Base/QXGlobal.m b/QXLive/Base/QXGlobal.m
index 918e998..68f0850 100644
--- a/QXLive/Base/QXGlobal.m
+++ b/QXLive/Base/QXGlobal.m
@@ -209,6 +209,7 @@
}else{
[UIApplication sharedApplication].idleTimerDisabled = YES;
self.roomVC.hidesBottomBarWhenPushed = YES;
+ [self.roomVC playHWDMP4];
[navagationController pushViewController:self.roomVC animated:YES];
}
return;
@@ -220,6 +221,7 @@
MJWeakSelf
if (isRejoin) {
if (self.roomVC!=nil) {
+ [self.roomVC playHWDMP4];
self.roomVC.hidesBottomBarWhenPushed = YES;
[navagationController pushViewController:self.roomVC animated:YES];
}else{
@@ -228,6 +230,7 @@
}
// showLoadingInView(KEYWINDOW)
weakSelf.isClickJoinRoom = YES;
+ [[QXRoomMessageManager shared] joinGroupWithRoomId:roomId];
[QXMineNetwork joinRoomWithRoomId:roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
// hideLoadingInView(KEYWINDOW)
// roomModel.room_info.pk_room_id = @"33";
@@ -248,6 +251,7 @@
}
}else{
if ([roomId isEqualToString:self.roomVC.roomId]) {
+ [self.roomVC playHWDMP4];
[navagationController pushViewController:self.roomVC animated:YES];
}else{
// showLoadingInView(KEYWINDOW)
@@ -255,6 +259,7 @@
return;
}
weakSelf.isClickJoinRoom = YES;
+ [[QXRoomMessageManager shared] joinGroupWithRoomId:roomId];
[QXMineNetwork joinRoomWithRoomId:roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
// hideLoadingInView(KEYWINDOW)
// roomModel.room_info.pk_room_id = @"33";
diff --git a/QXLive/Config/QXRoomMessageManager.h b/QXLive/Config/QXRoomMessageManager.h
index 76f6c32..27481a7 100644
--- a/QXLive/Config/QXRoomMessageManager.h
+++ b/QXLive/Config/QXRoomMessageManager.h
@@ -184,7 +184,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 10秒自动校正在线人数
-(void)roomOnlineNumberDidChangedOnlineNumber:(NSString*)onlineNumber;
/// 房间换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber;
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo;
diff --git a/QXLive/Config/QXRoomMessageManager.m b/QXLive/Config/QXRoomMessageManager.m
index a46d5f5..9b5bb14 100644
--- a/QXLive/Config/QXRoomMessageManager.m
+++ b/QXLive/Config/QXRoomMessageManager.m
@@ -583,8 +583,8 @@
QXRoomChatListModel *model = [QXRoomChatListModel yy_modelWithJSON:msg.Text];
NSInteger fromPitNumber = [msg.Text[@"from_pit_number"] integerValue];
NSInteger toPitNumber = [msg.Text[@"to_pit_number"] integerValue];
- if (self.delegate && [self.delegate respondsToSelector:@selector(roomSeatExchangedWithFromPitNumber:toPitNumber:)]) {
- [self.delegate roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+ if (self.delegate && [self.delegate respondsToSelector:@selector(roomSeatExchangedWithFromPitNumber:toPitNumber:userInfo:)]) {
+ [self.delegate roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:model.FromUserInfo];
}
if (self.delegate && [self.delegate respondsToSelector:@selector(didInsertMessge:)]) {
model.messageType = QXRoomChatMessageTypeSystem;
diff --git a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.h b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.h
index 8b4a9a6..a5f8f1b 100644
--- a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.h
+++ b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.h
@@ -46,7 +46,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 巡乐会
@property (nonatomic,strong)QXMeetActivityView *meetView;
-(void)configBottomTools;
-
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
@end
diff --git a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m
index 9abfeaa..e32b1ea 100644
--- a/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m
+++ b/QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m
@@ -83,6 +83,7 @@ QXRoomUserInfoViewDelegate
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:YES];
+
}
-(void)viewDidAppear:(BOOL)animated{
[super viewDidAppear:animated];
@@ -100,6 +101,7 @@ QXRoomUserInfoViewDelegate
break;
}
}
+ [self playHWDMP4];
self.navigationController.viewControllers = marr;
// self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
@@ -107,6 +109,7 @@ QXRoomUserInfoViewDelegate
[super viewDidDisappear:animated];
// [[QXGiftPlayerManager shareManager] stopPlay];
self.continuousView.hidden = YES;
+ [self stopHWDMP4];
}
-(void)initSubViews{
@@ -221,7 +224,6 @@ QXRoomUserInfoViewDelegate
-(void)setRoomId:(NSString *)roomId{
_roomId = roomId;
[self.chatListView insertNoitce];
- [[QXRoomMessageManager shared] joinGroupWithRoomId:self.roomId];
MJWeakSelf
[QXMineNetwork roomOnlineListWithRoomId:self.roomId page:1 successBlock:^(NSArray * _Nonnull onPitList, NSArray * _Nonnull offPitList) {
NSMutableArray *arr = [NSMutableArray arrayWithArray:onPitList];
@@ -236,7 +238,6 @@ QXRoomUserInfoViewDelegate
[self resetSubviews];
[self configRoomDataIsJoin:YES];
-// [QXMineNetwork joinRoomWithRoomId:self.roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
//// roomModel.room_info.pk_room_id = @"33";
//
//
@@ -548,6 +549,8 @@ QXRoomUserInfoViewDelegate
}
/// 暂时不要pk
hasPK = NO;
+ /// 暂时不要ktv
+ hasSong = NO;
/// 普通麦位
if (self.seatContentView.myPitNumber <= 0) {
self.bottomView.status = 1;
@@ -747,8 +750,17 @@ QXRoomUserInfoViewDelegate
}
}
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
- [self.seatContentView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo{
+ [self.seatContentView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:userInfo];
+ if ([userInfo.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
+ if (toPitNumber == 9) {
+ self.soundBtn.hidden = NO;
+ self.titleView.isCompere = YES;
+ }else{
+ self.soundBtn.hidden = YES;
+ self.titleView.isCompere = NO;
+ }
+ }
}
// 踢出房间
-(void)userDidTakeOffWithUserInfo:(QXUserHomeModel *)userInfo{
@@ -1839,6 +1851,12 @@ QXRoomUserInfoViewDelegate
}
return _meetView;
}
+-(void)stopHWDMP4{
+ [self.seatContentView stopHWDMP4];
+}
+-(void)playHWDMP4{
+ [self.seatContentView playHWDMP4];
+}
-(void)destroyViews{
if (_skyView) {
[_skyView destroyViews];
diff --git a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.h b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.h
index d11c3ca..f578413 100644
--- a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.h
+++ b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.h
@@ -71,6 +71,7 @@ typedef NS_ENUM(NSInteger) {
@property (nonatomic,assign)QXRoomChatMessageType messageType;
@property (nonatomic,strong)NSString* text;
@property (nonatomic,strong)QXGiftModel* GiftInfo;
+@property (nonatomic,strong)NSArray* GiftInfos;
@property (nonatomic,strong)QXUserHomeModel* FromUserInfo;
@property (nonatomic,strong)QXUserHomeModel* ToUserInfo;
diff --git a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m
index 58f75d7..b57f60f 100644
--- a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m
+++ b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m
@@ -7,6 +7,33 @@
#import "QXRoomChatListView.h"
#import "UIImage+WebP.h"
+#define messageNameColor RGB16(0x00C8FF)
+#define messageGiftColor RGB16(0xFFE309)
+NSArray *findAllOccurrencesOfString(NSString *fullString, NSString *substring) {
+ NSMutableArray *occurrences = [NSMutableArray array];
+ NSRange searchRange = NSMakeRange(0, fullString.length);
+ NSRange foundRange;
+
+ while (searchRange.location < fullString.length) {
+ searchRange.length = fullString.length - searchRange.location;
+ foundRange = [fullString rangeOfString:substring
+ options:0
+ range:searchRange];
+
+ if (foundRange.location != NSNotFound) {
+ // 找到匹配，添加到数组
+ [occurrences addObject:[NSValue valueWithRange:foundRange]];
+
+ // 更新搜索范围，从当前匹配位置之后继续搜索
+ searchRange.location = foundRange.location + foundRange.length;
+ } else {
+ // 没有更多匹配，退出循环
+ break;
+ }
+ }
+
+ return [occurrences copy];
+}
NSInteger maxMessageCount = 20;
@interface QXRoomChatListView()
@property (nonatomic,strong)UITableView *tableView;
@@ -349,13 +376,37 @@ NSInteger maxMessageCount = 20;
// self.titleLabel.text = message.text;
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:message.text];
if ([message.FromUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.FromUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.FromUserInfo.nickname]];
}
if ([message.ToUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.ToUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.ToUserInfo.nickname]];
}
if ([message.GiftInfo.gift_name isExist]) {
- [attr yy_setColor:RGB16(0x00C8FF) range:[message.text rangeOfString:message.GiftInfo.gift_name]];
+ NSArray *arr = [message.GiftInfo.gift_name componentsSeparatedByString:@","];
+ for (NSString*gift_name in arr) {
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, gift_name);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageGiftColor range:range];
+ }
+ }
+ }
+ if (message.GiftInfos.count > 0) {
+ for (QXGiftModel*gift in message.GiftInfos) {
+ if ([gift.gift_name isExist]) {
+ [attr yy_setColor:messageGiftColor range:[message.text rangeOfString:gift.gift_name]];
+ }
+ }
+ }
+ if (message.ToUserInfos.count > 0) {
+ for (int i = 0; i < message.ToUserInfos.count; i++) {
+ QXUserHomeModel*md = message.ToUserInfos[i];
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, md.nickname);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageNameColor range:range];
+ }
+ }
}
self.titleLabel.attributedText = attr;
self.nameLabel.text = message.FromUserInfo.nickname;
@@ -394,7 +445,7 @@ NSInteger maxMessageCount = 20;
}];
self.nameLabel = [[UILabel alloc] init];
- self.nameLabel.textColor = [UIColor whiteColor];
+ self.nameLabel.textColor = RGB16(0xCCA882);
self.nameLabel.font = [UIFont systemFontOfSize:12];
[self.contentView addSubview:self.nameLabel];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -536,7 +587,7 @@ NSInteger maxMessageCount = 20;
[self initSubviews];
}
return self;
-}
+}
-(void)headerAction{
if (self.delegate && [self.delegate respondsToSelector:@selector(previewUserInfoWithUserId:)]) {
@@ -549,13 +600,37 @@ NSInteger maxMessageCount = 20;
// self.titleLabel.text = message.text;
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:message.text];
if ([message.FromUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.FromUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.FromUserInfo.nickname]];
}
if ([message.ToUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.ToUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.ToUserInfo.nickname]];
}
if ([message.GiftInfo.gift_name isExist]) {
- [attr yy_setColor:RGB16(0x00C8FF) range:[message.text rangeOfString:message.GiftInfo.gift_name]];
+ NSArray *arr = [message.GiftInfo.gift_name componentsSeparatedByString:@","];
+ for (NSString*gift_name in arr) {
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, gift_name);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageGiftColor range:range];
+ }
+ }
+ }
+ if (message.GiftInfos.count > 0) {
+ for (QXGiftModel*gift in message.GiftInfos) {
+ if ([gift.gift_name isExist]) {
+ [attr yy_setColor:messageGiftColor range:[message.text rangeOfString:gift.gift_name]];
+ }
+ }
+ }
+ if (message.ToUserInfos.count > 0) {
+ for (int i = 0; i < message.ToUserInfos.count; i++) {
+ QXUserHomeModel*md = message.ToUserInfos[i];
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, md.nickname);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageNameColor range:range];
+ }
+ }
}
self.titleLabel.attributedText = attr;
self.nameLabel.text = message.FromUserInfo.nickname;
@@ -593,7 +668,7 @@ NSInteger maxMessageCount = 20;
make.bottom.right.equalTo(self.headerImageView).offset(2);
}];
self.nameLabel = [[UILabel alloc] init];
- self.nameLabel.textColor = [UIColor whiteColor];
+ self.nameLabel.textColor = RGB16(0xCCA882);
self.nameLabel.font = [UIFont systemFontOfSize:12];
[self.contentView addSubview:self.nameLabel];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -752,13 +827,37 @@ NSInteger maxMessageCount = 20;
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:message.text];
if ([message.FromUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.FromUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.FromUserInfo.nickname]];
}
if ([message.ToUserInfo.nickname isExist]) {
- [attr yy_setColor:RGB16(0xFFE309) range:[message.text rangeOfString:message.ToUserInfo.nickname]];
+ [attr yy_setColor:messageNameColor range:[message.text rangeOfString:message.ToUserInfo.nickname]];
}
if ([message.GiftInfo.gift_name isExist]) {
- [attr yy_setColor:RGB16(0x00C8FF) range:[message.text rangeOfString:message.GiftInfo.gift_name]];
+ NSArray *arr = [message.GiftInfo.gift_name componentsSeparatedByString:@","];
+ for (NSString*gift_name in arr) {
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, gift_name);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageGiftColor range:range];
+ }
+ }
+ }
+ if (message.GiftInfos.count > 0) {
+ for (QXGiftModel*gift in message.GiftInfos) {
+ if ([gift.gift_name isExist]) {
+ [attr yy_setColor:messageGiftColor range:[message.text rangeOfString:gift.gift_name]];
+ }
+ }
+ }
+ if (message.ToUserInfos.count > 0) {
+ for (int i = 0; i < message.ToUserInfos.count; i++) {
+ QXUserHomeModel*md = message.ToUserInfos[i];
+ NSArray *occurrences = findAllOccurrencesOfString(message.text, md.nickname);
+ for (NSValue *rangeValue in occurrences) {
+ NSRange range = [rangeValue rangeValue];
+ [attr yy_setColor:messageNameColor range:range];
+ }
+ }
}
self.titleLabel.attributedText = attr;
}
@@ -794,7 +893,9 @@ NSInteger maxMessageCount = 20;
@implementation QXRoomChatListModel
+(NSDictionary *)modelContainerPropertyGenericClass{
- return @{@"GiftInfo" : @"QXGiftModel",
+ return @{
+ @"GiftInfo" : @"QXGiftModel",
+ @"GiftInfos" : @"QXGiftModel",
@"FromUserInfo":@"QXUserHomeModel",
@"nextInfo":@"QXSongListModel",
@"songInfo":@"QXSongListModel",
diff --git a/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.h b/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.h
index 0562442..83279ee 100644
--- a/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.h
+++ b/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.h
@@ -52,6 +52,8 @@ typedef NS_ENUM(NSInteger) {
QXRoomSettingTypeRoomCloseEffects = 25,
/// 意见反馈
QXRoomSettingTypeRoomReport = 26,
+ /// 关闭飘屏
+ QXRoomSettingTypeDrifPop = 27,
}QXRoomSettingType;
NS_ASSUME_NONNULL_BEGIN
@class QXRoomSettingModel;
diff --git a/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m b/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m
index 1e9c3f7..73e56c9 100644
--- a/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m
+++ b/QXLive/HomePage(声播)/View/房间/设置/QXRoomSettingView.m
@@ -14,6 +14,8 @@
#import "QXSingerConfigView.h"
#import "QXRoomWelcomeView.h"
#import "QXAlertView.h"
+#import "QXGiftDriftView.h"
+#import "QXMeetActivityDriftView.h"
@interface QXRoomSettingView()
@property (nonatomic,strong)UIView *bgView;
@@ -69,6 +71,9 @@
@property (nonatomic,strong)QXRoomSettingModel *roomEffects;
/// 意见反馈
@property (nonatomic,strong)QXRoomSettingModel *roomReport;
+/// 飘屏开关
+@property (nonatomic,strong)QXRoomSettingModel *drifPop;
+
/// 主持列表
@property (nonatomic,strong)QXDirectListView *directView;
@@ -152,7 +157,9 @@
self.roomOrderMic.isSelected = YES;
}
BOOL isEffectsCLose = [[NSUserDefaults standardUserDefaults] boolForKey:kEffectsCLose];
+ BOOL isDrifPopCLose = [[NSUserDefaults standardUserDefaults] boolForKey:kIsCloseDrifPop];
self.roomEffects.isSelected = isEffectsCLose;
+ self.drifPop.isSelected = isDrifPopCLose;
[self.tableView reloadData];
}
// isUpSeat true 麦上 false 麦下
@@ -163,36 +170,18 @@
switch (roleType) {
// 主持
case QXRoomRoleTypeCompere:{
-// if (isUpSeat) {
-// // 麦上 常用工具 更多操作
-// self.titles = @[QXText(@"常用工具"),QXText(@"更多操作")];
-// roomTypeArr = @[];
-// toolsArr = @[self.roomMessage,self.roomOrderMic,self.roomBgMusic];
-// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomEffects,self.roomReport];
-// }else{
-// // 麦下 更多操作
-// self.titles = @[QXText(@"更多操作")];
-// roomTypeArr = @[];
-// toolsArr = @[];
-// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomEffects,self.roomReport];
-// }
-// if (isUpSeat) {
-
-// }else{
-// toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
-// }
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) && self.roomModel.room_info.label_id.intValue == 2) {
toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgImage];
-// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
- // moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
- moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.roomReport];
+ moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
+// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
+// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
}else{
toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
-// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
- // moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
- moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.roomReport];
+ moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
+// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
+// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
}
self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
@@ -202,7 +191,7 @@
// 观众 更多操作 不区分麦上麦下
roomTypeArr = @[];
toolsArr = @[];
- moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomEffects,self.roomReport];
+ moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomEffects,self.drifPop,self.roomReport];
self.titles = @[QXText(@"更多操作")];
}
break;
@@ -216,13 +205,13 @@
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) && self.roomModel.room_info.label_id.intValue == 2) {
toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}else{
- toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
+// toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
+ toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}
-
-// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
+ moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
- moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.roomReport];
+// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
}
break;
@@ -236,12 +225,13 @@
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) && self.roomModel.room_info.label_id.intValue == 2) {
toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}else{
- toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
+// toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
+ toolsArr = @[self.roomSubsidy,self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}
// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
// moreArr = @[self.roomLeave,self.roomShare,self.roomVoiceSet,self.roomSetting,self.roomWelcome,self.roomEffects,self.roomReport];
- moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.roomReport];
+ moreArr = @[self.roomLeave,self.roomVoiceSet,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
}
break;
@@ -423,13 +413,13 @@
return _roomTypeFriend;
}
-(QXRoomSettingModel *)roomTypeFunny{
- if (!_roomReport) {
- _roomReport = [[QXRoomSettingModel alloc] init];
- _roomReport.name = QXText(@"交友");
- _roomReport.type = QXRoomSettingTypeRoomTypeFunny;
- _roomReport.icon = @"room_set_room_type_funny";
+ if (!_roomTypeFunny) {
+ _roomTypeFunny = [[QXRoomSettingModel alloc] init];
+ _roomTypeFunny.name = QXText(@"交友");
+ _roomTypeFunny.type = QXRoomSettingTypeRoomTypeFunny;
+ _roomTypeFunny.icon = @"room_set_room_type_funny";
}
- return _roomReport;
+ return _roomTypeFunny;
}
-(QXRoomSettingModel *)roomSubsidy{
if (!_roomSubsidy) {
@@ -560,6 +550,17 @@
}
return _roomReport;
}
+-(QXRoomSettingModel *)drifPop{
+ if (!_drifPop) {
+ _drifPop = [[QXRoomSettingModel alloc] init];
+ _drifPop.name = QXText(@"关闭飘屏");
+ _drifPop.selName = QXText(@"开启飘屏");
+ _drifPop.type = QXRoomSettingTypeDrifPop;
+ _drifPop.icon = @"room_set_drif_pop_off";
+ _drifPop.selIcon = @"room_set_drif_pop_on";
+ }
+ return _drifPop;
+}
-(QXDirectListView *)directView{
if (!_directView) {
_directView = [[QXDirectListView alloc] init];
@@ -653,6 +654,15 @@
[[QXGiftPlayerManager shareManager] openOrCloseEffectViewWith:!model.isSelected];
return;
}
+ if (model.type == QXRoomSettingTypeDrifPop) {
+ model.isSelected = !model.isSelected;
+ QXRoomSettingSubCell *cell = [collectionView cellForItemAtIndexPath:indexPath];
+ cell.model = model;
+ [[NSUserDefaults standardUserDefaults] setBool:model.isSelected forKey:kIsCloseDrifPop];
+ [[QXGiftDriftView shareView] drifPopIsClose:model.isSelected];
+ [[QXMeetActivityDriftView shareView] drifPopIsClose:model.isSelected];
+ return;
+ }
if (model.type == QXRoomSettingTypeRoomOrderMic) {
[QXMineNetwork roomChangeUpSeatTypeWithRoomId:self.roomId successBlock:^(NSDictionary * _Nonnull dict) {
// model.isSelected = !model.isSelected;
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h
index ace2970..f7718cf 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.h
@@ -50,6 +50,9 @@ NS_ASSUME_NONNULL_BEGIN
-(void)hideCharm;
-(void)destroyViews;
+
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
@end
NS_ASSUME_NONNULL_END
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m
index a6a727e..63f473e 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatContentView.m
@@ -509,4 +509,10 @@
self.micMp4View = nil;
[self.micSvgaView destroySvga];
}
+-(void)stopHWDMP4{
+ [self.headerView stopHWDMP4];
+}
+-(void)playHWDMP4{
+ [self.headerView playHWDMP4];
+}
@end
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.h
index fc7a2aa..7b30c18 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.h
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 设置麦位锁麦状态
-(void)setSeatIsLock:(NSString*)isLock pitNumber:(NSString*)pitNumber;
/// 房间内换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber;
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo;
/// pk开始
-(void)pkStartWithPkEndTimes:(NSString *)pk_end_times pk_id:(NSString*)pk_id;
@@ -42,7 +42,8 @@ NS_ASSUME_NONNULL_BEGIN
defeated_cover:(NSString*)defeated_cover;
/// 房间内用户信息发生变化
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;
-
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
@end
/// 穿透视图
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.m
index cbdccdd..d0790a3 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatPKView.m
@@ -288,8 +288,8 @@
}
[self.leftSeatView didUpDownSeatWithUser:user isUpSeat:isUpSeat pit_number:pit_number];
}
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
- [self.leftSeatView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo{
+ [self.leftSeatView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:userInfo];
}
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user{
[self.leftSeatView roomUserInfoDidChanged:user];
@@ -297,6 +297,12 @@
-(void)clearCharm{
[self.leftSeatView clearCharm];
}
+-(void)playHWDMP4{
+ [self.leftSeatView playHWDMP4];
+}
+-(void)stopHWDMP4{
+ [self.leftSeatView stopHWDMP4];
+}
-(void)roomClearUserCharmWithUserId:(NSString *)userId{
[self.leftSeatView roomClearUserCharmWithUserId:userId];
}
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h
index 7298c8a..2bb7b10 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.h
@@ -39,7 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)roomClearUserCharmWithUserId:(NSString *)userId;
/// 房间内用户信息发生变化
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;
-
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
@end
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m
index 6cff44d..8343e45 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeAuctionView.m
@@ -1116,6 +1116,34 @@
self.timeLabel.text = @"倒计时 00:00:00";
}
}
+-(void)stopHWDMP4{
+ [self.auctionView stopHWDMP4];
+ [self.compereView stopHWDMP4];
+ for (UIView *contentView in self.seatArray) {
+ if ([contentView isKindOfClass:[QXRoomAuctionSeatView class]]) {
+ QXRoomAuctionSeatView *seatView = (QXRoomAuctionSeatView *)contentView;
+ [seatView.seatView stopHWDMP4];
+ }
+ if ([contentView isKindOfClass:[QXRoomSeatContentView class]]) {
+ QXRoomSeatContentView *seatView = (QXRoomSeatContentView *)contentView;
+ [seatView stopHWDMP4];
+ }
+ }
+}
+-(void)playHWDMP4{
+ [self.auctionView playHWDMP4];
+ [self.compereView playHWDMP4];
+ for (UIView *contentView in self.seatArray) {
+ if ([contentView isKindOfClass:[QXRoomAuctionSeatView class]]) {
+ QXRoomAuctionSeatView *seatView = (QXRoomAuctionSeatView *)contentView;
+ [seatView.seatView playHWDMP4];
+ }
+ if ([contentView isKindOfClass:[QXRoomSeatContentView class]]) {
+ QXRoomSeatContentView *seatView = (QXRoomSeatContentView *)contentView;
+ [seatView playHWDMP4];
+ }
+ }
+}
-(void)destroyViews{
[self.auctionView destroyViews];
[self.compereView destroyViews];
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.h
index 0056e2a..69b6d93 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.h
@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)cabinRoomHotValueDidChanged:(NSString*)hot_value;
-(void)friendCabinRoomTimeDelayWithTime:(NSString*)end_time;
-(void)friendCabinRoomIsQuit;
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
@end
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.m
index b28d83d..d73ad42 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeCabinView.m
@@ -351,6 +351,14 @@
[na popViewControllerAnimated:YES];
}
}
+-(void)stopHWDMP4{
+ [self.leftSeatView stopHWDMP4];
+ [self.rightSeatView stopHWDMP4];
+}
+-(void)playHWDMP4{
+ [self.leftSeatView playHWDMP4];
+ [self.rightSeatView playHWDMP4];
+}
-(void)destroyViews{
if (_leftSeatView) {
[_leftSeatView destroyViews];
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.h
index 6a976d8..d5f2296 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.h
@@ -54,7 +54,9 @@ typedef NS_ENUM(NSInteger) {
/// 用户信息发生改变
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;
/// 房间内换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber;
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo;
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
/// 销毁视图
-(void)destroyViews;
@end
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m
index 1ceaa63..828116e 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeFrientView.m
@@ -859,7 +859,7 @@
contentView.pitModel = model;
[self configGameOptionBtn];
}
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo{
if (fromPitNumber == 0 || toPitNumber == 0) {
return;
}
@@ -877,6 +877,9 @@
toSeatView.pitModel = fromPitModel;
fromSeatView.pitModel = totModel;
+ if ([userInfo.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
+ self.myPitNumber = toPitNumber;
+ }
}
}
-(void)didClickUserHeaderWithPitModel:(QXRoomPitModel *)pitModel seatView:(QXRoomSeatContentView *)seatView{
@@ -1332,7 +1335,22 @@
return _successView;
}
-
+-(void)stopHWDMP4{
+ for (id object in self.allSeatViewArray) {
+ if ([object isKindOfClass:[QXRoomSeatContentView class]]) {
+ QXRoomSeatContentView *contentView = (QXRoomSeatContentView *)object;
+ [contentView stopHWDMP4];
+ }
+ }
+}
+-(void)playHWDMP4{
+ for (id object in self.allSeatViewArray) {
+ if ([object isKindOfClass:[QXRoomSeatContentView class]]) {
+ QXRoomSeatContentView *contentView = (QXRoomSeatContentView *)object;
+ [contentView playHWDMP4];
+ }
+ }
+}
-(void)destroyViews{
for (id object in self.allSeatViewArray) {
if ([object isKindOfClass:[QXRoomSeatContentView class]]) {
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.h
index d8ac6a2..208e31b 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.h
@@ -41,7 +41,10 @@ NS_ASSUME_NONNULL_BEGIN
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;
/// 房间内换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber;
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo;
+
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
@end
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m
index eda11d0..5dfbb34 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeNormalView.m
@@ -361,7 +361,7 @@ static NSInteger maxSeat = 8;
}
}
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo{
if (fromPitNumber == 0 || toPitNumber == 0) {
return;
}
@@ -376,6 +376,9 @@ static NSInteger maxSeat = 8;
toSeatView.pitModel = fromPitModel;
fromSeatView.pitModel = totModel;
+ if ([userInfo.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
+ self.myPitNumber = toPitNumber;
+ }
}
-(void)setSeatIsLock:(NSString *)isLock pitNumber:(NSString *)pitNumber{
@@ -397,6 +400,16 @@ static NSInteger maxSeat = 8;
}
}
}
+-(void)stopHWDMP4{
+ for (QXRoomSeatContentView *seatView in self.seatArray) {
+ [seatView stopHWDMP4];
+ }
+}
+-(void)playHWDMP4{
+ for (QXRoomSeatContentView *seatView in self.seatArray) {
+ [seatView playHWDMP4];
+ }
+}
-(void)destroyViews{
for (QXRoomSeatContentView *seatView in self.seatArray) {
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.h
index 870bc2d..ecec22d 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.h
@@ -22,7 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXSongListModel *songInfo;
@property (nonatomic,strong)QXSongListModel *nextInfo;
-
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
-(void)destroyViews;
/// 清除魅力
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.m
index a45afdb..a3d84ea 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatTypeSongView.m
@@ -790,6 +790,17 @@ QXRoomSeatDelegate
[self.delegate sendGiftWithUser:self.singerSeatView.pitModel];
}
}
+-(void)stopHWDMP4{
+ [self.singerSeatView stopHWDMP4];
+ [self.guestView stopHWDMP4];
+ [self.compereView stopHWDMP4];
+}
+-(void)playHWDMP4{
+ [self.singerSeatView playHWDMP4];
+ [self.guestView playHWDMP4];
+ [self.compereView playHWDMP4];
+ [self.collectionView reloadData];
+}
-(void)destroyViews{
[self.singerSeatView destroyViews];
[self.guestView destroyViews];
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.h b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.h
index af64665..438156d 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.h
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.h
@@ -44,6 +44,9 @@ typedef NS_ENUM(NSInteger) {
@property (nonatomic,assign)double speakerPitch;
@property (nonatomic,strong)QXSongListModel *songInfo;
@property (nonatomic,strong)QXSongListModel *nextInfo;
+
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
/// 销毁视图
-(void)destroyViews;
@@ -62,7 +65,7 @@ typedef NS_ENUM(NSInteger) {
/// 房间内用户信息发生变化
-(void)roomUserInfoDidChanged:(QXUserHomeModel *)user;
/// 房间内换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber;
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo;
diff --git a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m
index 224bd12..9ea4b3b 100644
--- a/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m
+++ b/QXLive/HomePage(声播)/View/房间/麦位视图/QXRoomSeatView.m
@@ -909,13 +909,13 @@
}
}
/// 房间内换麦
--(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber{
+-(void)roomSeatExchangedWithFromPitNumber:(NSInteger)fromPitNumber toPitNumber:(NSInteger)toPitNumber userInfo:(QXUserHomeModel*)userInfo{
if (self.roomModel == nil) {
return;
}
switch (self.type) {
case QXRoomSeatViewTypeNormal:
- [self.normalSeatView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+ [self.normalSeatView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:userInfo];
break;
case QXRoomSeatViewTypeSing:
// [self.songView clearCharm];
@@ -925,10 +925,10 @@
case QXRoomSeatViewTypeCabin:
break;
case QXRoomSeatViewTypePK:
- [self.roomPkView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+ [self.roomPkView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:userInfo];
break;
case QXRoomSeatViewTypeFriend:
- [self.roomFriendView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber];
+ [self.roomFriendView roomSeatExchangedWithFromPitNumber:fromPitNumber toPitNumber:toPitNumber userInfo:userInfo];
break;
default:
break;
@@ -1292,7 +1292,54 @@
break;
}
}
-
+-(void)stopHWDMP4{
+ switch (self.type) {
+ case QXRoomSeatViewTypeNormal:
+ [self.normalSeatView stopHWDMP4];
+ break;
+ case QXRoomSeatViewTypeSing:
+ [self.songView stopHWDMP4];
+ break;
+ case QXRoomSeatViewTypeAuction:
+ [self.auctionView stopHWDMP4];
+ break;
+ case QXRoomSeatViewTypeCabin:
+ [self.cabinView stopHWDMP4];
+ break;
+ case QXRoomSeatViewTypePK:
+ [self.roomPkView stopHWDMP4];
+ break;
+ case QXRoomSeatViewTypeFriend:
+ [self.roomFriendView stopHWDMP4];
+ break;
+ default:
+ break;
+ }
+}
+-(void)playHWDMP4{
+ switch (self.type) {
+ case QXRoomSeatViewTypeNormal:
+ [self.normalSeatView playHWDMP4];
+ break;
+ case QXRoomSeatViewTypeSing:
+ [self.songView playHWDMP4];
+ break;
+ case QXRoomSeatViewTypeAuction:
+ [self.auctionView playHWDMP4];
+ break;
+ case QXRoomSeatViewTypeCabin:
+ [self.cabinView playHWDMP4];
+ break;
+ case QXRoomSeatViewTypePK:
+ [self.roomPkView playHWDMP4];
+ break;
+ case QXRoomSeatViewTypeFriend:
+ [self.roomFriendView playHWDMP4];
+ break;
+ default:
+ break;
+ }
+}
-(void)destroyViews{
if (_normalSeatView) {
[self.normalSeatView destroyViews];
diff --git a/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.h b/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.h
index cacf32e..ab9493a 100644
--- a/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.h
+++ b/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.h
@@ -21,7 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)setHeadIcon:(NSString*)headerIcon
dress:(NSString*)dress;
-
+-(void)stopHWDMP4;
+-(void)playHWDMP4;
@end
NS_ASSUME_NONNULL_END
diff --git a/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.m b/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.m
index 5a376f9..b68a18b 100644
--- a/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.m
+++ b/QXLive/HomePage(声播)/View/直播/QXSeatHeaderView.m
@@ -14,6 +14,8 @@
@property (nonatomic,strong) QXEffectSvgaView *svgaView;
@property (nonatomic,strong) VAPView *mp4View;
+@property (nonatomic,strong) NSString *dress;
+@property (nonatomic,strong) NSString *videoPath;
@end
@implementation QXSeatHeaderView
- (instancetype)initWithCoder:(NSCoder *)coder
@@ -62,6 +64,7 @@
-(void)setHeadIcon:(NSString *)headerIcon
dress:(nonnull NSString *)dress{
+ _dress = dress;
NSString *dressUrl = [dress stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
[self.headImageView sd_setImageWithURL:[NSURL URLWithString:headerIcon] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]];
if (dressUrl.length > 0 && ([dressUrl hasPrefix:@"http"] || [dressUrl hasPrefix:@"https"])) {
@@ -79,6 +82,7 @@
MJWeakSelf
[[QXRequset shareInstance] downloadVideoPlayerWithUrl:dressUrl completion:^(BOOL result, NSString * _Nonnull fileName) {
NSString *videoPath = [QXFileManager getGiftVideoPath:dressUrl.lastPathComponent];
+ weakSelf.videoPath = videoPath;
[weakSelf.mp4View playHWDMP4:videoPath repeatCount:INTMAX_MAX delegate:self];
}];
}else{
@@ -100,6 +104,18 @@
[self.mp4View setHidden:YES];
}
}
+-(void)stopHWDMP4{
+ if (![_dress isExist]) {
+ return;
+ }
+ [self.mp4View stopHWDMP4];
+}
+-(void)playHWDMP4{
+ if (![_dress isExist]) {
+ return;
+ }
+ [self.mp4View playHWDMP4:self.videoPath repeatCount:INTMAX_MAX delegate:self];
+}
- (QXEffectSvgaView *)svgaView {
if (!_svgaView) {
_svgaView = [[QXEffectSvgaView alloc] initWithFrame:CGRectZero isAutoPlay:YES];
@@ -110,7 +126,7 @@
- (VAPView *)mp4View {
if (!_mp4View) {
_mp4View = [[VAPView alloc] initWithFrame:CGRectZero];
- _mp4View.hwd_enterBackgroundOP = HWDMP4EBOperationTypePauseAndResume;
+ _mp4View.hwd_enterBackgroundOP = HWDMP4EBOperationTypeDoNothing;
_mp4View.contentMode = UIViewContentModeScaleAspectFit;
_mp4View.userInteractionEnabled = NO;
_mp4View.backgroundColor = [UIColor clearColor];
diff --git a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib
index 36b0d90..c97b8f6 100755
--- a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib
+++ b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib
@@ -243,13 +243,12 @@