@byteplus/react-native-live-push 1.0.2 → 1.0.3-rc.0

package/android/build.gradle

@@ -87,6 +87,6 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
-    implementation "com.volcengine:VolcApiEngine:1.0.3"
-    implementation 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.41.3.4'
+    implementation "com.volcengine:VolcApiEngine:1.2.3"
+    implementation 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.41.300.103'
 }

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

@@ -3,7 +3,7 @@ package com.volcengine.velive.rn.push;
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.volcengine.VolcApiEngine.runtime.*;
+import com.volcengine.VolcApiEngine.*;
 
 public class NativeVariableManager {
   static void init(@NonNull VolcApiEngine apiEngine, ReactApplicationContext reactContext) {

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushModule.java

@@ -3,6 +3,7 @@ package com.volcengine.velive.rn.push;
 import static com.volcengine.VolcApiEngine.runtime.Util.JsonAbleClass;
 
 import android.util.Log;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
@@ -18,12 +19,13 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.ss.avframework.live.VeLivePusherConfiguration;
 import com.ss.avframework.live.VeLivePusherDef;
 import com.ss.avframework.live.VeLivePusherObserver;
-import com.volcengine.VolcApiEngine.runtime.*;
+import com.ss.avframework.live.statistics.VeLivePusherStatisticsExt;
+import com.volcengine.VolcApiEngine.*;
 import com.volcengine.VolcApiEngine.view.*;
 
 public class VeLivePushModule extends VeLivePushModuleSpec implements IEventReceiver {
   static  {
-    JsonAbleClass.add(VeLivePusherDef.VeLivePusherStatistics.class);
+    JsonAbleClass.add(VeLivePusherStatisticsExt.class);
   }
   
   VolcApiEngine apiEngine = null;
@@ -176,7 +178,7 @@ public class VeLivePushModule extends VeLivePushModuleSpec implements IEventRece
       }
     });
     
-    mLivePusher.setRenderView(VolcViewManager.getViewById("live-pusher"));
+    mLivePusher.setRenderView((View) VolcViewManager.getViewById("live-pusher"));
     mLivePusher.startVideoCapture(VeLivePusherDef.VeLiveVideoCaptureType.VeLiveVideoCaptureFrontCamera);
   }
 }

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushViewManager.java

@@ -1,5 +1,6 @@
 package com.volcengine.velive.rn.push;
 
+import android.os.Looper;
 import android.view.SurfaceView;
 import android.view.View;
 
@@ -15,7 +16,7 @@ import com.volcengine.VolcApiEngine.view.*;
 
 import java.util.Map;
 
-public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> implements VolcViewManagerInterface<VeLivePushView> {
+public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> {
   public static final String NAME = "VeLivePushView";
   
   private ThemedReactContext context;
@@ -28,9 +29,13 @@ public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> imp
 
   @NonNull
   @Override
-  public VeLivePushView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
-    context = themedReactContext;
-    return new VeLivePushView(themedReactContext);
+  protected VeLivePushView createViewInstance(@NonNull ThemedReactContext reactContext) {
+    // 确保在主线程创建
+    if (Looper.myLooper() != Looper.getMainLooper()) {
+      throw new IllegalStateException("View must be created on the main thread");
+    }
+    context = reactContext;
+    return new VeLivePushView(reactContext);
   }
   
   @ReactProp(name = "viewId")
@@ -80,7 +85,7 @@ public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> imp
       "load",
       MapBuilder.of(
         "phasedRegistrationNames",
-        MapBuilder.of("bubbled", "onLoad")
+        MapBuilder.of("bubbled", "onViewLoad")
       )
     ).build();
   }

package/ios/VeLivePushView.m

@@ -30,7 +30,7 @@
   [self emitLoaded];
 }
 
-- (void) setOnLoad:(RCTBubblingEventBlock)onLoad {
+- (void) setOnViewLoad:(RCTBubblingEventBlock)onLoad {
   _onLoad = onLoad;
 
   [self emitLoaded];

package/ios/VeLivePushViewManager.m

@@ -16,10 +16,14 @@
 
 @implementation VeLivePushViewManager
 
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
 RCT_EXPORT_MODULE(VeLivePushView)
 
 // 导出 events
-RCT_EXPORT_VIEW_PROPERTY(onLoad, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onViewLoad, RCTBubblingEventBlock)
 
 // 导出 events
 RCT_CUSTOM_VIEW_PROPERTY(viewId, NSString, VeLivePushUIView)