Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive…

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDelegate.h

@@ -115,6 +115,10 @@
 #define ROOM_CID_LIVE_ALERT                   10090     // 接收到直播弹窗通知
 #define ROOM_CID_LIVE_ALERT                   10090     // 接收到直播弹窗通知
 #define ROOM_CID_WEBVIEW_PUSH                 10092     // 推送webview弹窗
 #define ROOM_CID_WEBVIEW_PUSH                 10092     // 推送webview弹窗
 
 
+// 主播打开关闭麦克风socket
+#define ROOM_CID_anchorDidCloseBeauty         20200
+// 主播打开关闭麦克风socket
+#define ROOM_CID_anchorDidCloseMic            20201
 // 更新本场直播主题内容socket
 // 更新本场直播主题内容socket
 #define ROOM_CID_LiveThemeDidChanged          20202
 #define ROOM_CID_LiveThemeDidChanged          20202
 
 
@@ -126,5 +130,3 @@
 
 
 
 
 
 
-
-

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIView/UIView+Screen.m

@@ -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;

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/LiveStreamView/FUSStreamKitConfig.m

@@ -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主播试图高度

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/LiveStreamView/Push/Capture/ByteRTC/FUSByteRTCPKStreamCaptureHelper.m

@@ -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）
-
-    [self.rtcVideo updatePushMixedStreamToCDN:kBytePushMixedStreamToCDNKey mixedConfig:self.mixConfig];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [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）
-    [self.rtcVideo updatePushMixedStreamToCDN:kBytePushSingleStreamToCDNKey mixedConfig:self.singleConfig];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.rtcVideo updatePushMixedStreamToCDN:kBytePushSingleStreamToCDNKey mixedConfig:self.singleConfig];
+    });
 }
 }
 
 
 // 盘路推流单独推自己的流
 // 盘路推流单独推自己的流

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m

@@ -1035,6 +1035,7 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
     } else {
     } else {
         FUSResourceDownloader.shareInstance.bitrateLimit = FUSResourceDownloaderBitrateLimitedNoLimit;
         FUSResourceDownloader.shareInstance.bitrateLimit = FUSResourceDownloaderBitrateLimitedNoLimit;
     }
     }
+    [FUSSocketMessageCenter fus_setSocketHeartbeatInterval:30000];
 }
 }
 
 
 /**
 /**

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.h

@@ -353,6 +353,8 @@ typedef NS_ENUM(NSInteger, FUSFunctionMode) {
 
 
 /// 清除所有半屏弹窗
 /// 清除所有半屏弹窗
 -(void)fus_clearHalfWebView;
 -(void)fus_clearHalfWebView;
+/// 通知functionview推流成功（也就是主播开播成功），用于引导，改变一些状态
+- (void)fus_LivePushSuccess;
 
 
 -(void)fus_reloadAllUserFromRequest;
 -(void)fus_reloadAllUserFromRequest;
 
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m

@@ -1620,6 +1620,8 @@ BDAlphaPlayerMetalViewDelegate
  */
  */
 - (void)fus_initVolumnView
 - (void)fus_initVolumnView
 {
 {
+    // 移除自定义音量条和系统音量提示隐藏逻辑，恢复系统默认音量提示
+    /*
     _volumnBGView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_screenH - UIView.fus_SafeBottom - 1.5, UIView.fus_screenW, 1.5)];
     _volumnBGView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_screenH - UIView.fus_SafeBottom - 1.5, UIView.fus_screenW, 1.5)];
     _volumnBGView.backgroundColor = [UIColor colorWithHex:@"C7C7CC" alpha:0.8];
     _volumnBGView.backgroundColor = [UIColor colorWithHex:@"C7C7CC" alpha:0.8];
     [self addSubview:_volumnBGView];
     [self addSubview:_volumnBGView];
@@ -1632,7 +1634,7 @@ BDAlphaPlayerMetalViewDelegate
     _volumnBGView.alpha = 0;
     _volumnBGView.alpha = 0;
     MPVolumeView *systemVolumnView = [[MPVolumeView alloc] initWithFrame:CGRectMake(0, -2000, 0, 0)];
     MPVolumeView *systemVolumnView = [[MPVolumeView alloc] initWithFrame:CGRectMake(0, -2000, 0, 0)];
     [self addSubview:systemVolumnView];
     [self addSubview:systemVolumnView];
-    
+     */
 }
 }
 
 
 -(void)fus_reloadRealtimeActivityWebView{
 -(void)fus_reloadRealtimeActivityWebView{
@@ -5448,7 +5450,11 @@ BDAlphaPlayerMetalViewDelegate
     _enterRoomInterval += 1;
     _enterRoomInterval += 1;
 }
 }
 
 
-
+/// 通知functionview推流成功（也就是主播开播成功），用于引导，改变一些状态
+- (void)fus_LivePushSuccess
+{
+    
+}
 
 
 /**
 /**
  送礼提示展示逻辑
  送礼提示展示逻辑

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicItemView.m

@@ -104,10 +104,12 @@
     
     
     [self addSubview:_itemCollectionView];
     [self addSubview:_itemCollectionView];
     
     
-    _normalImageDict = @{[NSString stringWithFormat:@"%ld",FUSItemViewOpenMic]:@"live_link_mic_voice_close",
+    _normalImageDict = @{[NSString stringWithFormat:@"%ld",FUSItemViewCloseMic]:@"live_link_mic_voice_close",
                          [NSString stringWithFormat:@"%ld",FUSItemViewHomeMic]:@"live_link_mic_voice_home",
                          [NSString stringWithFormat:@"%ld",FUSItemViewHomeMic]:@"live_link_mic_voice_home",
                          [NSString stringWithFormat:@"%ld",FUSItemViewDeleteMic]:@"live_link_mic_voice_delete",
                          [NSString stringWithFormat:@"%ld",FUSItemViewDeleteMic]:@"live_link_mic_voice_delete",
-                         [NSString stringWithFormat:@"%ld",FUSItemViewSendGift]:@"live_gift_view_icon_hl"};
+                         [NSString stringWithFormat:@"%ld",FUSItemViewSendGift]:@"live_gift_view_icon_hl",
+                         [NSString stringWithFormat:@"%ld",FUSItemViewOpenMic]:@"live_link_mic_voice_open",
+    };
     
     
 //    _hightlightedImageDict = @{[NSString stringWithFormat:@"%ld",FUSItemViewOpenMic]:@"live_link_mic_voice_close",
 //    _hightlightedImageDict = @{[NSString stringWithFormat:@"%ld",FUSItemViewOpenMic]:@"live_link_mic_voice_close",
 //                         [NSString stringWithFormat:@"%ld",FUSItemViewHomeMic]:@"live_link_mic_voice_home",
 //                         [NSString stringWithFormat:@"%ld",FUSItemViewHomeMic]:@"live_link_mic_voice_home",

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSLivePushPrepareView.h

@@ -13,6 +13,8 @@ typedef void(^PushSuccess)(void);
 @interface FUSLivePushPrepareView : UIView
 @interface FUSLivePushPrepareView : UIView
 
 
 @property (nonatomic, copy) PushSuccess pushSuccessBlock;
 @property (nonatomic, copy) PushSuccess pushSuccessBlock;
+// OBS 开播成功回调
+@property (nonatomic, copy) PushSuccess obsPushSuccessHandler;
 
 
 - (void)fus_checkDeviceAuths;
 - (void)fus_checkDeviceAuths;