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/FUSRouter/Routers/LiveRouter/FUSLivePublicDefine.h

@@ -260,6 +260,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 /// liveroom将要显示，用来通知一些地方需要刷新
 /// liveroom将要显示，用来通知一些地方需要刷新
 + (NSString *)fus_liveRoomViewWillAppear;
 + (NSString *)fus_liveRoomViewWillAppear;
+/// liveroom已经显示，用来通知一些地方需要刷新
++ (NSString *)fus_liveRoomViewDidAppear;
+
 
 
 
 
 @end
 @end

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSLivePublicDefine.m

@@ -425,6 +425,12 @@
     return @"fus_liveRoomViewWillAppear";
     return @"fus_liveRoomViewWillAppear";
 }
 }
 
 
+/// liveroom已经显示，用来通知一些地方需要刷新
++ (NSString *)fus_liveRoomViewDidAppear
+{
+    return @"fus_liveRoomViewDidAppear";
+}
+
 @end
 @end
 
 
 @implementation FUSLiveEventTrackParams
 @implementation FUSLiveEventTrackParams

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.h

@@ -50,18 +50,14 @@ typedef enum : NSUInteger {
  当前主播背景图片 ImageView
  当前主播背景图片 ImageView
  */
  */
 @property (nonatomic, strong) FUSBlurImageView *backgroundImageView;
 @property (nonatomic, strong) FUSBlurImageView *backgroundImageView;
-
+// 切换直播间滚动计数，如果 = 0。则可滚动，> 0则不可滚动
+@property (nonatomic, assign) NSInteger scrollEnableCount;
 /**
 /**
  初始化推流
  初始化推流
  */
  */
 - (void)initPushPrepareView;
 - (void)initPushPrepareView;
 
 
 /**
 /**
- 初始化视讯推流
- */
-//- (void)initPrivatePushPrepareView;
-
-/**
  设置是否可以上下滑动切换包房
  设置是否可以上下滑动切换包房
  */
  */
 - (void)fus_setupScrollEnable:(BOOL)enable;
 - (void)fus_setupScrollEnable:(BOOL)enable;
@@ -130,6 +126,11 @@ typedef enum : NSUInteger {
  */
  */
 - (void)fus_showLiveThemeView;
 - (void)fus_showLiveThemeView;
 
 
+/// 显示快捷发言的view
+- (void)fus_showQuickChatEditView;
+
+/// 显示关注问候view
+-(void)fus_showFollowSalutationView;
 /**
 /**
  弹出推流质量的View
  弹出推流质量的View
  */
  */
@@ -178,7 +179,7 @@ typedef enum : NSUInteger {
 - (NSString *)fus_getLiveBitrate;
 - (NSString *)fus_getLiveBitrate;
 
 
 - (void)fus_showPasswordBlurView;
 - (void)fus_showPasswordBlurView;
-
+//
 - (void)fus_hidePasswordBlurView;
 - (void)fus_hidePasswordBlurView;
 
 
 @end
 @end

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

@@ -21,7 +21,8 @@
 
 
 @class FUSLiveRTCData;
 @class FUSLiveRTCData;
 typedef enum : NSInteger {
 typedef enum : NSInteger {
-    defaultRoom = 0
+    defaultRoom = 0,
+    OBSRoom = 1
 } RoomType;
 } RoomType;
 
 
 typedef NS_ENUM(NSInteger, FUSLiveJoinType) {
 typedef NS_ENUM(NSInteger, FUSLiveJoinType) {

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSSwiftLiveHelper.swift

@@ -427,17 +427,17 @@ import RxSwift
     }
     }
     
     
     /// 镜像摄像头
     /// 镜像摄像头
-    @objc public static func ffliveMirrorCamera() {
+    @objc public static func fus_liveMirrorCamera() {
         FUSLiveHelper.fus_liveMirrorCamera()
         FUSLiveHelper.fus_liveMirrorCamera()
     }
     }
     
     
     /// 镜像摄像头
     /// 镜像摄像头
-    @objc public static func fflivePushSwitchMute() {
+    @objc public static func fus_livePushSwitchMute() {
         FUSLiveHelper.fus_livePushSwitchMute()
         FUSLiveHelper.fus_livePushSwitchMute()
     }
     }
     
     
     /// 获取当前静音状态
     /// 获取当前静音状态
-    @objc public static func fflivePushMuteState() -> Bool {
+    @objc public static func fus_livePushMuteState() -> Bool {
         FUSLiveHelper.fus_livePushMuteState()
         FUSLiveHelper.fus_livePushMuteState()
     }
     }
     
     

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalView.m

@@ -78,7 +78,8 @@
         NSString *muteImgStr = isMute ?  @"live_setting_open_mic" :  @"live_setting_close_mic";
         NSString *muteImgStr = isMute ?  @"live_setting_open_mic" :  @"live_setting_close_mic";
         [self showOptionalViewWithTitleArray:@[muteStr]
         [self showOptionalViewWithTitleArray:@[muteStr]
                                   withImages:@[muteImgStr]
                                   withImages:@[muteImgStr]
-                                   withTypes:@[@(FUSLiveCameraMic)]];
+                                   withTypes:@[@(FUSLiveCameraMic)]
+                                   clickItem:click];
         return;
         return;
     }else if (type == FUSShowAllSetting) {
     }else if (type == FUSShowAllSetting) {
         [self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"美颜设置"],
         [self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"美颜设置"],
@@ -101,14 +102,16 @@
                                                @(FUSFaceBeautychangeCamera),
                                                @(FUSFaceBeautychangeCamera),
                                                @(FUSFaceBeautyTurnOnLight),
                                                @(FUSFaceBeautyTurnOnLight),
                                                @(FUSLiveCameraMirror),
                                                @(FUSLiveCameraMirror),
-                                               @(FUSLiveSetTheme)]];
+                                               @(FUSLiveSetTheme)]
+                                   clickItem:click];
         
         
     }else if(type == FUSShowFlashLineAndCamera){
     }else if(type == FUSShowFlashLineAndCamera){
         [self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"闪光关闭"],[NSString fus_localString:@"反转镜头"]]
         [self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"闪光关闭"],[NSString fus_localString:@"反转镜头"]]
-                                    withImages:@[@"live_icon_turnOnLine",@"live_icon_changeCamera"]
+                                  withImages:@[@"live_icon_turnOnLine",@"live_icon_changeCamera"]
                                    withTypes:@[
                                    withTypes:@[
                                                @(FUSFaceBeautyTurnOnLight),
                                                @(FUSFaceBeautyTurnOnLight),
-                                               @(FUSFaceBeautychangeCamera)] clickItem:click];
+                                               @(FUSFaceBeautychangeCamera)]
+                                   clickItem:click];
     }
     }
     
     
     [view addSubview:self];
     [view addSubview:self];