@byteplus/react-native-live-pull 1.3.0-rc.1 → 1.3.0-rc.10

package/android/build.gradle

@@ -13,6 +13,41 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+// Version configuration through environment variables or gradle properties
+def ttsdk_ttlivepull_rtc_version
+def envVersion = System.getenv('TTSDK_TTLIVEPULL_RTC_VERSION_FOR_LIVE_PULL')
+if (envVersion) {
+  ttsdk_ttlivepull_rtc_version = envVersion
+} else if (rootProject.hasProperty('TTSDK_TTLIVEPULL_RTC_VERSION_FOR_LIVE_PULL')) {
+  ttsdk_ttlivepull_rtc_version = rootProject.property('TTSDK_TTLIVEPULL_RTC_VERSION_FOR_LIVE_PULL')
+} else {
+  // Fallback to versions from package.json
+  def packageJson = file("../package.json")
+  def slurper = new groovy.json.JsonSlurper()
+  def parsedJson = slurper.parseText(packageJson.text)
+  def isBp = parsedJson.name.startsWith("@byteplus")
+  
+  if (isBp) {
+    ttsdk_ttlivepull_rtc_version = parsedJson.nativeVersion.byteplus.android
+  } else {
+    ttsdk_ttlivepull_rtc_version = parsedJson.nativeVersion.volc.android
+  }
+}
+
+// VolcApiEngine version configuration
+def volc_api_engine_version
+def volcApiEnvVersion = System.getenv('VOLC_API_ENGINE_VERSION_FOR_LIVE_PULL')
+if (volcApiEnvVersion) {
+  volc_api_engine_version = 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
+}
+
+println "[LIVE PULL GRADLE INFO]: Using ttsdk_ttlivepull_rtc version: $ttsdk_ttlivepull_rtc_version"
+println "[LIVE PULL GRADLE INFO]: Using volc_api_engine version: $volc_api_engine_version"
+
 apply plugin: "com.android.library"
 apply from: "https://ve-vos.volccdn.com/script/vevos-repo-base.gradle"
 
