Skip to content

pidan / FuSiLive

Go to a project
Commit 17870040 by pierce
Options

fixed bugs

parent 72641ad8
Inline Side-by-side
Showing with 55 additions and 17 deletions
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftSendToUserView.m
...@@ -68,8 +68,7 @@ ...@@ -68,8 +68,7 @@
#pragma mark - UI Update #pragma mark - UI Update
- (void)initial { - (void)initial {
self.backgroundColor = [UIColor fus_appBGColor]; self.backgroundColor = [[UIColor colorWithHex:@"11121A"] colorWithAlphaComponent:0.88];
[self addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(12, 12)];
CGSize faceIconSize = CGSizeMake(kUserIconWidth, kUserIconWidth); CGSize faceIconSize = CGSizeMake(kUserIconWidth, kUserIconWidth);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m
...@@ -30,6 +30,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -30,6 +30,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
// 是否正在加入 // 是否正在加入
@property (nonatomic, assign) BOOL isJoining; @property (nonatomic, assign) BOOL isJoining;
@property (nonatomic, assign) BOOL localMicEnable;
// 自己是否在麦上 // 自己是否在麦上
@property (nonatomic, assign) BOOL myselfIsOnMic; @property (nonatomic, assign) BOOL myselfIsOnMic;
...@@ -43,6 +45,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -43,6 +45,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
// 声网连麦对方的预览 View // 声网连麦对方的预览 View
@property (nonatomic, strong) UIView *agoraOtherPreview; @property (nonatomic, strong) UIView *agoraOtherPreview;
@end @end
@implementation FUSAgoraHelper @implementation FUSAgoraHelper
...@@ -86,8 +89,12 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -86,8 +89,12 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
/// @param mute 是否静音 /// @param mute 是否静音
/// @param uid 相关流的ID /// @param uid 相关流的ID
- (void)fus_muteAudioStreams:(BOOL)mute uid:(NSString *)uid{ - (void)fus_muteAudioStreams:(BOOL)mute uid:(NSString *)uid{
if (uid.integerValue != FUSCacheDataShare.shareStore.userDetailInfo.uid.integerValue) {
[self.agoraEngine muteRemoteAudioStream:uid.integerValue mute:mute]; [self.agoraEngine muteRemoteAudioStream:uid.integerValue mute:mute];
} else {
[self switchLocalMic:!mute];
}
} }
- (void)fus_registNotification { - (void)fus_registNotification {
...@@ -142,7 +149,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -142,7 +149,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
}else{ }else{
[self.agoraEngine disableVideo]; [self.agoraEngine disableVideo];
[self.agoraEngine enableAudio]; [self.agoraEngine enableAudio];
[self.agoraEngine enableLocalAudio:YES]; [self switchLocalMic:self.localMicEnable];
} }
} }
...@@ -396,21 +403,39 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -396,21 +403,39 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
}else{ }else{
[_agoraEngine enableLocalVideo:NO]; [_agoraEngine enableLocalVideo:NO];
} }
[_agoraEngine enableLocalAudio:YES];
[self switchLocalMic:YES];
[self updateToSpeakerPlay]; [self updateToSpeakerPlay];
} }
- (void)fus_closeMicro{ - (void)fus_closeMicro{
[self fus_switchRole:AgoraClientRoleAudience]; [self fus_switchRole:AgoraClientRoleAudience];
[_agoraEngine muteLocalAudioStream:YES]; [_agoraEngine muteLocalAudioStream:YES];
[_agoraEngine enableLocalAudio:NO]; [self switchLocalMic:NO];
[self updateToSpeakerPlay]; [self updateToSpeakerPlay];
} }
- (void)switchLocalMic:(BOOL)open{ - (void)switchLocalMic:(BOOL)open {
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
open = ![FUSLiveHelper fus_livePushMuteState];
}
// [_agoraEngine muteLocalAudioStream:!open]; /// 如果自己关麦了。不管后台传过来的是什么。都设置为NO
[_agoraEngine enableLocalAudio:open]; if (FUSLiveHelper.shareInstance.selfCloseMic) {
open = NO;
}
[_agoraEngine muteLocalAudioStream:!open];
//TODO: ludy:对应bugYBCH-28179 連麥的時候，開麥閉麥會断一下。 7580版本因为测试时间有限，先不改，下版本直接打开下面的注释，把上面的代码注释，修改测试
// [_agoraEngine enableLocalAudio:open];
self.localMicEnable = open;
}
- (void)setLocalMicEnable:(BOOL)localMicEnable {
_localMicEnable = localMicEnable;
[_agoraEngine enableLocalAudio:localMicEnable];
} }
- (void)setAgoraHelperDelegate:(id<FUSAgoraHelperDelegate>)agoraHelperDelegate{ - (void)setAgoraHelperDelegate:(id<FUSAgoraHelperDelegate>)agoraHelperDelegate{
...@@ -463,7 +488,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -463,7 +488,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[_agoraEngine setChannelProfile:AgoraChannelProfileLiveBroadcasting]; [_agoraEngine setChannelProfile:AgoraChannelProfileLiveBroadcasting];
[_agoraEngine enableVideo]; [_agoraEngine enableVideo];
[_agoraEngine enableAudio]; [_agoraEngine enableAudio];
[_agoraEngine enableLocalAudio:YES];
[self switchLocalMic:YES];
[_agoraEngine enableLocalVideo:YES]; [_agoraEngine enableLocalVideo:YES];
_agoraEngine.delegate = self; _agoraEngine.delegate = self;
// [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionConfigureSession]; // [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionConfigureSession];
...@@ -741,7 +767,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -741,7 +767,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
} }
} }
[engine enableLocalAudio:YES];
[self switchLocalMic:YES];
if (oldRole != newRole) { if (oldRole != newRole) {
[[NSNotificationCenter defaultCenter] postNotificationName:kLiveLinkMicRoleDidChanged object:nil userInfo:@{@"role":@(newRole)}]; [[NSNotificationCenter defaultCenter] postNotificationName:kLiveLinkMicRoleDidChanged object:nil userInfo:@{@"role":@(newRole)}];
}else{ }else{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroListView.m
...@@ -513,7 +513,8 @@ ...@@ -513,7 +513,8 @@
#pragma mark - getter #pragma mark - getter
- (FUSEmptyView *)emptyView{ - (FUSEmptyView *)emptyView{
if (!_emptyView) { if (!_emptyView) {
_emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(self.width, 0, self.width, _onlineTableView.height)]; _emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(self.width, 0, self.width, _onlineTableView.height * 2.0 / 3.0)];
// _emptyView.contentVerticalOffset = -15;
_emptyView.backgroundColor = [UIColor clearColor]; _emptyView.backgroundColor = [UIColor clearColor];
} }
return _emptyView; return _emptyView;
...@@ -521,7 +522,8 @@ ...@@ -521,7 +522,8 @@
- (FUSEmptyView *)onliveEmptyView{ - (FUSEmptyView *)onliveEmptyView{
if (!_onliveEmptyView) { if (!_onliveEmptyView) {
_onliveEmptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, self.width, _onlineTableView.height)]; _onliveEmptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, self.width, _onlineTableView.height * 2.0 / 3.0)];
_onliveEmptyView.contentVerticalOffset = -15;
_onliveEmptyView.backgroundColor = [UIColor clearColor]; _onliveEmptyView.backgroundColor = [UIColor clearColor];
} }
return _onliveEmptyView; return _onliveEmptyView;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m
...@@ -1195,6 +1195,11 @@ ...@@ -1195,6 +1195,11 @@
if (![self.linkMicAgoraHelper fus_inChannel]) { //确保已加入频道 if (![self.linkMicAgoraHelper fus_inChannel]) { //确保已加入频道
[self fus_joinChannelSuccess:^{ [self fus_joinChannelSuccess:^{
[weakSelf.linkMicAgoraHelper fus_switchRole:AgoraClientRoleBroadcaster]; [weakSelf.linkMicAgoraHelper fus_switchRole:AgoraClientRoleBroadcaster];
if (!weakSelf.selfCloseMic) {
// 这里如果不先关掉再打开，他声网就会有问题，你说他辣鸡不辣鸡
[weakSelf.linkMicAgoraHelper switchLocalMic:NO];
[weakSelf.linkMicAgoraHelper switchLocalMic:YES];
}
} failure:nil]; } failure:nil];
} }
...@@ -1207,6 +1212,11 @@ ...@@ -1207,6 +1212,11 @@
}else{ }else{
[FUSDialogView fus_showDialog:[NSString fus_localString:@"连麦成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"连麦成功"]];
} }
if (!weakSelf.selfCloseMic) {
// 这里如果不先关掉再打开，他声网就会有问题，你说他辣鸡不辣鸡
[weakSelf.linkMicAgoraHelper switchLocalMic:NO];
[weakSelf.linkMicAgoraHelper switchLocalMic:YES];
}
} failure:^(NSString * _Nonnull msg, int code) { } failure:^(NSString * _Nonnull msg, int code) {
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKMainView/FUSPKMainView.m
...@@ -1155,15 +1155,15 @@ NSInteger const kPKMainViewAdditionHeight = 51; ...@@ -1155,15 +1155,15 @@ NSInteger const kPKMainViewAdditionHeight = 51;
_onceAgainBtn.centerX = self.width / 2; _onceAgainBtn.centerX = self.width / 2;
_onceAgainBtn.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; _onceAgainBtn.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
[_onceAgainBtn addTarget:self action:@selector(clickOnceAgainBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [_onceAgainBtn addTarget:self action:@selector(clickOnceAgainBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_onceAgainBtn.titleLabel.font = [UIFont fus_themeMediumFont:10]; _onceAgainBtn.titleLabel.font = [UIFont fus_themeMediumFont:14];
[_onceAgainBtn setTitle:[NSString fus_localString:@"再来一次"] forState:UIControlStateNormal]; [_onceAgainBtn setTitle:[NSString fus_localString:@"再来一次"] forState:UIControlStateNormal];
[_onceAgainBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [_onceAgainBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_onceAgainBtn sizeToFit]; [_onceAgainBtn sizeToFit];
_onceAgainBtn.height = 21; _onceAgainBtn.height = 26;
_onceAgainBtn.layer.cornerRadius = 10.5; _onceAgainBtn.layer.cornerRadius = 10.5;
_onceAgainBtn.layer.masksToBounds = YES; _onceAgainBtn.layer.masksToBounds = YES;
if (_onceAgainBtn.width > 61) { if (_onceAgainBtn.width > 61) {
_onceAgainBtn.width = _onceAgainBtn.width + 20; _onceAgainBtn.width = _onceAgainBtn.width + 30;
}else{ }else{
_onceAgainBtn.width = 61; _onceAgainBtn.width = 61;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment