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-12-24 15:39:46 +08:00
parent 0fcff85625
commit 7b7d18e665
34 changed files with 517 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1794,7 +1794,8 @@ QXRoomUserInfoViewDelegate
MJWeakSelf
_sendGiftView.roomSendSuccessBlock = ^(QXSendGiftViewType sendType, QXGiftModel * _Nonnull giftModel, NSString * _Nonnull giftCount, NSString * _Nonnull userId, NSString * _Nonnull optionId) {
// if (self->_continuousView == nil) {
[weakSelf.view addSubview:weakSelf.continuousView];
[weakSelf.view addSubview:weakSelf.continuousView];
[weakSelf.view bringSubviewToFront:weakSelf.continuousView];
// }
weakSelf.continuousView.giftModel = giftModel;
weakSelf.continuousView.sendType = sendType;

28
QXLive/Room(房间)/View/QXRoomChatListView.m
View File

@@ -217,20 +217,20 @@ NSInteger maxMessageCount = 20;
// [self.synthesizer speakUtterance:utterance];
// }
#else
if (QXGlobal.shareGlobal.isAppStore) {
NSString *text = @"";
if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) {
text = model.text;
}else{
text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text];
}
AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"];
utterance.rate = 0.5 ;
utterance.pitchMultiplier = 1.0 ;
utterance.volume = 1.0 ;
[self.synthesizer speakUtterance:utterance];
}
// if (QXGlobal.shareGlobal.isAppStore) {
// NSString *text = @"";
// if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) {
// text = model.text;
// }else{
// text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text];
// }
// AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
// utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"];
// utterance.rate = 0.5 ;
// utterance.pitchMultiplier = 1.0 ;
// utterance.volume = 1.0 ;
// [self.synthesizer speakUtterance:utterance];
// }
#endif
NSIndexPath *newIndexPath = [NSIndexPath indexPathForRow:self.dataArray.count - 1 inSection:0];
[self.tableView beginUpdates];

2
QXLive/Room(房间)/View/QXSetApplyGiftView.m
View File

@@ -116,7 +116,7 @@
}
[weakSelf hide];
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
}];
}

3
QXLive/Room(房间)/View/点唱/QXSingerSongListView.m
View File

@@ -80,6 +80,7 @@
}
-(void)setRoomId:(NSString *)roomId{
_roomId = roomId;
self.alreadySongView.roomId = roomId;
[self getSongListCount];
}
-(void)getSongListCount{
@@ -99,6 +100,7 @@
[self.titles replaceObjectAtIndex:1 withObject:self.alreadySongTitle];
self.categoryView.titles = self.titles;
[self.categoryView reloadDataWithoutListContainer];
self.alreadySongView.roomId = self.roomId;
[self.alreadySongView updateSongList];
}
@@ -156,6 +158,7 @@
-(void)showInView:(UIView *)view pitArray:(nonnull NSArray *)pitArray isCompere:(BOOL)isCompere{
self.requestSongView.pitArray = pitArray;
self.alreadySongView.isCompere = isCompere;
self.alreadySongView.roomId = self.roomId;
self.bgView.y = SCREEN_HEIGHT;
[view addSubview:self];
[UIView animateWithDuration:0.3 animations:^{

2
QXLive/Room(房间)/View/设置/QXRoomSettingView.m
View File

@@ -696,7 +696,7 @@
_redBagSound.icon = @"room_redbag_sound_off";
_redBagSound.selIcon = @"room_redbag_sound_on";
_redBagSound.name = QXText(@"红包音效");
_drifPop.selName = QXText(@"红包音效");
_redBagSound.selName = QXText(@"红包音效");
_redBagSound.type = QXRoomSettingTypeRedBagSound;
}
return _redBagSound;

12
QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m
View File

@@ -217,6 +217,18 @@
}
}
QXLOG(@"在线状态%@",QXGlobal.shareGlobal.offLineDict);
NSInteger is_offline = [[[QXGlobal shareGlobal].offLineDict objectForKey:self.pitModel.user_id?self.pitModel.user_id:@"0"] integerValue];
if (is_offline==1) {
self.offlineImageView.hidden = YES;
}else if(is_offline == 2){
if (self.noOffLine) {
self.offlineImageView.hidden = YES;
}else{
self.offlineImageView.hidden = NO;
}
}else{
self.offlineImageView.hidden = YES;
}
}
-(void)speakInfo:(NSNotification*)notice{
if (self.noMicCycle) {

82
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeFrientView.m
View File

@@ -942,25 +942,28 @@
if (self.myPitNumber == 9) {
// 排麦模式 弹出上麦
if (self.myPitNumber == 9 || self.roomModel.user_info.is_room_owner.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1 || self.roomModel.user_info.is_host.intValue == 1) {
MJWeakSelf
/// 自己在9号麦 管理麦位
QXRoomPitModel *pitModel = seatView.pitModel;
self.settingView.roomId = self.roomModel.room_info.room_id;
self.settingView.isNoHaveLockMic = YES;
self.settingView.pitModel = pitModel;
self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
seatView.pitModel = pitModel;
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// }
};
self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
};
[self.settingView showInView:self.viewController.view];
// MJWeakSelf
// /// 自己在9号麦 管理麦位
// QXRoomPitModel *pitModel = seatView.pitModel;
// self.settingView.roomId = self.roomModel.room_info.room_id;
// self.settingView.isNoHaveLockMic = YES;
// self.settingView.pitModel = pitModel;
// self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// seatView.pitModel = pitModel;
// // if (self.isPKMyRoom || self.isPKOtherRoom) {
// // [seatView hideCharm];
// // }
// };
// self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// // [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
// [weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
// }
// };
// [self.settingView showInView:self.viewController.view];
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[self.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
}
}else{
if (self.roomModel.room_info.room_up_pit_type.intValue == 2) {
@@ -974,25 +977,28 @@
/// 排麦模式
// 排麦模式 弹出上麦
if (self.myPitNumber == 9 || self.roomModel.user_info.is_room_owner.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1 || self.roomModel.user_info.is_host.intValue == 1) {
MJWeakSelf
/// 自己在9号麦 管理麦位
QXRoomPitModel *pitModel = seatView.pitModel;
self.settingView.roomId = self.roomModel.room_info.room_id;
self.settingView.isNoHaveLockMic = YES;
self.settingView.pitModel = pitModel;
self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
seatView.pitModel = pitModel;
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// }
};
self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
};
[self.settingView showInView:self.viewController.view];
// MJWeakSelf
// /// 自己在9号麦 管理麦位
// QXRoomPitModel *pitModel = seatView.pitModel;
// self.settingView.roomId = self.roomModel.room_info.room_id;
// self.settingView.isNoHaveLockMic = YES;
// self.settingView.pitModel = pitModel;
// self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// seatView.pitModel = pitModel;
// // if (self.isPKMyRoom || self.isPKOtherRoom) {
// // [seatView hideCharm];
// // }
// };
// self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// // [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
// [weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
// }
// };
// [self.settingView showInView:self.viewController.view];
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[self.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
}
}
}

