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

package/lib/ctx/multiCameraCtx.d.ts

@@ -36,6 +36,10 @@ export declare const useMultiCameraCtx: (props: Props) => {
      * ptz状态
      */
     ptzStatus: import("../interface").RetAtom<boolean>;
+    /**
+     * 多目设备支持的 dp
+     */
+    dpSupportMap: Record<"ptz_control" | "ipc_multi_locate_coor" | "zoom_control" | "ipc_multi_locate_coors" | "ipc_multi_ptz_control" | "ipc_multi_zoom_control", boolean>;
     /**
      * ipcPlayer extendProps
      */
@@ -44,6 +48,7 @@ export declare const useMultiCameraCtx: (props: Props) => {
         onSelectVideoIndex: (this: any, event: any) => void;
         onLayoutStatusChanged: (this: any, event: any) => void;
         onLocalizerViewLocated: (this: any, event: any) => Promise<void>;
+        onSwipeAtVideoIndex: (this: any, event: any) => Promise<void>;
     };
     /**
      * 设置布局样式

package/lib/ctx/multiCameraCtx.js

@@ -1,7 +1,9 @@
 import { getDpIdByCode, publishDps } from '@ray-js/ray-ipc-utils';
 import { useMemoizedFn } from 'ahooks';
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import { MultiCameraLayoutStyle, MultiCameraScreenMode } from '../interface';
+import { useDpSupport } from '../hooks';
+import { GUN_BALL, MULTI_GUN_BALL, MULTI_PTZ_CONTROL, MULTI_ZOOM_CONTROL, PTZ_CONTROL, ZOOM_CONTROL } from '../utils/content/dpCode';
 import { useAtom } from './store';
 const DEFAULT_VIDEO_SPLIT_PROTOCOL = {
   total_split_num: 1,
@@ -9,6 +11,7 @@ const DEFAULT_VIDEO_SPLIT_PROTOCOL = {
   align_info: [],
   p_v: 3
 };
+const DP_CODES = [PTZ_CONTROL, GUN_BALL, ZOOM_CONTROL, MULTI_GUN_BALL, MULTI_PTZ_CONTROL, MULTI_ZOOM_CONTROL];
 /**
  * 多目摄像头相关状态、方法维护
  */
@@ -21,6 +24,13 @@ export const useMultiCameraCtx = props => {
   const isSupport = useMemo(() => {
     return (videoSplitProtocol === null || videoSplitProtocol === void 0 ? void 0 : videoSplitProtocol.total_split_num) > 1 && (videoSplitProtocol === null || videoSplitProtocol === void 0 ? void 0 : videoSplitProtocol.p_v) >= 3 && typeof (IPCPlayerInstance === null || IPCPlayerInstance === void 0 ? void 0 : IPCPlayerInstance.switchLayoutStyle) === 'function';
   }, [IPCPlayerInstance, videoSplitProtocol]);
+  const dpSupportMap = useDpSupport({
+    devId,
+    dpCodes: DP_CODES
+  });
+
+  // PTZ控制定时器
+  const ptzTimerRef = useRef(null);
   const [layoutStyleAtom, setLayoutStyle] = useAtom(isSupport ? MultiCameraLayoutStyle.tile : MultiCameraLayoutStyle.pip);
   const [screenModeAtom, setScreenMode] = useAtom(isSupport ? MultiCameraScreenMode.full : MultiCameraScreenMode.short);
   const [selectedLenInfoAtom, setSelectedLenInfo] = useAtom({
@@ -46,23 +56,111 @@ export const useMultiCameraCtx = props => {
     setScreenMode(screenMode);
   });
   const handleLocalizerViewLocated = useMemoizedFn(async event => {
+    var _event$detail;
     console.info('onLocalizerViewLocated', JSON.stringify(event === null || event === void 0 ? void 0 : event.detail));
-    const dpData = await getDpIdByCode(devId, 'ipc_multi_locate_coors');
+    const locateDpConfig = dpSupportMap.ipc_multi_locate_coors ? {
+      code: 'ipc_multi_locate_coors',
+      value: JSON.stringify(event.detail)
+    } : dpSupportMap.ipc_multi_locate_coor ? {
+      code: 'ipc_multi_locate_coor',
+      value: String((_event$detail = event.detail) === null || _event$detail === void 0 ? void 0 : _event$detail.coor)
+    } // 兼容老 dp
+    : null;
+    if (!locateDpConfig) return;
+    const dpData = await getDpIdByCode(devId, locateDpConfig.code);
     if (dpData.code === 0) {
-      const dpId = dpData.data;
-      const sndDpValue = JSON.stringify(event.detail);
       publishDps(devId, {
-        [dpId]: sndDpValue
+        [dpData.data]: locateDpConfig.value
       });
     }
   });
+  const handleSwipeAtVideoIndex = useMemoizedFn(async event => {
+    console.info('onSwipeAtVideoIndex', JSON.stringify(event === null || event === void 0 ? void 0 : event.detail));
+    const {
+      index,
+      direction,
+      isStop
+    } = (event === null || event === void 0 ? void 0 : event.detail) || {};
+
+    // 停止当前PTZ的通用方法
+    const stopPtz = async () => {
+      const stopConfig = dpSupportMap.ipc_multi_ptz_control ? {
+        code: 'ipc_multi_ptz_stop',
+        value: JSON.stringify({
+          index
+        })
+      } : dpSupportMap.ptz_control ? {
+        code: 'ptz_stop',
+        value: true
+      } : null;
+      if (stopConfig) {
+        const ptzStopData = await getDpIdByCode(devId, stopConfig.code);
+        if (ptzStopData.code === 0) {
+          publishDps(devId, {
+            [ptzStopData.data]: stopConfig.value
+          });
+        }
+      }
+
+      // 清除定时器
+      if (ptzTimerRef.current) {
+        clearInterval(ptzTimerRef.current);
+        ptzTimerRef.current = null;
+      }
+    };
+
+    // isStop === true 表示结束事件，只需停止PTZ
+    if (isStop) {
+      await stopPtz();
+      return;
+    }
+
+    // !isStop 表示开始事件或方向变化事件
+    // 先停止旧方向，再启动新方向
+    if (!isStop) {
+      // 1. 先停止之前的PTZ控制（如果有）
+      await stopPtz();
+
+      // 2. 构建新方向的PTZ配置
+      const ptzConfig = dpSupportMap.ipc_multi_ptz_control ? {
+        code: 'ipc_multi_ptz_control',
+        value: JSON.stringify({
+          index,
+          direction: String(direction)
+        })
+      } : dpSupportMap.ptz_control ? {
+        code: 'ptz_control',
+        value: String(direction)
+      } : null;
+      if (!ptzConfig) return;
+
+      // 3. 启动新方向的PTZ控制
+      const dpData = await getDpIdByCode(devId, ptzConfig.code);
+      if (dpData.code === 0) {
+        const ptzControlId = dpData.data;
+
+        // 立即发送一次新方向
+        publishDps(devId, {
+          [ptzControlId]: ptzConfig.value
+        });
+
+        // 每秒持续发送新方向
+        ptzTimerRef.current = setInterval(() => {
+          publishDps(devId, {
+            [ptzControlId]: ptzConfig.value
+          });
+        }, 1000);
+      }
+    }
+  });
   const extendProps = useMemo(() => {
     return {
       // type: 4 表示多目摄像头
       type: isSupport ? 4 : undefined,
       onSelectVideoIndex: handleSelectVideoIndex,
       onLayoutStatusChanged: handleLayoutStatusChanged,
-      onLocalizerViewLocated: handleLocalizerViewLocated
+      onLocalizerViewLocated: handleLocalizerViewLocated,
+      onSwipeAtVideoIndex: handleSwipeAtVideoIndex
     };
   }, [videoSplitProtocol]);
   const _setLayoutStyle = useMemoizedFn(style => {
@@ -145,6 +243,10 @@ export const useMultiCameraCtx = props => {
      * ptz状态
      */
     ptzStatus: ptzStatusAtom,
+    /**
+     * 多目设备支持的 dp
+     */
+    dpSupportMap,
     /**
      * ipcPlayer extendProps
      */

package/lib/hooks/index.d.ts

@@ -5,3 +5,4 @@ export * from './useDpState';
 export * from './useMemoizedFn';
 export * from './usePtz';
 export * from './useSchemaInfo.tsx';
+export * from './useDpSupport';

package/lib/hooks/index.js

@@ -4,4 +4,5 @@ export * from './useTemperature';
 export * from './useDpState';
 export * from './useMemoizedFn';
 export * from './usePtz';
-export * from './useSchemaInfo.tsx';
+export * from './useSchemaInfo.tsx';
+export * from './useDpSupport';

package/lib/hooks/useDpSupport/index.d.ts

@@ -0,0 +1,6 @@
+interface Options {
+    devId?: string;
+    dpCodes: string[];
+}
+export declare function useDpSupport(options: Options): Record<string, boolean>;
+export {};

package/lib/hooks/useDpSupport/index.js

@@ -0,0 +1,47 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.reduce.js";
+import { useEffect, useState } from 'react';
+import { getDeviceInfo } from '@ray-js/ray';
+export function useDpSupport(options) {
+  const {
+    devId,
+    dpCodes
+  } = options;
+  const [supportedMap, setSupportedMap] = useState(() => {
+    var _dpCodes$reduce;
+    return (_dpCodes$reduce = dpCodes === null || dpCodes === void 0 ? void 0 : dpCodes.reduce((acc, code) => {
+      acc[code] = false;
+      return acc;
+    }, {})) !== null && _dpCodes$reduce !== void 0 ? _dpCodes$reduce : {};
+  });
+  useEffect(() => {
+    if (!devId || !Array.isArray(dpCodes) || dpCodes.length === 0) {
+      var _dpCodes$reduce2;
+      setSupportedMap((_dpCodes$reduce2 = dpCodes === null || dpCodes === void 0 ? void 0 : dpCodes.reduce((acc, code) => {
+        acc[code] = false;
+        return acc;
+      }, {})) !== null && _dpCodes$reduce2 !== void 0 ? _dpCodes$reduce2 : {});
+      return;
+    }
+    getDeviceInfo({
+      deviceId: devId,
+      success: res => {
+        const schemaList = Array.isArray(res === null || res === void 0 ? void 0 : res.schema) ? res.schema : [];
+        const schemaCodes = new Set(schemaList.map(item => item.code));
+        const nextMap = dpCodes.reduce((acc, code) => {
+          acc[code] = schemaCodes.has(code);
+          return acc;
+        }, {});
+        setSupportedMap(nextMap);
+      },
+      fail: () => {
+        setSupportedMap(dpCodes.reduce((acc, code) => {
+          acc[code] = false;
+          return acc;
+        }, {}));
+      }
+    });
+  }, [devId, dpCodes]);
+  return supportedMap;
+}

package/lib/utils/content/dpCode.d.ts

@@ -3,3 +3,8 @@ export declare const TEMP_REPORT_F = "temp_report_f";
 export declare const SENSOR_TEMPERATURE = "sensor_temperature";
 export declare const SENSOR_HUMIDITY = "sensor_humidity";
 export declare const PTZ_CONTROL = "ptz_control";
+export declare const GUN_BALL = "ipc_multi_locate_coor";
+export declare const ZOOM_CONTROL = "zoom_control";
+export declare const MULTI_GUN_BALL = "ipc_multi_locate_coors";
+export declare const MULTI_PTZ_CONTROL = "ipc_multi_ptz_control";
+export declare const MULTI_ZOOM_CONTROL = "ipc_multi_zoom_control";

package/lib/utils/content/dpCode.js

@@ -6,4 +6,14 @@ export const SENSOR_TEMPERATURE = 'sensor_temperature'; //  摄氏度
 
 export const SENSOR_HUMIDITY = 'sensor_humidity'; // 湿度
 
-export const PTZ_CONTROL = 'ptz_control'; // ptz
+export const PTZ_CONTROL = 'ptz_control'; // ptz
+
+export const GUN_BALL = 'ipc_multi_locate_coor'; // 旧枪球联动-定位器
+
+export const ZOOM_CONTROL = 'zoom_control'; // 变焦控制
+
+export const MULTI_GUN_BALL = 'ipc_multi_locate_coors'; // 多目枪球联动-定位器
+
+export const MULTI_PTZ_CONTROL = 'ipc_multi_ptz_control'; // 多目 PTZ 控制
+
+export const MULTI_ZOOM_CONTROL = 'ipc_multi_zoom_control'; // 多目 变焦控制

package/lib/widgets/battery/battery.composition.d.ts

@@ -60,11 +60,13 @@ export declare const Battery: import("react").FunctionComponent<{
         nextLayoutStyle: import("../..").RetAtom<import("../..").MultiCameraLayoutStyle>;
         selectedLenInfo: import("../..").RetAtom<import("../..").MultiCameraLenInfo>;
         ptzStatus: import("../..").RetAtom<boolean>;
+        dpSupportMap: Record<"ptz_control" | "ipc_multi_locate_coor" | "zoom_control" | "ipc_multi_locate_coors" | "ipc_multi_ptz_control" | "ipc_multi_zoom_control", boolean>;
         extendProps: {
             type: number | undefined;
             onSelectVideoIndex: (this: any, event: any) => void;
             onLayoutStatusChanged: (this: any, event: any) => void;
             onLocalizerViewLocated: (this: any, event: any) => Promise<void>;
+            onSwipeAtVideoIndex: (this: any, event: any) => Promise<void>;
         };
         setLayoutStyle: (style: import("../..").MultiCameraLayoutStyle) => void;
         setScreenMode: (mode: import("../..").MultiCameraScreenMode) => void;
@@ -137,11 +139,13 @@ export declare const BatteryFull: import("react").FunctionComponent<{
         nextLayoutStyle: import("../..").RetAtom<import("../..").MultiCameraLayoutStyle>;
         selectedLenInfo: import("../..").RetAtom<import("../..").MultiCameraLenInfo>;
         ptzStatus: import("../..").RetAtom<boolean>;
+        dpSupportMap: Record<"ptz_control" | "ipc_multi_locate_coor" | "zoom_control" | "ipc_multi_locate_coors" | "ipc_multi_ptz_control" | "ipc_multi_zoom_control", boolean>;
         extendProps: {
             type: number | undefined;
             onSelectVideoIndex: (this: any, event: any) => void;
             onLayoutStatusChanged: (this: any, event: any) => void;
             onLocalizerViewLocated: (this: any, event: any) => Promise<void>;
+            onSwipeAtVideoIndex: (this: any, event: any) => Promise<void>;
         };
         setLayoutStyle: (style: import("../..").MultiCameraLayoutStyle) => void;
         setScreenMode: (mode: import("../..").MultiCameraScreenMode) => void;

package/lib/widgets/multiCamera/index.less

@@ -44,7 +44,7 @@
   --app-native-btn-bg-color: transparent;
   --ptz-border-color: rgba(255, 255, 255, 0.2);
   --ptz-arrow-icon-color: #fff;
-  --ptz-circle-inner-bg-color: rgba(255, 255, 255, 0.65);
+  --ptz-circle-inner-bg-color: rgba(255, 255, 255, 1);
 }
 
 .@{prefix}-tile-tip-wrap {

package/lib/widgets/multiCamera/moveablePtzControl.js

@@ -74,6 +74,9 @@ export const MoveablePtzControlItem = props => {
     selectedLenInfo: multiCameraCtx.selectedLenInfo,
     screenMode: multiCameraCtx.screenMode
   });
+  const {
+    dpSupportMap
+  } = multiCameraCtx;
   const [style, setStyle] = useState({
     positionLeft,
     positionBottom,
@@ -85,6 +88,75 @@ export const MoveablePtzControlItem = props => {
     pageY: 0
   });
   const canMoveRef = useRef(false);
+
+  // 获取播放器容器尺寸用于边界限制
+  const containerInfo = useRef({
+    width: 0,
+    height: 0,
+    top: 0,
+    left: 0
+  });
+  // 动态获取组件实际尺寸
+  const componentSizeRef = useRef({
+    width: 0,
+    height: 0
+  });
+  // 控制栏高度：竖屏 48px，横屏 72px
+  const controlBarHeight = screenMode === MultiCameraScreenMode.landscape ? 72 : 48;
+  useEffect(() => {
+    // 使用 createSelectorQuery 查询播放器容器和组件的实际尺寸
+    const query = ty.createSelectorQuery();
+    query.select('.ipc-player-content').boundingClientRect().exec(res => {
+      const rect = res === null || res === void 0 ? void 0 : res[0];
+      if (rect) {
+        containerInfo.current = {
+          width: rect.width,
+          height: rect.height,
+          top: rect.top,
+          left: rect.left
+        };
+      }
+    });
+
+    // 查询 PTZ 控件的实际尺寸
+    setTimeout(() => {
+      const ptzQuery = ty.createSelectorQuery();
+      ptzQuery.select(`.${multiPrefix}-moveable-ptz-control`).boundingClientRect().exec(res => {
+        const rect = res === null || res === void 0 ? void 0 : res[0];
+        if (rect) {
+          componentSizeRef.current = {
+            width: rect.width,
+            height: rect.height
+          };
+        }
+      });
+    }, 100);
+  }, [screenMode, selectedLenInfo]);
+
+  // 边界限制函数
+  // 注意：组件使用 bottom 定位，bottom 值越大组件越往上
+  const clampPosition = (left, bottom) => {
+    const {
+      width,
+      height
+    } = containerInfo.current;
+    const componentSize = componentSizeRef.current;
+
+    // 如果还没获取到组件尺寸，使用默认值
+    const compWidth = componentSize.width || 238;
+    const compHeight = componentSize.height || 172;
+
+    // 左右边界：0 到 容器宽度 - 组件宽度
+    const clampedLeft = Math.max(0, Math.min(left, width - compWidth));
+    // bottom 边界：
+    // - 最小值：控制栏高度（底部不能被控制栏遮挡）
+    // - 最大值：容器高度 - 组件高度（顶部不能超出容器）
+    const clampedBottom = Math.max(controlBarHeight, Math.min(bottom, height - compHeight));
+    return {
+      positionLeft: clampedLeft,
+      positionBottom: clampedBottom
+    };
+  };
   const {
     event
   } = useContext(UIEventContext);
@@ -112,22 +184,29 @@ export const MoveablePtzControlItem = props => {
       event: touchEvent
     } = data;
     touchEvent.stopPropagation();
-    const dpData = await getDpIdByCode(devId, 'ipc_multi_ptz_control');
+    const dpValue = _get(_find(ptzData.current, {
+      type
+    }), 'dpValue', null);
+    const ptzConfig = dpSupportMap.ipc_multi_ptz_control ? {
+      code: 'ipc_multi_ptz_control',
+      value: JSON.stringify({
+        index: selectedLenInfo.index,
+        direction: dpValue
+      })
+    } : dpSupportMap.ptz_control ? {
+      code: 'ptz_control',
+      value: dpValue
+    } : null;
+    if (!ptzConfig) return;
+    const dpData = await getDpIdByCode(devId, ptzConfig.code);
     if (dpData.code === 0) {
       const ptzControlId = dpData.data;
-      const direction = _get(_find(ptzData.current, {
-        type
-      }), 'dpValue', null);
-      const sndDpValue = JSON.stringify({
-        index: selectedLenInfo.index,
-        direction
-      });
       publishDps(devId, {
-        [ptzControlId]: sndDpValue
+        [ptzControlId]: ptzConfig.value
       });
       ptzTimeId.current = setInterval(() => {
         publishDps(devId, {
-          [ptzControlId]: sndDpValue
+          [ptzControlId]: ptzConfig.value
         });
       }, 1000);
     }
@@ -139,22 +218,29 @@ export const MoveablePtzControlItem = props => {
       event: touchEvent
     } = data;
     touchEvent.stopPropagation();
-    const dpData = await getDpIdByCode(devId, 'ipc_multi_zoom_control');
-    if (dpData.code === 0) {
-      const ptzControlId = dpData.data;
-      const control = _get(_find(ptzData.current, {
-        type
-      }), 'dpValue', null);
-      const sndDpValue = JSON.stringify({
+    const dpValue = _get(_find(zoomData.current, {
+      type
+    }), 'dpValue', null);
+    const zoomConfig = dpSupportMap.ipc_multi_zoom_control ? {
+      code: 'ipc_multi_zoom_control',
+      value: JSON.stringify({
         index: selectedLenInfo.index,
-        control
-      });
+        control: dpValue
+      })
+    } : dpSupportMap.zoom_control ? {
+      code: 'zoom_control',
+      value: dpValue
+    } : null;
+    if (!zoomConfig) return;
+    const dpData = await getDpIdByCode(devId, zoomConfig.code);
+    if (dpData.code === 0) {
+      const zoomControlId = dpData.data;
       publishDps(devId, {
-        [ptzControlId]: sndDpValue
+        [zoomControlId]: zoomConfig.value
       });
       ptzTimeId.current = setInterval(() => {
         publishDps(devId, {
-          [ptzControlId]: sndDpValue
+          [zoomControlId]: zoomConfig.value
         });
       }, 1000);
     }
@@ -177,8 +263,17 @@ export const MoveablePtzControlItem = props => {
         pageX,
         pageY
       } = event.changedTouches[0];
+      const deltaX = pageX - pageStartRef.current.pageX;
+      const deltaY = pageY - pageStartRef.current.pageY;
+      const newLeft = style.positionLeft + deltaX;
+      const newBottom = style.positionBottom - deltaY;
+
+      // 应用边界限制
+      const clamped = clampPosition(newLeft, newBottom);
+      const clampedDeltaX = clamped.positionLeft - style.positionLeft;
+      const clampedDeltaY = style.positionBottom - clamped.positionBottom;
       (_moveDomRef$current = moveDomRef.current) === null || _moveDomRef$current === void 0 || _moveDomRef$current.setStyle({
-        transform: `translateY(${pageY - pageStartRef.current.pageY}px) translateX(${pageX - pageStartRef.current.pageX}px)`
+        transform: `translateY(${clampedDeltaY}px) translateX(${clampedDeltaX}px)`
       });
     },
     onTouchStart: event => {
@@ -208,10 +303,10 @@ export const MoveablePtzControlItem = props => {
       const deltaY = pageY - pageStartRef.current.pageY;
       const newPositionLeft = deltaX + style.positionLeft;
       const newPositionBottom = style.positionBottom - deltaY;
-      onDragEnd === null || onDragEnd === void 0 || onDragEnd({
-        positionLeft: newPositionLeft,
-        positionBottom: newPositionBottom
-      });
+
+      // 应用边界限制
+      const clamped = clampPosition(newPositionLeft, newPositionBottom);
+      onDragEnd === null || onDragEnd === void 0 || onDragEnd(clamped);
       ty.nativeDisabled(false);
     }
   }, /*#__PURE__*/React.createElement(IpcPtzZoom, {
@@ -223,15 +318,22 @@ export const MoveablePtzControlItem = props => {
     onTouchPtzStart: onTouchPtzStart,
     onTouchPtzEnd: async () => {
       screenMode === MultiCameraScreenMode.landscape && event.emit(startTimeToHideAllComponent);
-      const ptzStopData = await getDpIdByCode(devId, 'ipc_multi_ptz_stop');
-      if (ptzStopData.code === 0) {
-        const ptzStopId = ptzStopData.data;
-        const sendDpValue = JSON.stringify({
+      const stopConfig = dpSupportMap.ipc_multi_ptz_control ? {
+        code: 'ipc_multi_ptz_stop',
+        value: JSON.stringify({
           index: selectedLenInfo.index
-        });
-        publishDps(devId, {
-          [ptzStopId]: sendDpValue
-        });
+        })
+      } : dpSupportMap.ptz_control ? {
+        code: 'ptz_stop',
+        value: true
+      } : null;
+      if (stopConfig) {
+        const ptzStopData = await getDpIdByCode(devId, stopConfig.code);
+        if (ptzStopData.code === 0) {
+          publishDps(devId, {
+            [ptzStopData.data]: stopConfig.value
+          });
+        }
       }
       if (ptzTimeId.current) {
         clearInterval(ptzTimeId.current);
@@ -241,15 +343,22 @@ export const MoveablePtzControlItem = props => {
     onTouchZoomStart: onTouchZoomStart,
     onTouchZoomEnd: async () => {
       screenMode === MultiCameraScreenMode.landscape && event.emit(startTimeToHideAllComponent);
-      const ptzStopData = await getDpIdByCode(devId, 'ipc_multi_zoom_stop');
-      if (ptzStopData.code === 0) {
-        const ptzStopId = ptzStopData.data;
-        const sendDpValue = JSON.stringify({
+      const stopConfig = dpSupportMap.ipc_multi_zoom_control ? {
+        code: 'ipc_multi_zoom_stop',
+        value: JSON.stringify({
           index: selectedLenInfo.index
-        });
-        publishDps(devId, {
-          [ptzStopId]: sendDpValue
-        });
+        })
+      } : dpSupportMap.zoom_control ? {
+        code: 'zoom_stop',
+        value: true
+      } : null;
+      if (stopConfig) {
+        const zoomStopData = await getDpIdByCode(devId, stopConfig.code);
+        if (zoomStopData.code === 0) {
+          publishDps(devId, {
+            [zoomStopData.data]: stopConfig.value
+          });
+        }
       }
       if (ptzTimeId.current) {
         clearInterval(ptzTimeId.current);

package/lib/widgets/voiceIntercom/voiceIntercom.d.ts

@@ -63,11 +63,13 @@ export declare const VoiceIntercom: React.ForwardRefExoticComponent<{
         nextLayoutStyle: import("../../interface").RetAtom<import("../../interface").MultiCameraLayoutStyle>;
         selectedLenInfo: import("../../interface").RetAtom<import("../../interface").MultiCameraLenInfo>;
         ptzStatus: import("../../interface").RetAtom<boolean>;
+        dpSupportMap: Record<"ptz_control" | "ipc_multi_locate_coor" | "zoom_control" | "ipc_multi_locate_coors" | "ipc_multi_ptz_control" | "ipc_multi_zoom_control", boolean>;
         extendProps: {
             type: number | undefined;
             onSelectVideoIndex: (this: any, event: any) => void;
             onLayoutStatusChanged: (this: any, event: any) => void;
             onLocalizerViewLocated: (this: any, event: any) => Promise<void>;
+            onSwipeAtVideoIndex: (this: any, event: any) => Promise<void>;
         };
         setLayoutStyle: (style: import("../../interface").MultiCameraLayoutStyle) => void;
         setScreenMode: (mode: import("../../interface").MultiCameraScreenMode) => void;

package/package.json

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