Optimize the picture-in-picture function experience

LiteAVSDK · Jul 6, 2022 · 56df5f4 · 56df5f4
1 parent 8ee664d
commit 56df5f4
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/Demo/TXLiteAVDemo/SuperPlayerKit/SuperPlayer/SuperPlayerView.m b/Demo/TXLiteAVDemo/SuperPlayerKit/SuperPlayer/SuperPlayerView.m
@@ -1192,6 +1192,8 @@ - (void)appDidEnterPlayground:(NSNotification *)notify {
         self.controlView.isDragging = NO;
         [self.controlView setProgressTime:self.playCurrentTime totalTime:_vodPlayer.duration progressValue:value playableValue:playable];
         [_vodPlayer seek:self.playCurrentTime];
+    } else if (self.state != StateStopped) {
+        self.repeatBtn.hidden = YES;
     }
 }
 
@@ -2233,11 +2235,11 @@ - (void)onPlayer:(TXVodPlayer *)player pictureInPictureStateDidChange:(TX_VOD_PL
             [self.pipLoadingView stopAnimating];
             self->_hasStartPipLoading = NO;
         });
-
     }
 
     if (pipState == TX_VOD_PLAYER_PIP_STATE_RESTORE_UI) {
         _restoreUI = YES;
+        [player exitPictureInPicture];
     }
 
     if (pipState == TX_VOD_PLAYER_PIP_STATE_DID_STOP) {
@@ -2459,14 +2461,25 @@ - (TXVodPlayer *)vodPlayer {
 
 
 - (void)setPipLoadingWithText:(NSString *)text {
-    CGFloat width=[(NSString *)text boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, 21) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:DEFAULT_PIP_LOADING_FONT_SIZE]} context:nil].size.width;
-
-    _pipLoadingView = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake((ScreenWidth - (width + DEFAULT_PIP_LOADING_WIDTH_MARGIN)) / 2, (ScreenHeight/2) - DEFAULT_PIP_LOADING_HEIGHT, width + DEFAULT_PIP_LOADING_WIDTH_MARGIN, DEFAULT_PIP_LOADING_HEIGHT * 2)];
+    CGFloat width=[(NSString *)text boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, 21)
+                                                 options:NSStringDrawingUsesLineFragmentOrigin
+                                              attributes:@{NSFontAttributeName:
+                                                               [UIFont systemFontOfSize:DEFAULT_PIP_LOADING_FONT_SIZE]}
+                                                 context:nil].size.width;
+    CGFloat x = (ScreenWidth - (width + DEFAULT_PIP_LOADING_WIDTH_MARGIN)) / 2;
+    CGFloat y = (ScreenHeight/2) - DEFAULT_PIP_LOADING_HEIGHT;
+    CGFloat w = width + DEFAULT_PIP_LOADING_WIDTH_MARGIN;
+    CGFloat h = DEFAULT_PIP_LOADING_HEIGHT * 2;
+    _pipLoadingView = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(x,y,w,h)];
     _pipLoadingView.backgroundColor = [UIColor blackColor];
     _pipLoadingView.layer.cornerRadius = 10;
     _pipLoadingView.activityIndicatorViewStyle = UIActivityIndicatorViewStyleWhiteLarge;
 
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(DEFAULT_PIP_LOADING_LABEL_MARGIN, DEFAULT_PIP_LOADING_LABEL_MARGIN + DEFAULT_PIP_LOADING_HEIGHT, width, DEFAULT_PIP_LOADING_LABEL_HEIGHT)];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(
+                                                               DEFAULT_PIP_LOADING_LABEL_MARGIN,
+                                                               DEFAULT_PIP_LOADING_LABEL_MARGIN + DEFAULT_PIP_LOADING_HEIGHT,
+                                                               width,
+                                                               DEFAULT_PIP_LOADING_LABEL_HEIGHT)];
     label.text = text;
     label.font = [UIFont systemFontOfSize:DEFAULT_PIP_LOADING_FONT_SIZE];
     label.textAlignment = NSTextAlignmentCenter;