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迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj

FuSiLive.xcworkspace/xcuserdata/server.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,18 @@
    uuid = "B049FF9C-951B-453D-AC4A-81CEFF8490BE"
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "D798D2B1-6DBF-4849-80D6-BA0F31D198E1"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj

@@ -763,6 +763,8 @@
 		3E261EA82F2C5FAB0008C0C0 /* FUSLinkMicMediator.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E261EA62F2C5FAB0008C0C0 /* FUSLinkMicMediator.m */; };
 		3E261EB02F2CA6890008C0C0 /* FUSLinkMicStreamConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E261EAE2F2CA6890008C0C0 /* FUSLinkMicStreamConfig.h */; };
 		3E261EB12F2CA6890008C0C0 /* FUSLinkMicStreamConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E261EAF2F2CA6890008C0C0 /* FUSLinkMicStreamConfig.m */; };
+		3E4DC89A2F580A46003070EC /* live_link_mic_boy_speak_anim.webp in Resources */ = {isa = PBXBuildFile; fileRef = 3E4DC8982F580A46003070EC /* live_link_mic_boy_speak_anim.webp */; };
+		3E4DC89B2F580A46003070EC /* live_link_mic_girl_speak_anim.webp in Resources */ = {isa = PBXBuildFile; fileRef = 3E4DC8992F580A46003070EC /* live_link_mic_girl_speak_anim.webp */; };
 		3E50054E2F556DC300058145 /* FUSLiveRTCData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E50054D2F556DC300058145 /* FUSLiveRTCData.swift */; };
 		BE189D972C733B450008418B /* FSRActiveModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BE189CE52C733B450008418B /* FSRActiveModel.h */; };
 		BE189D982C733B450008418B /* FSRActiveModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE189CE62C733B450008418B /* FSRActiveModel.m */; };
@@ -2784,6 +2786,8 @@
 		3E261EA62F2C5FAB0008C0C0 /* FUSLinkMicMediator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLinkMicMediator.m; sourceTree = "<group>"; };
 		3E261EAE2F2CA6890008C0C0 /* FUSLinkMicStreamConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLinkMicStreamConfig.h; sourceTree = "<group>"; };
 		3E261EAF2F2CA6890008C0C0 /* FUSLinkMicStreamConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLinkMicStreamConfig.m; sourceTree = "<group>"; };
+		3E4DC8982F580A46003070EC /* live_link_mic_boy_speak_anim.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_link_mic_boy_speak_anim.webp; sourceTree = "<group>"; };
+		3E4DC8992F580A46003070EC /* live_link_mic_girl_speak_anim.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_link_mic_girl_speak_anim.webp; sourceTree = "<group>"; };
 		3E50054D2F556DC300058145 /* FUSLiveRTCData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRTCData.swift; sourceTree = "<group>"; };
 		842ED23FEE639B8A5B65A322 /* Pods-FUSShowRoomModule.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSShowRoomModule.debug.xcconfig"; path = "Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule.debug.xcconfig"; sourceTree = "<group>"; };
 		97F831FBE9C41BC899CF9232 /* Pods-FUSShowRoomModule.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSShowRoomModule.release.xcconfig"; path = "Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule.release.xcconfig"; sourceTree = "<group>"; };
@@ -7448,6 +7452,8 @@
 				00E6CE1B2F56E36500B63797 /* live_pk_host_win_draw_reward_type2_anim.webp */,
 				00CD220A2F580A2200A07432 /* live_pk_progress_light_anim.webp */,
 				00CD220C2F580A9000A07432 /* live_pk_progress_light_anim_gift_bomb.webp */,
+				3E4DC8982F580A46003070EC /* live_link_mic_boy_speak_anim.webp */,
+				3E4DC8992F580A46003070EC /* live_link_mic_girl_speak_anim.webp */,
 				BEF675EC2C6B156500A670FB /* live_linkmic_bgImg.png */,
 				BEF675ED2C6B156500A670FB /* live_pk_background_image.png */,
 				00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */,
@@ -8014,6 +8020,8 @@
 				BED65B742C5CE68700668116 /* FUSFilterItemCell.xib in Resources */,
 				BED65B8D2C5CE6EA00668116 /* FUSLiveTreasureBoxGrabView.xib in Resources */,
 				BEF6777B2C6B156600A670FB /* PK_Win_Animation_46@2x.png in Resources */,
+				3E4DC89A2F580A46003070EC /* live_link_mic_boy_speak_anim.webp in Resources */,
+				3E4DC89B2F580A46003070EC /* live_link_mic_girl_speak_anim.webp in Resources */,
 				BEF6779D2C6B156600A670FB /* pk_win_streak_2@3x.png in Resources */,
 				BEF677932C6B156600A670FB /* PK_Win_Animation_70@2x.png in Resources */,
 				BEF677372C6B156600A670FB /* PK_Start_Animation_4@2x.png in Resources */,

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

