@ray-js/ipc-player-integration 0.0.1-beta-36 → 0.0.1-beta-37

package/lib/ctx/ctx.composition.js

@@ -75,7 +75,6 @@ const getMemoryState = devId => {
       if (res.code === -1) {
         return resolve(defaultValue);
       }
-      console.log(res, '========');
       const muteValue = res.data.microphoneSettings.cachedMuteMode === MuteMode.OFF;
       return resolve({
         mute: muteValue,

package/lib/ctx/ctx.js

@@ -82,8 +82,8 @@ export const createUseCtx = _ref => {
           console.log('==== getMemoryState ====', res);
           _setMute(res.mute);
           setIntercomMode(res.intercomMode);
-          _setResolution(res.resolution);
           setResolutionList(res.resolutionList);
+          _setResolution(res.resolution);
         });
       }
     }, [devId, _playState]);

package/lib/plugins/ptz/ptz.less

@@ -49,6 +49,12 @@
     }
 }
 
+.ipc-player-plugin-full-screen-ptz-disappear {
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
 .arrow-icon-wrapper {
   font-size: 25px;
   color: #707070;

package/lib/plugins/ptz/ptzControl.js

@@ -72,7 +72,8 @@ export const PtzControl = props => {
   }, []);
   return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-plugin-full-screen-ptz-control', {
-      'ipc-player-plugin-full-screen-ptz-control-hide': shouldHide || !isPtzActive
+      'ipc-player-plugin-full-screen-ptz-control-hide': shouldHide || !isPtzActive,
+      'ipc-player-plugin-full-screen-ptz-disappear': screenType === 'vertical'
     })
   }, /*#__PURE__*/React.createElement(IpcPtzZoom, {
     ptzSize: "172px",

package/lib/plugins/resolution/resolution.d.ts

@@ -4,7 +4,7 @@ import './resolution.less';
 export type ChangeResolutionWhenClick = ScreenType[];
 type Props = ComponentConfigProps & {
     className?: string;
-    changeResolutionWhenClick?: ChangeResolutionWhenClick;
+    verticalResolutionCustomClick?: boolean;
 };
 export declare const Resolution: (props: Props) => React.JSX.Element;
 export {};

package/lib/plugins/resolution/resolution.js

@@ -2,13 +2,13 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
 import React, { useContext } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import Strings from '../../i18n';
 import { FullResolutionControl } from './fullResolutionControl';
 import { fullResolutionId, pauseTimeToHideAllComponent, hideAllComponent } from '../../ui/constant';
 import { UIEventContext } from '../../ui/context';
 import { useStore } from '../../ctx/store';
 import './resolution.less';
-const defaultChangeResolutionWhenClick = ['full'];
 export const Resolution = props => {
   const {
     IPCPlayerContext,
@@ -16,7 +16,7 @@ export const Resolution = props => {
     addContent,
     hasContent,
     className,
-    changeResolutionWhenClick = defaultChangeResolutionWhenClick
+    verticalResolutionCustomClick
   } = props;
   const {
     resolution,
@@ -28,32 +28,33 @@ export const Resolution = props => {
   const {
     event
   } = useContext(UIEventContext);
-  return /*#__PURE__*/React.createElement(View, {
-    onClick: () => {
-      event.emit('resolutionBtnControlClick');
-      if (!(changeResolutionWhenClick !== null && changeResolutionWhenClick !== void 0 && changeResolutionWhenClick.length)) return false;
-      if (screenType === 'full' && defaultChangeResolutionWhenClick.includes(screenType)) {
-        event.emit(hideAllComponent);
-        if (hasContent('absolute', fullResolutionId)) {
-          event.emit('showFullResolutionControl');
-        } else {
-          addContent('absolute', {
-            id: fullResolutionId,
-            content: props => {
-              return /*#__PURE__*/React.createElement(FullResolutionControl, props);
-            },
-            absoluteContentClassName: 'ipc-player-plugin-full-resolution-control-wrap',
-            initProps: _objectSpread({}, props)
-          });
-        }
-        return false;
-      }
-      if (screenType === 'vertical' && defaultChangeResolutionWhenClick.includes(screenType)) {
-        setResolution(resolution === 'HD' ? 'SD' : 'HD');
+  const onResolution = useMemoizedFn(() => {
+    event.emit('resolutionBtnControlClick');
+    if (screenType === 'full') {
+      event.emit(hideAllComponent);
+      if (hasContent('absolute', fullResolutionId)) {
+        event.emit('showFullResolutionControl');
+      } else {
+        addContent('absolute', {
+          id: fullResolutionId,
+          content: props => {
+            return /*#__PURE__*/React.createElement(FullResolutionControl, props);
+          },
+          absoluteContentClassName: 'ipc-player-plugin-full-resolution-control-wrap',
+          initProps: _objectSpread({}, props)
+        });
       }
-      event.emit(pauseTimeToHideAllComponent);
-      return true;
-    },
+      return false;
+    }
+    if (verticalResolutionCustomClick) return false;
+    if (screenType === 'vertical') {
+      setResolution(resolution === 'HD' ? 'SD' : 'HD');
+    }
+    event.emit(pauseTimeToHideAllComponent);
+    return true;
+  });
+  return /*#__PURE__*/React.createElement(View, {
+    onClick: onResolution,
     className: clsx(className, screenType === 'vertical' ? 'ipc-player-plugin-resolution-vertical' : 'ipc-player-plugin-resolution-full')
   }, /*#__PURE__*/React.createElement(View, {
     className: "ipc-player-plugin-resolution"

package/lib/plugins/voiceIntercom/voiceIntercom.js

@@ -30,6 +30,8 @@ export const VoiceIntercom = props => {
   } = props;
   const [frame, setFrame] = useState(0);
   const talkingInterval = useRef(null);
+  // 每帧间隔（ms）
+
   const {
     event
   } = useContext(UIEventContext);
@@ -79,18 +81,43 @@ export const VoiceIntercom = props => {
     await setIntercom(false);
     event.emit(startTimeToHideAllComponent);
   };
+  // 获取 requestAnimationFrame 和兼容性回退
+  const requestFrame = callback => {
+    if (typeof requestAnimationFrame !== 'undefined') {
+      return requestAnimationFrame(callback);
+    }
+    return setTimeout(callback, 30); // 使用 setTimeout 模拟帧更新
+  };
+  const cancelFrame = id => {
+    if (typeof cancelAnimationFrame !== 'undefined') {
+      cancelAnimationFrame(id);
+    } else {
+      clearTimeout(id); // 清除 setTimeout
+    }
+  };
+
   /**
    * 处理对讲中动画
    */
   useEffect(() => {
-    if (intercom) {
-      talkingInterval.current = setInterval(() => {
-        setFrame(prevFrame => (prevFrame + 1) % 124); // 循环播放帧
-      }, 30); // 每帧间隔 15ms，加快动画速度
-    } else {
-      talkingInterval.current && clearInterval(talkingInterval.current);
-    }
-    return () => clearInterval(talkingInterval.current);
+    const updateFrame = () => {
+      setFrame(prevFrame => (prevFrame + 1) % 124);
+      talkingInterval.current = requestFrame(updateFrame);
+    };
+    const stopAnimation = () => {
+      if (talkingInterval.current) {
+        cancelFrame(talkingInterval.current);
+        talkingInterval.current = null;
+      }
+    };
+    intercom ? (() => {
+      if (!talkingInterval.current) {
+        talkingInterval.current = requestFrame(updateFrame);
+      }
+    })() : stopAnimation();
+    return () => {
+      stopAnimation();
+    };
   }, [intercom]);
 
   // 根据当前帧和矩形索引计算高度

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

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

package/lib/utils/plugins/index.js

@@ -1,11 +1,19 @@
+import _cloneDeep from 'lodash/cloneDeep';
 import { defaultTopLeftContent, defaultTopRightContent, defaultBottomLeftContent, defaultBottomRightContent } from '../../ctx';
 import { hasDpCode } from '../../utils/device';
 import { MoveInteractiveControlButton } from '../../plugins/moveInteractiveControl';
 // 根据当前 dp 信息决定设置哪些 plugin
-export async function initPlayerPlugins(ctx) {
+export async function initPlayerPlugins(ctx, options) {
   ctx.addContent('topLeft', defaultTopLeftContent);
   ctx.addContent('topRight', defaultTopRightContent);
-  ctx.addContent('bottomLeft', defaultBottomLeftContent);
+  const newDefaultBottomLeftContent = _cloneDeep(defaultBottomLeftContent);
+  const resolutionIndex = newDefaultBottomLeftContent.findIndex(item => item.id === 'Resolution');
+  if (resolutionIndex !== -1) {
+    newDefaultBottomLeftContent[resolutionIndex].initProps = {
+      verticalResolutionCustomClick: options.verticalResolutionCustomClick
+    };
+  }
+  ctx.addContent('bottomLeft', newDefaultBottomLeftContent);
   ctx.addContent('bottomRight', defaultBottomRightContent);
 
   // 根据 ipc_manual_petting 是否存在，决定是否要插入控件 moveInteractiveControl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-36",
+  "version": "0.0.1-beta-37",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -36,7 +36,7 @@
     "ahooks": "^3.1.6"
   },
   "dependencies": {
-    "@ray-js/ipc-ptz-zoom": "0.0.2-beta-5",
+    "@ray-js/ipc-ptz-zoom": "0.0.2-beta-6",
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/ray-ipc-player": "2.0.20-beta-6",
     "@ray-js/ray-ipc-utils": "1.1.0-beta-13",