Commit 3c6c0868 by suolong

修改pkview的高度问题

parent 5da5b6d9
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
+ (CGFloat)fus_StatusBarHeight { + (CGFloat)fus_StatusBarHeight {
CGFloat statusBarHeight = [UIApplication sharedApplication].statusBarFrame.size.height; CGFloat statusBarHeight = [UIApplication sharedApplication].statusBarFrame.size.height;
return statusBarHeight < 20 ? 20 : statusBarHeight; return statusBarHeight < 20 ? (UIView.fus_SafeTop < 20 ? 20 : UIView.fus_SafeTop) : statusBarHeight;
} }
+ (CGFloat)fus_NavgationBarHeight { + (CGFloat)fus_NavgationBarHeight {
return 44; return 44;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/// pk试图的Y坐标 /// pk试图的Y坐标
+ (CGFloat)fus_pkViewYPosition { + (CGFloat)fus_pkViewYPosition {
return (UIView.fus_StatusBarHeight + 48); return (UIView.fus_StatusBarAndNavgationBarHeight + 48);
} }
/// pk主播试图高度 /// pk主播试图高度
......
...@@ -937,15 +937,18 @@ static NSString *const kBytePushSingleStreamToCDNKey = @"kBytePushSingleStreamTo ...@@ -937,15 +937,18 @@ static NSString *const kBytePushSingleStreamToCDNKey = @"kBytePushSingleStreamTo
- (void)startMixerPush { - (void)startMixerPush {
if (!self.rtcVideo || !self.mixConfig || !self.pushCDN) return; if (!self.rtcVideo || !self.mixConfig || !self.pushCDN) return;
// 新版核心 API:一键配置并启动合流转推(替代旧版 startPushMixedStreamToCDN) // 新版核心 API:一键配置并启动合流转推(替代旧版 startPushMixedStreamToCDN)
dispatch_async(dispatch_get_main_queue(), ^{
[self.rtcVideo updatePushMixedStreamToCDN:kBytePushMixedStreamToCDNKey mixedConfig:self.mixConfig]; [self.rtcVideo updatePushMixedStreamToCDN:kBytePushMixedStreamToCDNKey mixedConfig:self.mixConfig];
});
} }
// 开启合流转推(入房成功回调中调用,新版 API 简化为 configMixedStreamPush) // 开启合流转推(入房成功回调中调用,新版 API 简化为 configMixedStreamPush)
- (void)startMixerSinglePush { - (void)startMixerSinglePush {
if (!self.rtcVideo || !self.singleConfig || !self.pushCDN) return; if (!self.rtcVideo || !self.singleConfig || !self.pushCDN) return;
// 新版核心 API:一键配置并启动合流转推(替代旧版 startPushMixedStreamToCDN) // 新版核心 API:一键配置并启动合流转推(替代旧版 startPushMixedStreamToCDN)
dispatch_async(dispatch_get_main_queue(), ^{
[self.rtcVideo updatePushMixedStreamToCDN:kBytePushSingleStreamToCDNKey mixedConfig:self.singleConfig]; [self.rtcVideo updatePushMixedStreamToCDN:kBytePushSingleStreamToCDNKey mixedConfig:self.singleConfig];
});
} }
// 盘路推流单独推自己的流 // 盘路推流单独推自己的流
......
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