@volcengine/react-native-live-pull 1.3.0-rc.5 → 1.3.2-rc.0

package/android/build.gradle

@@ -42,7 +42,7 @@ if (volcApiEnvVersion) {
 } else if (rootProject.hasProperty('VOLC_API_ENGINE_VERSION_FOR_LIVE_PULL')) {
   volc_api_engine_version = rootProject.property('VOLC_API_ENGINE_VERSION_FOR_LIVE_PULL')
 } else {
-  volc_api_engine_version = "1.6.4"  // Default version
+  volc_api_engine_version = "1.6.6"  // Default version
 }
 
 println "[LIVE PULL GRADLE INFO]: Using ttsdk_ttlivepull_rtc version: $ttsdk_ttlivepull_rtc_version"

package/android/src/main/java/com/volcengine/velive/rn/pull/pictureInpicture/FloatingWindowHelper.java

@@ -149,7 +149,7 @@ public class FloatingWindowHelper implements IFloatingWindowHelper {
     }
   }
 
-  void performClose(Context context) {
+  void onClickFloatingWindowCloseBtn(Context context) {
     if (mListener != null) {
       mListener.onClickFloatingWindowCloseBtn(context);
     }

package/android/src/main/java/com/volcengine/velive/rn/pull/pictureInpicture/FloatingWindowService.java

@@ -172,6 +172,8 @@ public class FloatingWindowService extends Service {
         mSurfaceView = mSmallWindowView.findViewById(R.id.surface_view);
         mSmallWindowView.findViewById(R.id.surface_close_btn)
             .setOnClickListener(v -> {
+              // 触发关闭按钮点击回调
+              FloatingWindowHelper.getInstance().onClickFloatingWindowCloseBtn(FloatingWindowService.this);
               unregisterActivityLaunchReceiver();
               stopSelf();
             });

package/android/src/main/java/com/volcengine/velive/rn/pull/pictureInpicture/PictureInPictureManager.java

@@ -193,6 +193,9 @@ public class PictureInPictureManager {
           public void onClickFloatingWindowCloseBtn(Context context) {
             Log.d(TAG, "PIP close button clicked");
             mFloatingWindowHelper.closeFloatingWindow(context);
+            if (mPlayer != null) {
+              mPlayer.pause();
+            }
           }
 
           @Override

package/ios/pictureInpicture/PictureInPictureManager.m

@@ -24,6 +24,8 @@
 @property(nonatomic, strong)
     NSMutableDictionary<NSString *, void (^)(AVPictureInPictureController *)>
         *pipObservers;
+// Add timer to refresh playback state
+@property(nonatomic, strong) NSTimer *playbackStateTimer;
 @end
 
 NSString *const kObserverKey = @"pip-observer";
@@ -56,6 +58,7 @@ NSString *const kObserverKey = @"pip-observer";
 
 - (void)dealloc {
   [self disableVideoFrameObserver];
+  [self stopPlaybackStateTimer];
 
   if (self.pipController) {
     self.pipController.delegate = nil;
@@ -65,6 +68,45 @@ NSString *const kObserverKey = @"pip-observer";
   [[VeLivePlayerMultiObserver sharedInstance] removeObserver:kObserverKey];
 }
 
+// Start playback state refresh timer
+- (void)startPlaybackStateTimer {
+  [self stopPlaybackStateTimer];
+
+  if (self.pipController && [self.pipController pictureInPictureController]) {
+    // Use main thread timer to ensure UI updates on main thread
+    self.playbackStateTimer = [NSTimer
+        scheduledTimerWithTimeInterval:1.0
+                                target:self
+                              selector:@selector(invalidatePlaybackState)
+                              userInfo:nil
+                               repeats:YES];
+    // Add timer to main run loop
+    [[NSRunLoop mainRunLoop] addTimer:self.playbackStateTimer
+                              forMode:NSRunLoopCommonModes];
+    NSLog(@"PIP: Started playback state timer");
+  }
+}
+
+// Stop playback state refresh timer
+- (void)stopPlaybackStateTimer {
+  if (self.playbackStateTimer) {
+    [self.playbackStateTimer invalidate];
+    self.playbackStateTimer = nil;
+    NSLog(@"PIP: Stopped playback state timer");
+  }
+}
+
+// Timer callback: refresh playback state
+- (void)invalidatePlaybackState {
+  if (self.pipController && [self.pipController pictureInPictureController]) {
+    AVPictureInPictureController *controller =
+        [self.pipController pictureInPictureController];
+    if (controller.isPictureInPictureActive) {
+      [controller invalidatePlaybackState];
+    }
+  }
+}
+
 - (void)setupPlayer:(TVLManager *)player {
   [self ensurePipControllerReady:player completion:nil];
 }
@@ -159,9 +201,10 @@ NSString *const kObserverKey = @"pip-observer";
 
 - (void)updatePipController:(nullable void (^)(void))completion {
   VeLivePlayerVideoStreamInfo *info = [self.player getVideoStreamInfo];
-  
+
   if (!CGSizeEqualToSize(CGSizeZero, CGSizeMake(info.width, info.height))) {
-    [self.pipController setVideoSize:CGSizeMake(info.width, info.height) completion:nil];    
+    [self.pipController setVideoSize:CGSizeMake(info.width, info.height)
+                          completion:nil];
   }
 
   [self.pipController setContentView:self.contentView
@@ -169,7 +212,7 @@ NSString *const kObserverKey = @"pip-observer";
                             if (completion) {
                               completion();
                             }
-                          }];  
+                          }];
 }
 
 // Notify all observers
@@ -305,11 +348,32 @@ NSString *const kObserverKey = @"pip-observer";
   _listener = listener;
 }
 
+#pragma mark - AVPictureInPictureSampleBufferPlaybackDelegate
+- (BOOL)pictureInPictureControllerIsPlaybackPaused:
+    (nonnull AVPictureInPictureController *)pictureInPictureController {
+  if (self.player) {
+    return ![[self.player valueForKey:@"isPlaying"] boolValue];
+  }
+  NSLog(@"PIP: No player, returning YES (paused)");
+  return YES;
+}
+
+- (void)pictureInPictureController:
+            (AVPictureInPictureController *)pictureInPictureController
+                        setPlaying:(BOOL)playing {
+  if (playing) {
+    [self.player play];
+  } else {
+    [self.player pause];
+  }
+}
+
 // MARK: - VeLiveVideoFrameListener
 - (void)onRenderVideoFrame:(TVLManager *_Nonnull)player
                 videoFrame:(VeLivePlayerVideoFrame *_Nonnull)videoFrame {
   @autoreleasepool {
-    // 确保 pipController 存在且有效，避免在销毁过程中继续处理 buffer
+    // Ensure pipController exists and is valid, avoid processing buffer during
+    // destruction
     if (!self.pipController || !self.enableVideoObserver) {
       return;
     }
@@ -335,6 +399,16 @@ NSString *const kObserverKey = @"pip-observer";
   NSLog(@"VeLiveQuickStartDemo: Error %ld, %@", error.code, error.errorMsg);
 }
 
+// MARK: - VeLivePlayerObserver
+- (void)onPlayerStatusUpdate:(TVLManager *)player status:(NSInteger)status {
+  // Refresh picture-in-picture playback state when player status changes
+  if (self.pipController && [self.pipController pictureInPictureController]) {
+    [[self.pipController pictureInPictureController] invalidatePlaybackState];
+  }
+  NSLog(@"PIP: Player status updated to %ld, invalidated playback state",
+        (long)status);
+}
+
 /// MARK: - VePictureInPictureDelegate
 - (void)pictureInPictureController:
             (VePictureInPictureController *)pictureInPictureController
@@ -357,6 +431,8 @@ NSString *const kObserverKey = @"pip-observer";
     if (self.listener) {
       [self.listener onStartPictureInPicture];
     }
+    // Start timer to refresh playback state
+    [self startPlaybackStateTimer];
     break;
   case VePictureInPictureStatusWillChange: {
 
@@ -374,6 +450,8 @@ NSString *const kObserverKey = @"pip-observer";
     if (self.listener) {
       [self.listener onStopPictureInPicture];
     }
+    // Stop timer
+    [self stopPlaybackStateTimer];
     if (@available(iOS 14.2, *)) {
       if (!self.canStartPictureInPictureAutomaticallyFromInline) {
         [self destroyPictureInPicture];
@@ -385,6 +463,8 @@ NSString *const kObserverKey = @"pip-observer";
       [self.listener onError:pictureInPictureController.error.code
                    extraData:pictureInPictureController.error.userInfo];
     }
+    // Stop timer
+    [self stopPlaybackStateTimer];
   } break;
   }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcengine/react-native-live-pull",
-  "version": "1.3.0-rc.5",
+  "version": "1.3.2-rc.0",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
@@ -30,5 +30,15 @@
   "homepage": "https://www.volcengine.com",
   "devDependencies": {
     "zx": "^8.1.1"
+  },
+  "nativeVersion": {
+    "volc": {
+      "android": "1.47.3.6",
+      "ios": "1.46.3.10-premium"
+    },
+    "byteplus": {
+      "android": "1.47.300.2",
+      "ios": "1.46.300.7-premium"
+    }
   }
 }

package/react-native-velive-pull.podspec

@@ -50,12 +50,19 @@ Pod::Spec.new do |s|
   end
 
   # Version configuration through environment variables
-  volc_api_engine_version = ENV['VOLC_API_ENGINE_VERSION_FOR_LIVE_PULL'] || '1.6.4'
+  volc_api_engine_version = ENV['VOLC_API_ENGINE_VERSION_FOR_LIVE_PULL'] || '1.6.5'
   ttsdk_framework_version = ENV['TTSDK_FRAMEWORK_VERSION_FOR_LIVE_PULL'] || (is_bp ? package['nativeVersion']['byteplus']['ios'] : package['nativeVersion']['volc']['ios'])
+  
+  use_rtc = ENV['USE_RTC_FOR_LIVE_PULL'] || 'true'
 
   s.dependency 'VolcApiEngine', volc_api_engine_version
   s.dependency 'TTSDKFramework/Core', ttsdk_framework_version
-  s.dependency 'TTSDKFramework/LivePull-RTS', ttsdk_framework_version
+
+  if use_rtc == 'true'
+    s.dependency 'TTSDKFramework/LivePull-RTS', ttsdk_framework_version
+  else
+    s.dependency 'TTSDKFramework/LivePull', ttsdk_framework_version
+  end
   
-  puts("[LIVE PULL POD INSTALL INFO]: volc_api_engine_version: #{volc_api_engine_version} / ttsdk_framework_version: #{ttsdk_framework_version}")
-end
+  puts("[LIVE PULL POD INSTALL INFO]: volc_api_engine_version: #{volc_api_engine_version} / ttsdk_framework_version: #{ttsdk_framework_version} / use_rtc: #{use_rtc}")
+end