@ray-js/ipc-player-integration 0.0.18-beta-7 → 0.0.19

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, getCurrentPages } from '@ray-js/ray';
+import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation } from '@ray-js/ray';
 import clsx from 'clsx';
 import IPCPlayer from '@ray-js/ray-ipc-player';
 import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
@@ -73,8 +73,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     setRecording
   } = instance;
   const prevTriggerEvent = useRef();
-  const hasPlayedRef = useRef(false);
-
   /*
     player 的UI效果期望有一些控件在初始化的时候都展示，在点击 Player 之后隐藏：
     在控件显示时，点击播放器期望隐藏控件
@@ -89,7 +87,6 @@ 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);
@@ -97,98 +94,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   // const [verticalCoverZoom, setVerticalCoverZoom] = useState(-2);
   // const [verticalZoomLevel, setVerticalZoomLevel] = useState(playerFit === 'contain' ? 1 : -2);
 
-  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
-  });
-  const getAndSetOrientation = () => {
-    try {
-      var _ty;
-      if (typeof ((_ty = ty) === null || _ty === void 0 ? void 0 : _ty.getOrientationSync) === 'function') {
-        const {
-          orientation
-        } = ty.getOrientationSync();
-        console.log(`同步获取屏幕方向: ${orientation}`);
-        ipcTTTOperatorLog(`同步获取屏幕方向: ${orientation}`);
-        if (orientation === 'unknown') {
-          // 1秒后重试一次
-          reGetOrientationTimer.current = setTimeout(getAndSetOrientation, 500);
-          return;
-        }
-        if (['portrait', 'portrait-upside-down', 'landscape-left', 'landscape-right', 'landscape'].includes(orientation)) {
-          const {
-            deviceType
-          } = systemInfo.current;
-          if (deviceType === 'pad') {
-            setScreenType('vertical');
-            return;
-          }
-          const pageOrientation = orientation === 'landscape-left' || orientation === 'landscape-right' || orientation === 'landscape' ? 'landscape' : 'portrait';
-          if (pageOrientation === 'landscape') {
-            // 如果为横屏的情况下，直接设置为全屏
-            setScreenType(pageOrientation === 'landscape' ? 'full' : 'vertical');
-          }
-
-          // setPageOrientation({
-          //   pageOrientation,
-          //   success: () => {
-          //     console.log('success');
-          //   },
-          //   fail: err => {
-          //     console.log('err', err);
-          //   },
-          // });
-        }
-      }
-    } catch (e) {
-      console.log('获取屏幕方向失败');
-    }
-  };
-  useEffect(() => {
-    // 首次进来强制为竖屏
-    if (createCtx) {
-      getAndSetOrientation();
-    }
-    return () => {
-      if (reGetOrientationTimer.current) {
-        clearTimeout(reGetOrientationTimer.current);
-      }
-    };
-  }, [createCtx]);
-  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);
@@ -209,72 +114,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听播放器实例创建完成
    */
 
-  const handleOrientationChange = useMemoizedFn(data => {
-    console.log(data, 'data=====');
-    console.log(getPlayerRoute(), 'getPlayerRoute()');
-    if (getPlayerRoute() !== 'pages/home/index') {
-      // 不是首页的话，禁止以下行为
-      return;
-    }
-    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';
-
-      // const { deviceType } = systemInfo.current;
-      // //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
-      // if (deviceType === 'pad') {
-      //   setScreenType('vertical');
-      // } else {
-      //   setScreenType(pageOrientation === 'landscape' ? 'full' : 'vertical');
-      //   triggerEvent(showAllComponent);
-      // }
-      // // 若为全屏模式并且要求按宽填充，即横屏时充满，主动设置模式为-1即可
-      // if (pageOrientation === 'landscape' && landscapeMode === 'fill') {
-      //   console.log(scaleMultiple, '===========fill');
-      //   setScaleMultiple(-1);
-      // } else if (pageOrientation === 'landscape' && landscapeMode === 'standard') {
-      //   console.log(scaleMultiple, '===========landscape');
-      //   setScaleMultiple(-2);
-      // } else {
-      //   // 竖屏时 将屏幕播放比例设为按宽按高
-
-      //   console.log(scaleMultiple, '===========landscape');
-      //   setScaleMultiple(playerFit === 'contain' ? (scaleMultiple === 1 ? -1 : 1) : -2);
-      // }
-      // 强制更改页面转向
-      setPageOrientation({
-        pageOrientation,
-        success: () => {
-          console.log('success');
-        },
-        fail: err => {
-          console.log('err', err);
-        }
-      });
-    }
-  });
-
   /**
    * 监听屏幕布局变化
    */
   usePageEvent('onResize', useMemoizedFn(sizeData => {
-    // if (typeof ty?.onOrientationChange === 'function') {
-    //   return;
-    // }
-    console.log(getPlayerRoute(), 'getPlayerRoute()');
-    if (getPlayerRoute() !== 'pages/home/index') {
-      // 不是Player首页的话，禁止以下行为
-      return;
-    }
     try {
       const {
         type
       } = sizeData;
       console.log('监听到屏幕布局变化', type);
       const {
+        platform,
         deviceType
       } = systemInfo.current;
       //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
@@ -286,16 +136,34 @@ 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');
@@ -332,6 +200,27 @@ 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 = () => {
@@ -447,19 +336,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     if (playState !== PlayState.PLAYING) {
       console.log('非播放状态=======');
       console.log(currentZoomLevel, '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;
-      }
+      setScaleMultiple(currentZoomLevel);
     }
     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.18-beta-7",
+  "version": "0.0.19",
   "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.26-beta-1",
+    "@ray-js/ray-ipc-player": "^2.0.25",
     "@ray-js/ray-ipc-utils": "^1.1.10",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",