@byteplus/react-native-live-pull 1.1.3-rc.4 → 1.2.0-rc.1

package/android/build.gradle

@@ -88,6 +88,6 @@ dependencies {
   // noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
 
-    implementation "com.volcengine:VolcApiEngine:1.2.3"
-    implementation 'com.bytedanceapi:ttsdk-ttlivepull_rtc:1.41.300.103'
+    implementation "com.volcengine:VolcApiEngine:1.6.2"
+    implementation 'com.bytedanceapi:ttsdk-ttlivepull_rtc:1.46.300.2'
 }

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

@@ -0,0 +1,15 @@
+package com.volcengine.velive.rn.pull;
+
+import com.ss.videoarch.liveplayer.VeLivePlayer;
+import com.ss.videoarch.liveplayer.VeLivePlayerDef;
+import com.ss.videoarch.liveplayer.VeLivePlayerError;
+import com.ss.videoarch.liveplayer.VeLivePlayerStatistics;
+import com.volcengine.VolcApiEngine.runtime.Util;
+
+public class ClassHelper {
+  public static void init() {
+    Util.JsonAbleClass.add(VeLivePlayerStatistics.class);
+    Util.JsonAbleClass.add(VeLivePlayerError.class);
+    Util.JsonAbleClass.add(VeLivePlayerDef.VeLivePlayerResolution.class);
+  }
+}

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

