@ray-js/ipc-player-integration 0.0.17 → 0.0.18-beta-2

package/lib/ui/ui.js

@@ -73,6 +73,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setRecording
   } = instance;
   const prevTriggerEvent = useRef();
+  const hasPlayedRef = useRef(false);
   /*
     player 的UI效果期望有一些控件在初始化的时候都展示，在点击 Player 之后隐藏：
     在控件显示时，点击播放器期望隐藏控件
@@ -94,6 +95,75 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
+  const {
+    topLeftContent,
+    topRightContent,
+    bottomLeftContent,
+    bottomRightContent,
+    absoluteContent,
+    screenType,
+    playState,
+    resolution,
+    mute
+  } = useStore({
+    topLeftContent: instance.topLeftContent,
+    topRightContent: instance.topRightContent,
+    bottomLeftContent: instance.bottomLeftContent,
+    bottomRightContent: instance.bottomRightContent,
+    absoluteContent: instance.absoluteContent,
+    screenType: instance.screenType,
+    playState: instance.playState,
+    resolution: instance.resolution,
+    mute: instance.mute
+  });
+  useEffect(() => {
+    // 首次进来强制为竖屏
+    if (createCtx) {
+      // 获取屏幕方向比例
+      try {
+        var _ty;
+        if (typeof ((_ty = ty) === null || _ty === void 0 ? void 0 : _ty.getOrientationSync) === 'function') {
+          const {
+            orientation
+          } = ty.getOrientationSync();
+          ipcTTTOperatorLog(`同步获取屏幕方向: ${orientation}`);
+          setScreenType(orientation === 'landscape' ? 'full' : 'vertical');
+        }
+      } catch (e) {
+        console.log('获取屏幕方向失败');
+      }
+    }
+  }, [createCtx]);
+  const handleOrientationChange = data => {
+    const {
+      orientation
+    } = data;
+    if (['portrait', 'portrait-upside-down', 'landscape-left', 'landscape-right'].includes(orientation)) {
+      setScreenType(orientation === 'landscape-left' || orientation === 'landscape-right' ? 'full' : 'vertical');
+      const pageOrientation = orientation === 'landscape-left' || orientation === 'landscape-right' ? 'landscape' : 'portrait';
+      setPageOrientation({
+        pageOrientation,
+        success: () => {
+          console.log('success');
+        },
+        fail: err => {
+          console.log('err', err);
+        }
+      });
+    }
+  };
+  useEffect(() => {
+    var _ty2;
+    if (typeof ((_ty2 = ty) === null || _ty2 === void 0 ? void 0 : _ty2.onOrientationChange) === 'function') {
+      ty.onOrientationChange(handleOrientationChange);
+    }
+    return () => {
+      var _ty3;
+      if (typeof ((_ty3 = ty) === null || _ty3 === void 0 ? void 0 : _ty3.offOrientationChange) === 'function') {
+        ty.offOrientationChange(handleOrientationChange);
+      }
+    };
+  }, []);
   useEffect(() => {
     if (createCtx) {
       setScaleMultiple(playerFit === 'contain' ? 1 : -2);
@@ -124,7 +194,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       } = sizeData;
       console.log('监听到屏幕布局变化', type);
       const {
-        platform,
         deviceType
       } = systemInfo.current;
       //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
@@ -200,27 +269,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   if (!systemInfo.current) {
     systemInfo.current = getSystemInfoSync();
   }
-  const {
-    topLeftContent,
-    topRightContent,
-    bottomLeftContent,
-    bottomRightContent,
-    absoluteContent,
-    screenType,
-    playState,
-    resolution,
-    mute
-  } = useStore({
-    topLeftContent: instance.topLeftContent,
-    topRightContent: instance.topRightContent,
-    bottomLeftContent: instance.bottomLeftContent,
-    bottomRightContent: instance.bottomRightContent,
-    absoluteContent: instance.absoluteContent,
-    screenType: instance.screenType,
-    playState: instance.playState,
-    resolution: instance.resolution,
-    mute: instance.mute
-  });
 
   // 监听物理返回按键
   const hackHandle = () => {
@@ -336,7 +384,16 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (playState !== PlayState.PLAYING) {
       console.log('非播放状态=======');
       console.log(currentZoomLevel, 'currentZoomLevel');
-      setScaleMultiple(currentZoomLevel);
+      if (hasPlayedRef.current) {
+        setScaleMultiple(currentZoomLevel);
+      }
+    }
+    if (playState === PlayState.PLAYING) {
+      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2
+      if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
+        setScaleMultiple(-2);
+      }
+      hasPlayedRef.current = true;
     }
     setPlayState(playState);
     (_props$onPlayStatus = props.onPlayStatus) === null || _props$onPlayStatus === void 0 || _props$onPlayStatus.call(props, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.17",
+  "version": "0.0.18-beta-2",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
     "@ray-js/ipc-ptz-zoom": "^0.0.2",
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/direction-control": "^0.0.8",
-    "@ray-js/ray-ipc-player": "^2.0.25",
+    "@ray-js/ray-ipc-player": "2.0.26-beta-1",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",