@@ -2175,7 +2175,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
     return _streamView.playView;
 }
 
-- (FUSStreamPlayView *)ff_playViewForMainUid:(NSString *)mainUid {
+- (FUSStreamPlayView *)fus_playViewForMainUid:(NSString *)mainUid {
     if ([self.playView.mainUID isEqual:mainUid]) {
         return self.playView;
     }
@@ -2351,7 +2351,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
     [self performSelector:@selector(setupPictureInPicture) afterDelay:0.3];
 }
 - (void)setupPictureInPicture {
-    return;
+    
     if (self.autoStartPictureInPicture == NO) {
         return;
     }
@@ -2370,6 +2370,32 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
             self.pipController.videoGravity = AVLayerVideoGravityResizeAspectFill;
             self.pipController.delegate = self;
             [self.pipController prepareWithCompletion:nil];
+            
+            CGRect rect = FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState == FFPKStateNone ? CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW * 16 / 9) : CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW * 16 / 18);
+            [self setPictureInPictureVideoFrame:rect];
+            
+            __weak typeof(self) weakSelf = self;
+            self.playView.playTypeDidChangedHandler = ^(FUSStreamPlayViewPlayType type) {
+                switch (type) {
+                   case FUSStreamPlayViewPlayTypeNewPK:
+                    {
+                        CGRect rect = CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW * 16 / 18);
+                        [weakSelf setPictureInPictureVideoFrame:rect];
+                        
+                        break;
+                    }
+                    case FUSStreamPlayViewPlayTypePK:
+                    case FUSStreamPlayViewPlayTypeNormal:
+                    case FUSStreamPlayViewPlayTypeLinkMic:
+                        [weakSelf setPictureInPictureVideoFrame:weakSelf.view.bounds];
+                        break;
+                        
+                    default:
+                        break;
+                }
+            };
+            
+            
         }
         self.pipController.contentView = self.playView;
     }

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

@@ -192,6 +192,7 @@ typedef void (^VELPipPrepareCompletionBlock)(VELPictureInPictureController * pip
 
 //  当前是否已经有画中画在播放
 + (BOOL)isPictureInPictureStarted;
+
 @end
 
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Model/FUSLinkMicroModel.h

@@ -25,6 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
 // 直播等级
 @property (nonatomic, copy) NSString *lev;
 
+// 性别
+@property (nonatomic, copy) NSString *sex;
+
 /// 用户贡献萤火
 @property (nonatomic, copy) NSString *userOffer;
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSByteHelper.m

@@ -224,7 +224,7 @@ static NSString *const kByteRTCMediaStreamTypeBoth = @"kByteRTCMediaStreamTypeBo
         return;
     }
   
-    if ([FUSLiveHelper shareInstance].roomInfoModel.roomId.integerValue) {
+    if ([FUSLiveHelper shareInstance].roomInfoModel.roomId.integerValue != channelId.integerValue) {
         FUSLogDebug(@"pp===中断加入频道 %@", channelId);
         FUSLogDebug(@"pp===当前channelid %@", [FUSLiveHelper shareInstance].roomInfoModel.roomId);
         return;

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroHeaderView.h

@@ -21,16 +21,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nullable, nonatomic, strong) FUSLinkMicroModel *model;
 
-@property (nonatomic, strong) UIButton *coverBtn;
-
 @property (nonatomic, assign) BOOL cancelAnim;   //不需要动画
 
 @property (nonatomic, weak) id<FUSLinkMicroHeaderViewDelegate> delegate;
 
 @property (nonatomic, copy) void(^completeRadarAnimationBlock)(void);
 
-/// 加号的动画
-- (void)fus_changePlusBtnAnim:(BOOL)ifAnim;
 
 /// 改变静音动态
 /// @param mute 是否静音
@@ -45,16 +41,13 @@ NS_ASSUME_NONNULL_BEGIN
 /// 停止所有动画
 - (void)fus_stopAllAnimation;
 
-/// 加号动画
-- (void)fus_startPlusAnim;
 
 /// 开始送礼动画
 /// @param url 礼物url
 - (void)fus_startAnimWithImgUrl:(NSString *)url;
 
 - (void)fus_updateFrame;
-/// 取消红点
-//- (void)fus_refreshUnreadRedPoint;
+
 
 @end
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/MinimizeView/FUSLiveMinimizeView.h

@@ -11,6 +11,7 @@
 typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewType) {
     FUSLiveMinimizeViewTypeNormalLive,
     FUSLiveMinimizeViewTypePK,
+    FUSLiveMinimizeViewTypeBytePK,
     FUSLiveMinimizeViewTypeLinkMicRoom,
 };