73
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeNormalView.m
View File

@@ -130,24 +130,26 @@ static NSInteger maxSeat = 8;
return;
}else{
if (self.myPitNumber == 9) {
MJWeakSelf
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[self.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
// MJWeakSelf
/// 自己在9号麦 管理麦位
QXRoomPitModel *pitModel = seatView.pitModel;
self.settingView.roomId = self.roomModel.room_info.room_id;
self.settingView.pitModel = pitModel;
self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
seatView.pitModel = pitModel;
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// QXRoomPitModel *pitModel = seatView.pitModel;
// self.settingView.roomId = self.roomModel.room_info.room_id;
// self.settingView.pitModel = pitModel;
// self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// seatView.pitModel = pitModel;
//// if (self.isPKMyRoom || self.isPKOtherRoom) {
//// [seatView hideCharm];
//// }
// };
// self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
// [self.delegate didHugSeatWithPitNumber:pitModel.pit_number];
// }
};
self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
};
[self.settingView showInView:self.viewController.view];
// };
// [self.settingView showInView:self.viewController.view];
}else{
if (self.roomModel.room_info.room_up_pit_type.intValue == 2) {
/// 自由麦请求
@@ -159,24 +161,27 @@ static NSInteger maxSeat = 8;
}else{
// 排麦模式 弹出上麦
if (self.myPitNumber == 9 || self.roomModel.user_info.is_room_owner.intValue == 1 || self.roomModel.user_info.is_management.intValue == 1 || self.roomModel.user_info.is_host.intValue == 1) {
MJWeakSelf
/// 自己在9号麦 管理麦位
QXRoomPitModel *pitModel = seatView.pitModel;
self.settingView.roomId = self.roomModel.room_info.room_id;
self.settingView.pitModel = pitModel;
self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
seatView.pitModel = pitModel;
// if (self.isPKMyRoom || self.isPKOtherRoom) {
// [seatView hideCharm];
// }
};
self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
};
[self.settingView showInView:self.viewController.view];
// MJWeakSelf
// /// 自己在9号麦 管理麦位
// QXRoomPitModel *pitModel = seatView.pitModel;
// self.settingView.roomId = self.roomModel.room_info.room_id;
// self.settingView.pitModel = pitModel;
// self.settingView.setSuccessBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// seatView.pitModel = pitModel;
// // if (self.isPKMyRoom || self.isPKOtherRoom) {
// // [seatView hideCharm];
// // }
// };
// self.settingView.clickHugBlock = ^(QXRoomPitModel * _Nonnull pitModel) {
// // [weakSelf showOnlineListWithPitNumber:pitModel.pit_number];
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
// [weakSelf.delegate didHugSeatWithPitNumber:pitModel.pit_number];
// }
// };
// [self.settingView showInView:self.viewController.view];
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithPitNumber:)]) {
[self.delegate didHugSeatWithPitNumber:pitModel.pit_number];
}
}
}
}