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

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

@@ -1,34 +1,107 @@
 package com.volcengine.velive.rn.push;
 
-import android.content.Context;
+import android.graphics.SurfaceTexture;
 import android.util.Log;
+import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.view.TextureView;
 import android.view.View;
 import android.widget.FrameLayout;
-
+import androidx.annotation.NonNull;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.volcengine.VolcApiEngine.view.VolcViewManager;
 
 public class VeLivePushView extends FrameLayout {
   public String viewId;
+  public String viewKind;
   public boolean hasRegister = false;
-  
-  public VeLivePushView(Context context) {
+  private final ThemedReactContext themedReactContext;
+  private boolean hasLoad = false;
+  private View subview;
+
+  public VeLivePushView(ThemedReactContext context) {
     super(context);
+    this.themedReactContext = context;
   }
-  
+
   public void setViewId(String viewId) {
-    this.viewId = viewId;  
+    this.viewId = viewId;
     this.hasRegister = true;
     this.emitOnLoad();
   }
-  
+
+  public void setViewKind(String viewKind) {
+    this.viewKind = viewKind;
+    switch (viewKind) {
+    case "SurfaceView":
+      SurfaceView surfaceView =
+          new SurfaceView(themedReactContext.getReactApplicationContext());
+      surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+        @Override
+        public void surfaceCreated(@NonNull SurfaceHolder holder) {
+          hasLoad = true;
+          subview = surfaceView;
+          VolcViewManager.putViewById(viewId, subview);
+          emitOnLoad();
+        }
+
+        @Override
+        public void surfaceChanged(@NonNull SurfaceHolder holder, int format,
+                                   int width, int height) {}
+
+        @Override
+        public void surfaceDestroyed(@NonNull SurfaceHolder holder) {}
+      });
+      this.addView(surfaceView);
+      break;
+    case "TextureView":
+      TextureView textureView =
+          new TextureView(themedReactContext.getReactApplicationContext());
+      subview = textureView;
+      textureView.setSurfaceTextureListener(
+          new TextureView.SurfaceTextureListener() {
+            @Override
+            public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture,
+                                                  int width, int height) {
+              hasLoad = true;
+              VolcViewManager.putViewById(viewId, subview);
+              emitOnLoad();
+            }
+            @Override
+            public void onSurfaceTextureSizeChanged(
+                SurfaceTexture surfaceTexture, int width, int height) {}
+            @Override
+            public boolean onSurfaceTextureDestroyed(
+                SurfaceTexture surfaceTexture) {
+              return true;
+            }
+            @Override
+            public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+            }
+          });
+      this.addView(textureView);
+      break;
+    default:
+      break;
+    }
+  }
+
+  public void resetSurface() {
+    if (subview instanceof SurfaceView) {
+      SurfaceView surface = (SurfaceView)subview;
+      removeView(surface);
+      addView(surface);
+    }
+  }
+
   public void setVisible(Boolean visible) {
     Log.i("surfaceView", "setVisible");
     View subview = this.getChildAt(0);
-    if(visible) {
+    if (visible) {
       subview.setVisibility(View.VISIBLE);
     } else {
       subview.setVisibility(View.INVISIBLE);
@@ -36,10 +109,12 @@ public class VeLivePushView extends FrameLayout {
   }
 
   public void emitOnLoad() {
+    if (hasLoad) {
+      return;
+    }
     WritableMap event = Arguments.createMap();
     ReactContext reactContext = (ReactContext)getContext();
-    reactContext
-      .getJSModule(RCTEventEmitter.class)
-      .receiveEvent(getId(), "load", event);
+    reactContext.getJSModule(RCTEventEmitter.class)
+        .receiveEvent(getId(), "load", event);
   }
 }

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

@@ -1,26 +1,20 @@
 package com.volcengine.velive.rn.push;
 
 import android.os.Looper;
-import android.view.SurfaceView;
-import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.volcengine.VolcApiEngine.view.*;
-
 import java.util.Map;
 
 public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> {
   public static final String NAME = "VeLivePushView";
-  
-  private ThemedReactContext context;
 
+  private ThemedReactContext context;
+  
   @NonNull
   @Override
   public String getName() {
@@ -29,64 +23,54 @@ public class VeLivePushViewManager extends SimpleViewManager<VeLivePushView> {
 
   @NonNull
   @Override
-  protected VeLivePushView createViewInstance(@NonNull ThemedReactContext reactContext) {
+  protected VeLivePushView
+  createViewInstance(@NonNull ThemedReactContext reactContext) {
     // 确保在主线程创建
     if (Looper.myLooper() != Looper.getMainLooper()) {
-      throw new IllegalStateException("View must be created on the main thread");
+      throw new IllegalStateException(
+          "View must be created on the main thread");
     }
     context = reactContext;
     return new VeLivePushView(reactContext);
   }
-  
+
   @ReactProp(name = "viewId")
   public void setViewId(VeLivePushView view, String viewId) {
     view.setViewId(viewId);
-    VolcViewManager.putViewById(viewId, view);
   }
 
   @ReactProp(name = "kind")
   public void setKind(VeLivePushView view, String kind) {
-    var themedReactContext = this.context;
-    
-    switch (kind) {
-      case "SurfaceView" -> {
-        SurfaceView subView = new SurfaceView(themedReactContext.getReactApplicationContext());
-        view.addView(subView);
-      }
-      case "View" -> {
-        View subView = new View(themedReactContext.getApplicationContext());
-        view.addView(subView);
-      }
-    }
+    view.setViewKind(kind);
   }
-  
+
   public void setVisible(VeLivePushView view, Boolean visible) {
     view.setVisible(visible);
   }
+  
+  public void resetSurface(VeLivePushView view) {
+    view.resetSurface();
+  }
 
   /**
    * Handle "create" command (called from JS) and call createFragment method
    */
-  public void receiveCommand(
-    @NonNull VeLivePushView root,
-    String command,
-    @Nullable ReadableArray args
-  ) {
+  public void receiveCommand(@NonNull VeLivePushView root, String command,
+                             @Nullable ReadableArray args) {
     super.receiveCommand(root, command, args);
-    
+
     if (command.equals("setVisible")) {
       assert args != null;
       setVisible(root, args.getBoolean(0));
+    } else if(command.equals("resetSurface")) {
+      resetSurface(root);
     }
   }
 
   public Map getExportedCustomBubblingEventTypeConstants() {
-    return MapBuilder.builder().put(
-      "load",
-      MapBuilder.of(
-        "phasedRegistrationNames",
-        MapBuilder.of("bubbled", "onViewLoad")
-      )
-    ).build();
+    return MapBuilder.builder()
+        .put("load", MapBuilder.of("phasedRegistrationNames",
+                                   MapBuilder.of("bubbled", "onViewLoad")))
+        .build();
   }
 }

package/lib/commonjs/index.js

@@ -28053,10 +28053,7 @@ function initAndroidPusher(options) {
                 case 2:
                     _d.sent();
                     viewTag = reactNative.findNodeHandle(element);
-                    reactNative.UIManager.dispatchViewManagerCommand(viewTag, 'setVisible', [false]);
-                    setTimeout(function () {
-                        reactNative.UIManager.dispatchViewManagerCommand(viewTag, 'setVisible', [true]);
-                    }, 1000);
+                    reactNative.UIManager.dispatchViewManagerCommand(viewTag, 'resetSurface', []);
                     return [2 /*return*/, packObject(pusher, VeLivePusher)];
             }
         });

package/lib/module/index.js

@@ -28051,10 +28051,7 @@ function initAndroidPusher(options) {
                 case 2:
                     _d.sent();
                     viewTag = findNodeHandle(element);
-                    UIManager.dispatchViewManagerCommand(viewTag, 'setVisible', [false]);
-                    setTimeout(function () {
-                        UIManager.dispatchViewManagerCommand(viewTag, 'setVisible', [true]);
-                    }, 1000);
+                    UIManager.dispatchViewManagerCommand(viewTag, 'resetSurface', []);
                     return [2 /*return*/, packObject(pusher, VeLivePusher)];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/react-native-live-push",
-  "version": "1.0.3-rc.1",
+  "version": "1.1.1-rc.0",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"