@@ -88,6 +123,6 @@ dependencies {
   // noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
 
-    implementation "com.volcengine:VolcApiEngine:1.6.2"
-    implementation 'com.bytedanceapi:ttsdk-ttlivepull_rtc:1.46.300.2'
+    implementation "com.volcengine:VolcApiEngine:$volc_api_engine_version"
+    implementation "com.bytedanceapi:ttsdk-ttlivepull_rtc:$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/VeLivePullSDK.m

@@ -5,13 +5,13 @@
 //  Created by ByteDance on 2024/4/10.
 //
 
-#import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import <TTSDKFramework/TTSDKFramework.h>
 
-#import "VolcApiEngine/VolcEventObserver.h"
 #import "VeLivePullSDK.h"
+#import "VolcApiEngine/VolcEventObserver.h"
 
 #define EVENT_NAME @"VolcLive:onEvent"
 
@@ -21,51 +21,48 @@
 
 static RCTVolcLiveModule *instance = nil;
 
-@implementation RCTVolcLiveModule
-{
+@implementation RCTVolcLiveModule {
   bool hasListeners;
 }
 
 + (instancetype)shareInstance {
-    return instance;
+  return instance;
 }
 
 + (BOOL)requiresMainQueueSetup {
-    return YES;
+  return YES;
 }
 
-+ (void)_unsedForKeepOnly {
-    Protocol *unused = @protocol(VeLivePlayerObserver);
-    NSLog(@"Loaded Protocol: %p", unused);
-}
+// + (void)_unsedForKeepOnly {
+//     Protocol *unused = @protocol(VeLivePlayerObserver);
+//     NSLog(@"Loaded Protocol: %p", unused);
+// }
 
 - (dispatch_queue_t)methodQueue {
-    return dispatch_get_main_queue();
+  return dispatch_get_main_queue();
 }
 
 - (instancetype)init {
-    self = [super init];
-    if (self != nil) {
-        self.volcApiEngine = nil;
-        instance = self;
-    }
-    return instance;
+  self = [super init];
+  if (self != nil) {
+    self.volcApiEngine = nil;
+    instance = self;
+  }
+  return instance;
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[ EVENT_NAME ];
+  return @[ EVENT_NAME ];
 }
 
-- (void)onEvent:(NSString *)eventName data:(id)eventData
-{
-  NSDictionary * dic = @{ @"event": eventName, @"data": eventData };
+- (void)onEvent:(NSString *)eventName data:(id)eventData {
+  NSDictionary *dic = @{@"event" : eventName, @"data" : eventData};
   [self sendEventWithName:EVENT_NAME body:dic];
 }
 
 RCT_EXPORT_MODULE();
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine)
-{
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine) {
   if (self.volcApiEngine == nil) {
     self.volcApiEngine = [[VolcApiEngine alloc] init];
     [self.volcApiEngine setObserver:self];
@@ -73,18 +70,19 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine)
   return nil;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(callApiSync:(nonnull NSDictionary *) args)
-{
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(callApiSync
+                                       : (nonnull NSDictionary *)args) {
   [self newApiEngine];
   return [instance.volcApiEngine callApi:args];
 }
 
-RCT_EXPORT_METHOD(callApi:(nonnull NSDictionary *)args callback:(RCTResponseSenderBlock) callback)
-{
+RCT_EXPORT_METHOD(callApi
+                  : (nonnull NSDictionary *)args callback
+                  : (RCTResponseSenderBlock)callback) {
   [self newApiEngine];
   dispatch_async(dispatch_get_main_queue(), ^{
     id _val = [self.volcApiEngine callApi:args];
-    callback(@[_val]);
+    callback(@[ _val ]);
   });
 }
 

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/lib/commonjs/index.js

@@ -714,18 +714,18 @@ var Bind = function (target, context) {
     return target;
 };
 
-var LogLevel;
+exports.LogLevel = void 0;
 (function (LogLevel) {
     LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
     LogLevel[LogLevel["INFO"] = 1] = "INFO";
     LogLevel[LogLevel["WARN"] = 2] = "WARN";
     LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
     LogLevel[LogLevel["NONE"] = 999] = "NONE";
-})(LogLevel || (LogLevel = {}));
+})(exports.LogLevel || (exports.LogLevel = {}));
 
 var LoggerImpl = /** @class */ (function () {
     function LoggerImpl() {
-        this._logLevel = LogLevel.WARN;
+        this._logLevel = exports.LogLevel.WARN;
         this._consumers = [];
     }
     LoggerImpl.getInstance = function () {
@@ -808,16 +808,16 @@ var LoggerImpl = /** @class */ (function () {
         }); });
         // 控制台输出
         switch (level) {
-            case LogLevel.ERROR:
+            case exports.LogLevel.ERROR:
                 console.error("".concat(timestamp, " ").concat(message));
                 break;
-            case LogLevel.WARN:
+            case exports.LogLevel.WARN:
                 console.warn("".concat(timestamp, " ").concat(message));
                 break;
-            case LogLevel.INFO:
+            case exports.LogLevel.INFO:
                 console.log("".concat(timestamp, " ").concat(message));
                 break;
-            case LogLevel.DEBUG:
+            case exports.LogLevel.DEBUG:
                 console.debug("".concat(timestamp, " ").concat(message));
                 break;
         }
@@ -827,28 +827,28 @@ var LoggerImpl = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        this._log(LogLevel.DEBUG, args);
+        this._log(exports.LogLevel.DEBUG, args);
     };
     LoggerImpl.prototype.info = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        this._log(LogLevel.INFO, args);
+        this._log(exports.LogLevel.INFO, args);
     };
     LoggerImpl.prototype.warn = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        this._log(LogLevel.WARN, args);
+        this._log(exports.LogLevel.WARN, args);
     };
     LoggerImpl.prototype.error = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        this._log(LogLevel.ERROR, args);
+        this._log(exports.LogLevel.ERROR, args);
     };
     LoggerImpl.MAX_LOG_LENGTH = 4096;
     return LoggerImpl;
@@ -1444,12 +1444,12 @@ var NativeLoggerManager = function () {
     return InstanceManager;
 })());
 