@@ -8,7 +8,7 @@ import com.volcengine.VolcApiEngine.runtime.*;
 public class NativeVariableManager {
   static void init(@NonNull MessageClient msgClient, ReactApplicationContext reactContext) {
     var m = msgClient.proto.variableManager;
-
+    
     m.registerVar("ApplicationContext", (Object[] args) -> reactContext.getApplicationContext());
     m.registerVar("ReactApplicationContext", (Object[] args) -> reactContext);
   }

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

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.ss.videoarch.liveplayer.VeLivePlayerDef;
 import com.volcengine.VolcApiEngine.*;
 import com.volcengine.velive.rn.pull.autogen.MethodSignature;
 
@@ -23,6 +24,7 @@ public class VolcLiveModule
   VolcLiveModule(ReactApplicationContext context) {
     super(context);
     MethodSignature.init();
+    ClassHelper.init();
   }
 
   @Override

package/android/src/main/java/com/volcengine/velive/rn/pull/autogen/MethodSignature.java

@@ -4,123 +4,112 @@ import static com.volcengine.VolcApiEngine.runtime.MethodSignature.*;
 
 import android.view.Surface;
 import android.view.SurfaceHolder;
-
 import com.ss.videoarch.liveplayer.VeLivePlayer;
 import com.ss.videoarch.liveplayer.VeLivePlayerConfiguration;
 import com.ss.videoarch.liveplayer.VeLivePlayerDef;
 import com.ss.videoarch.liveplayer.VeLivePlayerObserver;
 import com.ss.videoarch.liveplayer.VeLivePlayerStreamData;
 import com.ss.videoarch.liveplayer.log.VeLivePlayerLogConfig;
-
 import java.util.Map;
 
 public class MethodSignature {
   static public void init() {
     try {
-      var r = createClassMethodRegister("com.ss.videoarch.liveplayer.VideoLiveManager");
+      var r = createClassMethodRegister(
+          "com.ss.videoarch.liveplayer.VideoLiveManager");
 
-      r.put(
-        "setConfig",
-        VeLivePlayer.class.getMethod("setConfig", VeLivePlayerConfiguration.class));
+      r.put("setConfig", VeLivePlayer.class.getMethod(
+                             "setConfig", VeLivePlayerConfiguration.class));
+
+      r.put("setObserver", VeLivePlayer.class.getMethod(
+                               "setObserver", VeLivePlayerObserver.class));
 
       r.put(
-        "setObserver",
-        VeLivePlayer.class.getMethod("setObserver", VeLivePlayerObserver.class));
+          "setRenderFillMode",
+          VeLivePlayer.class.getMethod(
+              "setRenderFillMode", VeLivePlayerDef.VeLivePlayerFillMode.class));
 
-      r.put("setRenderFillMode",
-        VeLivePlayer.class.getMethod("setRenderFillMode", VeLivePlayerDef.VeLivePlayerFillMode.class));
-      
       r.put("getVersion", VeLivePlayer.class.getMethod("getVersion"));
-      
-      r.put(
-        "setSurfaceHolder",
-        VeLivePlayer.class.getMethod("setSurfaceHolder", SurfaceHolder.class));
-      
-      r.put("setSurface", 
-        VeLivePlayer.class.getMethod("setSurface", Surface.class));
 
-      r.put(
-        "setPlayUrl",
-        VeLivePlayer.class.getMethod("setPlayUrl", String.class));
-      
-      r.put(
-        "setLogLevel",   
-        VeLivePlayer.class.getMethod("setLogLevel", VeLivePlayerLogConfig.VeLivePlayerLogLevel.class));
+      r.put("setSurfaceHolder", VeLivePlayer.class.getMethod(
+                                    "setSurfaceHolder", SurfaceHolder.class));
+
+      r.put("setSurface",
+            VeLivePlayer.class.getMethod("setSurface", Surface.class));
+
+      r.put("setPlayUrl",
+            VeLivePlayer.class.getMethod("setPlayUrl", String.class));
 
       r.put(
-        "setLogConfig",
-        VeLivePlayer.class.getMethod("setLogConfig", VeLivePlayerLogConfig.class));
+          "setLogLevel",
+          VeLivePlayer.class.getMethod(
+              "setLogLevel", VeLivePlayerLogConfig.VeLivePlayerLogLevel.class));
+
+      r.put("setLogConfig", VeLivePlayer.class.getMethod(
+                                "setLogConfig", VeLivePlayerLogConfig.class));
 
       r.put("setPlayStreamData",
-        VeLivePlayer.class.getMethod("setPlayStreamData", VeLivePlayerStreamData.class));
-      
-      r.put(
-        "play",
-        VeLivePlayer.class.getMethod("play"));
-      r.put(
-        "pause",
-        VeLivePlayer.class.getMethod("pause"));
+            VeLivePlayer.class.getMethod("setPlayStreamData",
+                                         VeLivePlayerStreamData.class));
 
-      r.put(
-        "stop",
-        VeLivePlayer.class.getMethod("stop"));
+      r.put("play", VeLivePlayer.class.getMethod("play"));
+      r.put("pause", VeLivePlayer.class.getMethod("pause"));
+
+      r.put("stop", VeLivePlayer.class.getMethod("stop"));
 
       r.put("destroy", VeLivePlayer.class.getMethod("destroy"));
 
-      r.put(
-        "switchResolution",
-        VeLivePlayer.class.getMethod("switchResolution", VeLivePlayerDef.VeLivePlayerResolution.class));
+      r.put("switchResolution",
+            VeLivePlayer.class.getMethod(
+                "switchResolution",
+                VeLivePlayerDef.VeLivePlayerResolution.class));
 
       r.put("isPlaying", VeLivePlayer.class.getMethod("isPlaying"));
 
-      r.put(
-        "setPlayerVolume",
-        VeLivePlayer.class.getMethod("setPlayerVolume", float.class));
-      
+      r.put("setPlayerVolume",
+            VeLivePlayer.class.getMethod("setPlayerVolume", float.class));
+
       r.put("setMute", VeLivePlayer.class.getMethod("setMute", boolean.class));
 
       r.put("isMute", VeLivePlayer.class.getMethod("isMute"));
-      
-      r.put(
-        "setUrlHostIP",
-        VeLivePlayer.class.getMethod("setUrlHostIP", Map.class));
 
-      r.put(
-        "setGlobalUrlHostIP",
-        VeLivePlayer.class.getMethod("setGlobalUrlHostIP", Map.class));
+      r.put("setUrlHostIP",
+            VeLivePlayer.class.getMethod("setUrlHostIP", Map.class));
 
-      r.put(
-        "setProperty",
-        VeLivePlayer.class.getMethod("setProperty", String.class, Object.class));
+      r.put("setGlobalUrlHostIP",
+            VeLivePlayer.class.getMethod("setGlobalUrlHostIP", Map.class));
 
-      r.put(
-        "snapshot",
-        VeLivePlayer.class.getMethod("snapshot"));
+      r.put("setProperty", VeLivePlayer.class.getMethod(
+                               "setProperty", String.class, Object.class));
 
-      r.put(
-        "enableVideoFrameObserver",
-        VeLivePlayer.class.getMethod(
-          "enableVideoFrameObserver",
-          boolean.class, VeLivePlayerDef.VeLivePlayerPixelFormat.class, VeLivePlayerDef.VeLivePlayerVideoBufferType.class));
+      r.put("snapshot", VeLivePlayer.class.getMethod("snapshot"));
 
-      r.put(
-        "enableAudioFrameObserver",
-        VeLivePlayer.class.getMethod(
-          "enableAudioFrameObserver", 
-          boolean.class, boolean.class));
-      
-      r.put(
-        "setRenderRotation",
-        VeLivePlayer.class.getMethod("setRenderRotation", VeLivePlayerDef.VeLivePlayerRotation.class));
+      r.put("enableVideoFrameObserver",
+            VeLivePlayer.class.getMethod(
+                "enableVideoFrameObserver", boolean.class,
+                VeLivePlayerDef.VeLivePlayerPixelFormat.class,
+                VeLivePlayerDef.VeLivePlayerVideoBufferType.class));
+
+      r.put("enableAudioFrameObserver",
+            VeLivePlayer.class.getMethod(
+                "enableAudioFrameObserver", boolean.class, boolean.class,
+                VeLivePlayerDef.VeLivePlayerAudioBufferType.class));
 
       r.put(
-        "setRenderMirror",
-        VeLivePlayer.class.getMethod("setRenderMirror", VeLivePlayerDef.VeLivePlayerMirror.class));
-      
+          "setRenderRotation",
+          VeLivePlayer.class.getMethod(
+              "setRenderRotation", VeLivePlayerDef.VeLivePlayerRotation.class));
+
+      r.put("setRenderMirror",
+            VeLivePlayer.class.getMethod(
+                "setRenderMirror", VeLivePlayerDef.VeLivePlayerMirror.class));
 
