@ray-js/ipc-player-integration 0.0.1-beta-42 → 0.0.1-beta-44

package/lib/ctx/ctx.js

@@ -50,7 +50,6 @@ export const createUseCtx = _ref => {
 
     // 竖屏下是否展示对讲, 默认展示
     const [verticalMic, setVerticalMic] = useAtom(true);
-
     // resolution 当前清晰度
     const [resolution] = useAtom('HD');
     // resolution 清晰度列表

package/lib/plugins/fullScreen/fullScreen.d.ts

@@ -3,6 +3,7 @@ import './fullScreen.less';
 import type { ComponentConfigProps } from '../../interface';
 type Props = ComponentConfigProps & {
     className?: string;
+    hideHorizontalMenu?: boolean;
 };
 export declare function FullScreen(props: Props): React.JSX.Element | null;
 export {};

package/lib/plugins/fullScreen/fullScreen.js

@@ -21,7 +21,8 @@ export function FullScreen(props) {
     deleteContent,
     className,
     showContent,
-    devId
+    devId,
+    hideHorizontalMenu
   } = props;
   const {
     screenType
@@ -120,7 +121,7 @@ export function FullScreen(props) {
       }
     });
   };
-  if (screenType === 'full') return null;
+  if (screenType === 'full' || hideHorizontalMenu) return null;
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className),
     onClick: () => handClick('full')

package/lib/plugins/recordVideo/recordVideo.js

@@ -221,19 +221,27 @@ export function RecordVideo(props) {
         showShot: false
       });
     }
-    const recordInfo = await setRecording(target);
-    if (target) {
-      setRecordingDisabled(true);
-      setState({
-        showTimer: true
-      });
-      /** 录制开始后3秒后才可结束 */
-      timeToResetRecordDisabled();
-    } else {
+    try {
+      const recordInfo = await setRecording(target);
+      console.log(recordInfo, 'recordInfo====');
+      if (target) {
+        setRecordingDisabled(true);
+        setState({
+          showTimer: true
+        });
+        /** 录制开始后3秒后才可结束 */
+        timeToResetRecordDisabled();
+      } else {
+        setState({
+          showTimer: false,
+          showShot: true,
+          shotUrl: recordInfo.tempImagePath
+        });
+      }
+    } catch (err) {
+      console.log('录制失败', err);
       setState({
-        showTimer: false,
-        showShot: true,
-        shotUrl: recordInfo.tempImagePath
+        showTimer: false
       });
     }
     return true;

package/lib/ui/ui.js

@@ -83,11 +83,24 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 监听屏幕布局变化
    */
   usePageEvent('onResize', sizeData => {
-    const {
-      type
-    } = sizeData;
-    console.log('监听到屏幕布局变化', type);
-    setScreenType(type === 'landscape' ? 'full' : 'vertical');
+    try {
+      const {
+        type
+      } = sizeData;
+      console.log('监听到屏幕布局变化', type);
+      const {
+        platform,
+        deviceType
+      } = systemInfo.current;
+      //  针对pad 暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
+      if (deviceType === 'pad') {
+        setScreenType('vertical');
+      } else {
+        setScreenType(type === 'landscape' ? 'full' : 'vertical');
+      }
+    } catch (err) {
+      console.log(err, 'err');
+    }
   });
   const systemInfo = useRef(null);
   if (!systemInfo.current) {
@@ -234,7 +247,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     };
   }, []);
   const playerReady = playState === PlayState.PLAYING;
-  console.log('brandColor', 'brandColor');
   return /*#__PURE__*/React.createElement(UIEventContext.Provider, {
     value: {
       event: eventRef.current,
@@ -288,7 +300,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     onCameraNotifyWeakNetwork: data => {
       console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
     },
-    clarity: resolution === 'HD' ? 'hd' : 'normal',
+    clarity: resolution === 'HD' ? 'hd' : 'normal'
+    // 安卓横屏问题
+    ,
+    ptzControllable: screenType === 'vertical',
     privateState: privateState,
     onPlayerTap: data => {
       if (disablePlayerTap.current) {

package/lib/utils/plugins/index.d.ts

@@ -2,5 +2,6 @@ import { UseCtx } from '../../interface';
 type Ctx = ReturnType<UseCtx>;
 export declare function initPlayerPlugins(ctx: Ctx, options: {
     verticalResolutionCustomClick?: boolean;
+    hideHorizontalMenu?: boolean;
 }): Promise<void>;
 export {};

package/lib/utils/plugins/index.js

@@ -14,7 +14,14 @@ export async function initPlayerPlugins(ctx, options) {
     };
   }
   ctx.addContent('bottomLeft', newDefaultBottomLeftContent);
-  ctx.addContent('bottomRight', defaultBottomRightContent);
+  const newDefaultBottomRightContent = _cloneDeep(defaultBottomRightContent);
+  const fullScreenIndex = newDefaultBottomRightContent.findIndex(item => item.id === 'FullScreen');
+  if (fullScreenIndex !== -1) {
+    newDefaultBottomRightContent[fullScreenIndex].initProps = {
+      hideHorizontalMenu: options.hideHorizontalMenu
+    };
+  }
+  ctx.addContent('bottomRight', newDefaultBottomRightContent);
 
   // 根据 ipc_manual_petting 是否存在，决定是否要插入控件 moveInteractiveControl
   hasDpCode(ctx.devId, 'ipc_manual_petting').then(res => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-42",
+  "version": "0.0.1-beta-44",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -38,8 +38,8 @@
   "dependencies": {
     "@ray-js/ipc-ptz-zoom": "0.0.2-beta-7",
     "@ray-js/panel-sdk": "^1.13.1",
-    "@ray-js/ray-ipc-player": "2.0.20-beta-8",
-    "@ray-js/ray-ipc-utils": "1.1.0-beta-13",
+    "@ray-js/ray-ipc-player": "2.0.20-beta-10",
+    "@ray-js/ray-ipc-utils": "1.1.0-beta-15",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"