-/** @class */ ((function () {
+var LoggerManager = /** @class */ (function () {
     function LoggerManager() {
     }
     LoggerManager.setLogLevel = function (level) {
         this.logger.setLogLevel(level);
-        this.logger.debug('[logger-manager] setLogLevel', LogLevel[level]);
+        this.logger.debug('[logger-manager] setLogLevel', exports.LogLevel[level]);
         if (getOS() === 'android') {
             NativeLoggerManager$1.setLogLevel(level);
         }
@@ -1462,9 +1462,17 @@ var NativeLoggerManager = function () {
     };
     LoggerManager.logger = LoggerImpl.getInstance();
     return LoggerManager;
-})());
+}());
 
 var logger = LoggerImpl.getInstance();
+function setupLogger(opt) {
+    if (opt.level !== undefined) {
+        LoggerManager.setLogLevel(opt.level);
+    }
+    if (opt.customer !== undefined) {
+        logger.registerConsumer(opt.customer);
+    }
+}
 
 var ApiCallSpan = /** @class */ (function () {
     function ApiCallSpan(tracer, action) {
@@ -14544,3 +14552,4 @@ exports.VeLivePlayerStreamData = VeLivePlayerStreamData;
 exports.VeLivePlayerVideoFrame = VeLivePlayerVideoFrame;
 exports.initEnv = initEnv;
 exports.initPlayer = initPlayer;
+exports.setupLogger = setupLogger;

package/lib/module/index.js

@@ -1442,7 +1442,7 @@ var NativeLoggerManager = function () {
     return InstanceManager;
 })());
 
-/** @class */ ((function () {
+var LoggerManager = /** @class */ (function () {
     function LoggerManager() {
     }
     LoggerManager.setLogLevel = function (level) {
@@ -1460,9 +1460,17 @@ var NativeLoggerManager = function () {
     };
     LoggerManager.logger = LoggerImpl.getInstance();
     return LoggerManager;
-})());
+}());
 
 var logger = LoggerImpl.getInstance();
+function setupLogger(opt) {
+    if (opt.level !== undefined) {
+        LoggerManager.setLogLevel(opt.level);
+    }
+    if (opt.customer !== undefined) {
+        logger.registerConsumer(opt.customer);
+    }
+}
 
 var ApiCallSpan = /** @class */ (function () {
     function ApiCallSpan(tracer, action) {
@@ -14532,4 +14540,4 @@ function initPlayer(options) {
 setupJSBridge(new ReactNativeBridge(NativeModules.VolcLiveModule, 'VolcLive:onEvent'));
 setupEnv(new ReactNativeEnv());
 
-export { NativeViewComponent, VeLivePlayer, VeLivePlayerAudioBufferType, VeLivePlayerAudioFrame, VeLivePlayerConfiguration, VeLivePlayerFillMode, VeLivePlayerFormat, VeLivePlayerLogLevel, VeLivePlayerMirror, VeLivePlayerPixelFormat, VeLivePlayerProtocol, VeLivePlayerResolution, VeLivePlayerResolutionSwitchReason, VeLivePlayerRotation, VeLivePlayerStatistics, VeLivePlayerStatus, VeLivePlayerStream, VeLivePlayerStreamData, VeLivePlayerStreamType, VeLivePlayerVideoBufferType, VeLivePlayerVideoFrame, initEnv, initPlayer };
+export { LogLevel, NativeViewComponent, VeLivePlayer, VeLivePlayerAudioBufferType, VeLivePlayerAudioFrame, VeLivePlayerConfiguration, VeLivePlayerFillMode, VeLivePlayerFormat, VeLivePlayerLogLevel, VeLivePlayerMirror, VeLivePlayerPixelFormat, VeLivePlayerProtocol, VeLivePlayerResolution, VeLivePlayerResolutionSwitchReason, VeLivePlayerRotation, VeLivePlayerStatistics, VeLivePlayerStatus, VeLivePlayerStream, VeLivePlayerStreamData, VeLivePlayerStreamType, VeLivePlayerVideoBufferType, VeLivePlayerVideoFrame, initEnv, initPlayer, setupLogger };

package/lib/typescript/index.d.ts

@@ -1,2 +1,3 @@
 export * from './component';
 export * from './core/index';
+export { setupLogger, LogLevel } from '@vcloud-lux/hybrid-runtime';

package/package.json

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

package/react-native-velive-pull.podspec

@@ -2,6 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+is_bp = package['name'].start_with?('@byteplus')
 
 Pod::Spec.new do |s|
   s.name         = "react-native-velive-pull"
@@ -48,7 +49,13 @@ Pod::Spec.new do |s|
    end
   end
 
-  s.dependency 'VolcApiEngine', '1.6.2'
-  s.dependency 'TTSDKFramework/Core', '1.46.300.5-premium'
-  s.dependency 'TTSDKFramework/LivePull-RTS', '1.46.300.5-premium'
+  # Version configuration through environment variables
+  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'])
+
+  s.dependency 'VolcApiEngine', volc_api_engine_version
+  s.dependency 'TTSDKFramework/Core', ttsdk_framework_version
+  s.dependency 'TTSDKFramework/LivePull-RTS', ttsdk_framework_version
+  
+  puts("[LIVE PULL POD INSTALL INFO]: volc_api_engine_version: #{volc_api_engine_version} / ttsdk_framework_version: #{ttsdk_framework_version}")
 end