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

package/lib/ui/ui.js

@@ -126,32 +126,35 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
           const {
             orientation
           } = ty.getOrientationSync();
+          console.log(`同步获取屏幕方向: ${orientation}`);
           ipcTTTOperatorLog(`同步获取屏幕方向: ${orientation}`);
-          setScreenType(orientation === 'landscape' ? 'full' : 'vertical');
+          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';
+            setScreenType(pageOrientation === 'landscape' ? 'full' : 'vertical');
+            // 强制更改页面转向
+            setPageOrientation({
+              pageOrientation,
+              success: () => {
+                console.log('success');
+              },
+              fail: err => {
+                console.log('err', err);
+              }
+            });
+          }
         }
       } 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') {
@@ -184,6 +187,36 @@ 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');
+        return;
+      }
+      // 强制更改页面转向
+      setPageOrientation({
+        pageOrientation,
+        success: () => {
+          console.log('success');
+        },
+        fail: err => {
+          console.log('err', err);
+        }
+      });
+    }
+  };
+
   /**
    * 监听屏幕布局变化
    */
@@ -384,16 +417,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);
       }
     }
     if (playState === PlayState.PLAYING) {
       // 仅在第一次播放成功时，针对竖屏并且为cover模式时，设置为-2
+      console.log('Playing状态');
       if (screenType === 'vertical' && playerFit === 'cover' && !hasPlayedRef.current) {
         setScaleMultiple(-2);
+        hasPlayedRef.current = true;
       }
-      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-2",
+  "version": "0.0.18-beta-4",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [