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/Features/NewLive/Main/Controller/FUSLiveMainViewController.m

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

@@ -2371,6 +2371,8 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
             self.pipController.delegate = self;
             self.pipController.delegate = self;
             [self.pipController prepareWithCompletion:nil];
             [self.pipController prepareWithCompletion:nil];
             
             
+            FUSLogInfo(@"FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState = %@", FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.oc_localAnchorModel.uid);
+            
             CGRect rect = FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState == FUSPKStateNone ? CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW * 16 / 9) : CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW * 16 / 18);
             CGRect rect = FUSSwiftLiveHelper.shared.pkHelper.ocViewModel.currentPKState == FUSPKStateNone ? 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];
             [self setPictureInPictureVideoFrame:rect];
             
             

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

@@ -1061,7 +1061,7 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
 
 
             FUSLiveMinimizeViewType type =FUSLiveMinimizeViewTypeNormalLive;
             FUSLiveMinimizeViewType type =FUSLiveMinimizeViewTypeNormalLive;
             if (FUSLiveHelper.shareInstance.liveRoomType == FUSRoomTypePK) {
             if (FUSLiveHelper.shareInstance.liveRoomType == FUSRoomTypePK) {
-                type = FUSLiveMinimizeViewTypePK;
+                type = FUSLiveHelper.shareInstance.rtcType.integerValue == 1 ? FUSLiveMinimizeViewTypePK : FUSLiveMinimizeViewTypeBytePK;
             } else if (FUSLiveHelper.shareInstance.liveRoomType == FUSRoomTypeLinkMic) {
             } else if (FUSLiveHelper.shareInstance.liveRoomType == FUSRoomTypeLinkMic) {
                 type = FUSLiveMinimizeViewTypeLinkMicRoom;
                 type = FUSLiveMinimizeViewTypeLinkMicRoom;
             }
             }
@@ -1078,6 +1078,11 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
                         [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypePK;
                         [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypePK;
                         break;
                         break;
                     }
                     }
+                    case FUSStreamPlayViewPlayTypeNewPK:
+                    {
+                        [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypeBytePK;
+                        break;
+                    }
                     case FUSStreamPlayViewPlayTypeNormal:
                     case FUSStreamPlayViewPlayTypeNormal:
                     case FUSStreamPlayViewPlayTypeLinkMic:
                     case FUSStreamPlayViewPlayTypeLinkMic:
                         [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypeNormalLive;
                         [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypeNormalLive;
@@ -1837,6 +1842,31 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
 
 
 #pragma mark - setter
 #pragma mark - setter
 
 
+  - (void)setLiveType:(FUSLiveType)liveType
+{
+    _liveType = liveType;
+}
+
+- (void)setLiveRoomType:(FUSLiveRoomType)liveRoomType
+{
+    _liveRoomType = liveRoomType;
+    switch (liveRoomType) {
+        case FUSRoomTypePK:
+        {
+            
+            [FUSLiveHelper shareInstance].liveMinimizeView.type = [FUSLiveHelper shareInstance].rtcType.integerValue == 1 ?  FUSLiveMinimizeViewTypePK : FUSLiveMinimizeViewTypeBytePK;
+            break;
+        }
+        case FUSRoomTypeLinkMic:
+            [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypeLinkMicRoom;
+            break;
+        default:
+            [FUSLiveHelper shareInstance].liveMinimizeView.type = FUSLiveMinimizeViewTypeNormalLive;
+            break;
+    }
+}
+
+
 - (void)setRoomScopeType:(FUSLiveRoomScopeType)roomScopeType {
 - (void)setRoomScopeType:(FUSLiveRoomScopeType)roomScopeType {
     if (_roomScopeType == roomScopeType) {
     if (_roomScopeType == roomScopeType) {
         return;
         return;