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

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
      */

package/lib/ctx/multiCameraCtx.js

@@ -2,6 +2,8 @@ import { getDpIdByCode, publishDps } from '@ray-js/ray-ipc-utils';
 import { useMemoizedFn } from 'ahooks';
 import { useMemo } 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,10 @@ 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
+  });
   const [layoutStyleAtom, setLayoutStyle] = useAtom(isSupport ? MultiCameraLayoutStyle.tile : MultiCameraLayoutStyle.pip);
   const [screenModeAtom, setScreenMode] = useAtom(isSupport ? MultiCameraScreenMode.full : MultiCameraScreenMode.short);
   const [selectedLenInfoAtom, setSelectedLenInfo] = useAtom({
@@ -46,19 +53,28 @@ 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 extendProps = useMemo(() => {
     return {
-      type: isSupport ? 3 : undefined,
+      // type: 4 表示多目摄像头
+      type: isSupport ? 4 : undefined,
       onSelectVideoIndex: handleSelectVideoIndex,
       onLayoutStatusChanged: handleLayoutStatusChanged,
       onLocalizerViewLocated: handleLocalizerViewLocated
@@ -144,6 +160,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,6 +60,7 @@ 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;
@@ -137,6 +138,7 @@ 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;

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,
@@ -112,22 +115,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 +149,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);
     }
@@ -223,15 +240,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 +265,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,6 +63,7 @@ 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;
@@ -73,9 +74,6 @@ export declare const VoiceIntercom: React.ForwardRefExoticComponent<{
         setScreenMode: (mode: import("../../interface").MultiCameraScreenMode) => void;
         setPtzStatus: (value: boolean | ((prevValue: boolean) => boolean)) => void;
         showLenNames: (value: boolean) => void;
-        /**
-         * 处理对讲中动画
-         */
         setNextLayoutStyle: (value: import("../../interface").MultiCameraLayoutStyle | ((prevValue: import("../../interface").MultiCameraLayoutStyle) => import("../../interface").MultiCameraLayoutStyle)) => void;
         getNextLayoutStyle: () => Promise<import("../../interface").MultiCameraLayoutStyle>;
     };

package/package.json

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