@ray-js/ipc-player-integration 0.0.18-beta-1 → 0.0.18-beta-3

package/lib/ui/ui.js

@@ -95,7 +95,29 @@ 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 {
@@ -112,24 +134,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       }
     }
   }, [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') {
@@ -162,6 +166,35 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听播放器实例创建完成
    */
 
+  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';
+      const {
+        deviceType
+      } = systemInfo.current;
+      //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
+      if (deviceType === 'pad') {
+        setScreenType('vertical');
+      }
+      // 强制更改页面转向
+      setPageOrientation({
+        pageOrientation,
+        success: () => {
+          console.log('success');
+        },
+        fail: err => {
+          console.log('err', err);
+        }
+      });
+    }
+  };
+
   /**
    * 监听屏幕布局变化
    */
@@ -170,10 +203,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       const {
         type
       } = sizeData;
-      console.log(type, 'type');
       console.log('监听到屏幕布局变化', type);
       const {
-        platform,
         deviceType
       } = systemInfo.current;
       //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
@@ -249,27 +280,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 = () => {
@@ -385,11 +395,19 @@ 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);
       }
-    } else if (!hasPlayedRef.current) {
-      hasPlayedRef.current = true;
+    }
+    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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.18-beta-1",
+  "version": "0.0.18-beta-3",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [