@ray-js/ipc-player-integration 0.0.19 → 0.0.20-beta-1

package/lib/ui/ui.d.ts

@@ -26,6 +26,7 @@ type Props = {
     CSSVariable?: Partial<CSSVariable>;
     brandColor?: string;
     verticalMic?: boolean;
+    playerRoute?: string;
     landscapeMode?: 'fill' | 'standard';
     playerFit: 'contain' | 'cover';
     awakeStatus?: boolean | undefined;

package/lib/ui/ui.js

@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
-import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation } from '@ray-js/ray';
+import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation, getCurrentPages } from '@ray-js/ray';
 import clsx from 'clsx';
 import IPCPlayer from '@ray-js/ray-ipc-player';
 import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
@@ -58,6 +58,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     playerFit = 'contain',
     awakeStatus = undefined,
     onPlayerTap,
+    playerRoute = 'pages/home/index',
     extend = {}
   } = props;
   const {
@@ -73,6 +74,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setRecording
   } = instance;
   const prevTriggerEvent = useRef();
+  const hasPlayedRef = useRef(false);
+
   /*
     player 的UI效果期望有一些控件在初始化的时候都展示，在点击 Player 之后隐藏：
     在控件显示时，点击播放器期望隐藏控件
@@ -87,6 +90,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }
   useImperativeHandle(eventRefProp, () => eventRef.current, [eventRef.current]);
   const timer = useRef();
+  const reGetOrientationTimer = useRef(null);
   const [scaleMultiple, setScaleMultiple] = useState(playerFit === 'contain' ? 1 : -2);
   const [currentZoomLevel, setCurrentZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
   const [createCtx, setCreateCtx] = useState(false);
@@ -94,6 +98,108 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
+  const handleOrientationChange = useMemoizedFn(data => {
+    console.log(data, 'data=============');
+    const {
+      orientation
+    } = data;
+    console.log(orientation, 'orientation=-====');
+    if (['portrait', 'landscape-left', 'landscape-right'].includes(orientation)) {
+      var _ty;
+      if (typeof ((_ty = ty) === null || _ty === void 0 ? void 0 : _ty.getDeviceOrientationSync) !== 'function') return;
+      if (getPlayerRoute() !== playerRoute) {
+        // 不是Player首页的话，禁止以下行为
+        return;
+      }
+      console.log('屏幕方向变化调用吗');
+      setPageOrientation({
+        pageOrientation: orientation === 'landscape-left' || orientation === 'landscape-right' ? 'landscape' : 'portrait',
+        reverse: orientation === 'landscape-left',
+        success: () => {
+          console.log('set page orientation success');
+        },
+        fail: err => {
+          console.log('set page orientation fail', err);
+        }
+      });
+    }
+  });
+  useEffect(() => {
+    var _ty2;
+    console.log('getDeviceOrientationSync =======');
+    if (typeof ((_ty2 = ty) === null || _ty2 === void 0 ? void 0 : _ty2.getDeviceOrientationSync) !== 'function') return undefined;
+    try {
+      ty.onOrientationChange(handleOrientationChange);
+      const {
+        orientation
+      } = ty.getDeviceOrientationSync();
+      console.log(orientation, 'initial orientation');
+      if (orientation === 'landscape-left' || orientation === 'landscape-right') {
+        setScreenType('full');
+      }
+      if (orientation === 'unknown' || orientation === undefined) {
+        // 1秒后重试一次
+        const retryGetOrientation = () => {
+          const {
+            orientation
+          } = ty.getDeviceOrientationSync();
+          console.log(orientation, 'retry orientation');
+          if (orientation !== 'unknown' && orientation !== undefined) {
+            // 获取到有效方向，清除定时器并处理
+            if (reGetOrientationTimer.current) {
+              clearTimeout(reGetOrientationTimer.current);
+              reGetOrientationTimer.current = null;
+            }
+            if (orientation === 'landscape-left' || orientation === 'landscape-right') {
+              setScreenType('full');
+            }
+            handleOrientationChange({
+              orientation
+            });
+          } else {
+            // 仍然无效，继续重试
+            reGetOrientationTimer.current = setTimeout(retryGetOrientation, 1000);
+          }
+        };
+        reGetOrientationTimer.current = setTimeout(retryGetOrientation, 1000);
+      }
+      handleOrientationChange(orientation);
+    } catch (e) {
+      console.log('获取屏幕方向失败', e);
+    }
+    return () => {
+      var _ty3;
+      if (typeof ((_ty3 = ty) === null || _ty3 === void 0 ? void 0 : _ty3.offOrientationChange) === 'function') {
+        ty.offOrientationChange(handleOrientationChange);
+      }
+    };
+  }, []);
+  const getPlayerRoute = () => {
+    const pages = getCurrentPages(); // 获取当前页面栈
+    const currentPage = pages[pages.length - 1]; // 获取当前页面实例
+    return currentPage.route;
+  };
+  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) {
       setScaleMultiple(playerFit === 'contain' ? 1 : -2);
@@ -118,13 +224,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听屏幕布局变化
    */
   usePageEvent('onResize', useMemoizedFn(sizeData => {
+    console.log(getPlayerRoute(), 'getPlayerRoute()');
+    if (getPlayerRoute() !== playerRoute) {
+      // 不是Player首页的话，禁止以下行为
+      return;
+    }
     try {
       const {
         type
       } = sizeData;
       console.log('监听到屏幕布局变化', type);
       const {
-        platform,
         deviceType
       } = systemInfo.current;
       //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
@@ -136,34 +246,16 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       }
       // 若为全屏模式并且要求按宽填充，即横屏时充满，主动设置模式为-1即可
       if (type === 'landscape' && landscapeMode === 'fill') {
-        // instance.IPCPlayerInstance.setObjectFit({
-        //   objectFit: 'fillCrop',
-        // });
         console.log(scaleMultiple, '===========fill');
         setScaleMultiple(-1);
       } else if (type === 'landscape' && landscapeMode === 'standard') {
-        // instance.IPCPlayerInstance.setObjectFit({
-        //   objectFit: 'contain',
-        // });
-        // setTimeout(() => {
-        //   console.log('dsahdjsahjdhsajhdjh==');
-        //   instance.IPCPlayerInstance.setScaleMultiple({
-        //     scaleMultiple: -2,
-        //   });
-        // }, 3000);
         console.log(scaleMultiple, '===========landscape');
         setScaleMultiple(-2);
       } else {
         // 竖屏时 将屏幕播放比例设为按宽按高
-        // console.log(verticalZoomLevel, 'verticalZoomLevel======');
-        // instance.IPCPlayerInstance.setScaleMultiple({
-        //   scaleMultiple: playerFit === 'contain' ? -1 : -2,
-        // });
+
         console.log(scaleMultiple, '===========landscape');
         setScaleMultiple(playerFit === 'contain' ? scaleMultiple === 1 ? -1 : 1 : -2);
-        // instance.IPCPlayerInstance.setObjectFit({
-        //   objectFit: playerFit === 'contain' ? 'fillCrop' : 'contain',
-        // });
       }
     } catch (err) {
       console.log(err, 'err');
@@ -200,27 +292,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 +407,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (playState !== PlayState.PLAYING) {
       console.log('非播放状态=======');
       console.log(currentZoomLevel, 'currentZoomLevel');
-      setScaleMultiple(currentZoomLevel);
+      console.log(scaleMultiple, 'scaleMultiple');
+      console.log(hasPlayedRef.current, 'hasPlayedRef.current');
+      if (hasPlayedRef.current) {
+        setScaleMultiple(currentZoomLevel);
+      }
+    }
+    if (playState === PlayState.PLAYING) {
+      // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2
+      console.log('Playing状态');
+      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, {
@@ -397,6 +480,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.off(hideAllComponent, listenHideEvent);
       eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
       eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
+      if (reGetOrientationTimer.current) {
+        clearTimeout(reGetOrientationTimer.current);
+        reGetOrientationTimer.current = null;
+      }
     };
   }, []);
   playState === PlayState.PLAYING;
@@ -427,7 +514,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (scaleMode === -2 && playerFit === 'cover' && screenType === 'vertical' && landscapeMode === 'standard') {
       console.log('dsadsadsad----', zoomLevel);
       setScaleMultiple(zoomLevel);
-      // setVerticalCoverZoom(zoomLevel);
     }
     /**
      * 针对竖屏为contain模式时，横屏为fill模式时，主动设置缩放比例，避免因值不能正常变化
@@ -446,14 +532,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       setVerticalCoverZoom(zoomLevel);
       setScaleMultiple(zoomLevel);
     }
-
-    // if (screenType === 'vertical' && scaleMode === -1) {
-    //   console.log('dsadsadsad----');
-    //   // setVerticalCoverZoom(zoomLevel);
-    //   setScaleMultiple(zoomLevel);
-    // }
-    console.log(data === null || data === void 0 ? void 0 : data.detail, 'data?.detail');
-    console.log(zoomLevel, 'zoomLevel======');
     setCurrentZoomLevel(zoomLevel);
     return false;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.19",
+  "version": "0.0.20-beta-1",
   "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",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
@@ -48,7 +48,6 @@
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@ray-js/cli": "^1.7.14",
-    "@ray-js/direction-control": "^0.0.7",
     "@ray-js/ray": "^1.7.14",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.5.14",