-      r.put("setEnableSuperResolution", VeLivePlayer.class.getMethod("setEnableSuperResolution", boolean.class));
+      r.put("setEnableSuperResolution",
+            VeLivePlayer.class.getMethod("setEnableSuperResolution",
+                                         boolean.class));
 
-      r.put("setEnableSharpen", VeLivePlayer.class.getMethod("setEnableSharpen", boolean.class));
+      r.put("setEnableSharpen",
+            VeLivePlayer.class.getMethod("setEnableSharpen", boolean.class));
 
     } catch (NoSuchMethodException e) {
       throw new RuntimeException(e);

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

@@ -1,6 +1,7 @@
 package com.volcengine.velive.rn.pull.pictureInpicture;
 
 import android.animation.ValueAnimator;
+import android.app.ActivityManager;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -23,6 +24,7 @@ import android.view.ViewConfiguration;
 import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import com.volcengine.velive.rn.pull.R;
+import java.util.List;
 
 public class FloatingWindowService extends Service {
   private static final int MARGIN_TOP = 40;
@@ -66,6 +68,7 @@ public class FloatingWindowService extends Service {
   public void onDestroy() {
     Log.d(TAG, "onDestroy");
     super.onDestroy();
+    
     unregisterActivityLaunchReceiver(); // Ensure receiver is unregistered on
                                         // destroy
     if (mSmallWindowView != null) {
@@ -110,15 +113,15 @@ public class FloatingWindowService extends Service {
 
     int maxLen;
     if (isPortrait) {
-      // 竖屏时，宽度不能超过 drawableWidth
+      // in portrait mode, width cannot exceed drawableWidth
       maxLen = drawableWidth;
     } else {
-      // 横屏时，高度不能超过 drawableHeight
+      // in landscape mode, height cannot exceed drawableHeight
       maxLen = drawableHeight;
     }
 
     int width, height;
-    if (aspectRatio >= 1) { // 宽大于等于高 (横向视频或方形)
+    if (aspectRatio >= 1) { //  wider than tall (landscape or square video)
       width = maxLen;
       height = (int)(width / aspectRatio);
       if (isPortrait && width > drawableWidth) {
@@ -178,28 +181,72 @@ public class FloatingWindowService extends Service {
               Log.d(TAG, "PIP window clicked");
 
               try {
-                // Get the pacain activity
+                if (isAppRunningInForeground()) {
+                  unregisterActivityLaunchReceiver();
+                  stopSelf();
+                  return;
+                }
+
+                // Get the main activity
                 String packageName = this.getPackageName();
                 Intent launchIntent =
-                    this.getPackageManager().getLaunchIntentForPackage(
-                        packageName);
-
+                    this.getPackageManager().getLaunchIntentForPackage(packageName);
                 if (launchIntent != null) {
-                  Log.d(TAG, "Launching app with intent: " + launchIntent);
                   launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                   // Register receiver to stop service when activity is launched
                   registerActivityLaunchReceiver();
                   this.startActivity(launchIntent);
-                } else {
-                  Log.e(TAG, "Could not create launch intent for package: " +
-                                 packageName);
+                  
+                  // Wait for app to reach foreground before closing floating window
+                  checkAppForegroundAndClose();
                 }
               } catch (Exception e) {
-                Log.e(TAG, "Error launching app: " + e.getMessage(), e);
+                
               }
-            });
+          });
+      }
+    }
+  }
+
+  private boolean isAppRunningInForeground() {
+    ActivityManager activityManager =
+        (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
+    if (activityManager == null) {
+      return false;
+    }
+
+    String packageName = getPackageName();
+
+    // For Android API level 21 and above
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      List<ActivityManager.RunningAppProcessInfo> runningProcesses =
+          activityManager.getRunningAppProcesses();
+      if (runningProcesses != null) {
+        for (ActivityManager.RunningAppProcessInfo processInfo :
+             runningProcesses) {
+          if (processInfo.processName.equals(packageName)) {
+            // Check if the process is in foreground
+            if (processInfo.importance ==
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+              return true;
+            }
+          }
+        }
+      }
+    } else {
+      // For older Android versions, use deprecated method
+      @SuppressWarnings("deprecation")
+      List<ActivityManager.RunningTaskInfo> runningTasks =
+          activityManager.getRunningTasks(1);
+      if (runningTasks != null && !runningTasks.isEmpty()) {
+        ActivityManager.RunningTaskInfo topTask = runningTasks.get(0);
+        if (topTask.topActivity != null &&
+            packageName.equals(topTask.topActivity.getPackageName())) {
+          return true;
+        }
       }
     }
+    return false;
   }
 
   private void registerActivityLaunchReceiver() {
@@ -228,6 +275,25 @@ public class FloatingWindowService extends Service {
     }
   }
 
+  private Handler mHandler = new Handler(Looper.getMainLooper());
+  
+  private void checkAppForegroundAndClose() {
+    mHandler.postDelayed(new Runnable() {
+      private int checkCount = 0;
+      
+      @Override
+      public void run() {
+        if (isAppRunningInForeground()) {
+          unregisterActivityLaunchReceiver();
+          stopSelf();
+        } else if (checkCount < 20) { // Check up to 20 times
+          checkCount++;
+          mHandler.postDelayed(this, 500);
+        }
+      }
+    }, 500);
+  }
+
   // BroadcastReceiver to listen for activity launch confirmation
   private class ActivityLaunchReceiver extends BroadcastReceiver {
     @Override
@@ -373,8 +439,6 @@ public class FloatingWindowService extends Service {
             mLayoutParams.x = mLayoutParams.x + movedX;
             mLayoutParams.y = mLayoutParams.y + movedY;
 
-            // 使用预先获取的屏幕高度 screenHeight
-            // 限制y坐标在安全区域内
             mLayoutParams.y = Math.max(
                 MARGIN_TOP, Math.min(mLayoutParams.y, this.screenHeight -
                                                           mLayoutParams.height -

package/ios/VeLivePlayerMultiObserver.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "TTSDKFramework/TVLManager.h"
+#import <TTSDKFramework/TVLManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,7 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
  * @param observerId 观察者ID，相同ID会覆盖之前的观察者
  * @param observer 观察者对象
  */
-- (void)addObserver:(NSString *)observerId observer:(id<VeLivePlayerObserver>)observer;
+- (void)addObserver:(NSString *)observerId
+           observer:(id<VeLivePlayerObserver>)observer;
 
 /**
  * 从代理列表中移除观察者

package/ios/VeLivePlayerMultiObserver.m

@@ -1,5 +1,5 @@
 #import "VeLivePlayerMultiObserver.h"
-#import "TTSDKFramework/TVLManager.h"
+#import <TTSDKFramework/TVLManager.h>
 
 @interface VeLivePlayerMultiObserver ()
 @property(nonatomic, strong) NSMutableDictionary *observerDict;
@@ -35,7 +35,7 @@
 }
 
 - (void)setupPlayer:(TVLManager *)player {
-  if(self.player) {
+  if (self.player) {
     [self clearObservers];
   }
   self.player = player;

package/ios/include/react-native-velive-pull.modulemap

@@ -0,0 +1,4 @@
+module react_native_velive_pull {
+  header "../pictureInpicture/PictureInPictureManager.h"
+  export *
+}

package/ios/pictureInpicture/PictureInPictureManager.h

@@ -1,3 +1,4 @@
+#import <AVKit/AVKit.h>
 #import <Foundation/Foundation.h>
 @class TVLManager;
 @class UIView;
@@ -11,6 +12,16 @@
 
 @interface VeLivePictureInPictureManager : NSObject
 
+// Configure whether to support automatic picture-in-picture in background
+// Default is NO
+@property(nonatomic, assign)
+    BOOL canStartPictureInPictureAutomaticallyFromInline API_AVAILABLE(ios(14.2)
+    );
+
+// Whether to automatically hide the current player's view controller after
+// starting picture-in-picture, default is NO
+@property(nonatomic, assign) BOOL autoHideViewController;
+
 // Expose shared instance methods to RN
 + (instancetype)sharedInstance;
 + (instancetype)getInstance;
@@ -25,5 +36,14 @@
 - (BOOL)isPictureInPictureSupported;
 - (void)setListener:(id<VeLivePictureInPictureManagerListener>)listener;
 
+// register a PIP controller observer, returns an observer ID
+- (NSString *)addPipControllerObserver:
+    (void (^)(AVPictureInPictureController *pipController))observer;
+
+// remove a PIP controller observer by its ID
+- (void)removePipControllerObserver:(NSString *)observerId;
 
-@end
+// This method is used to remove all observers registered for the PIP controller
+- (void)removeAllPipControllerObservers;
+
+@end