@ray-js/ipc-player-integration 0.0.1-beta-15 → 0.0.1-beta-17

package/lib/hooks/useDpState/useDpState.d.ts

@@ -2,5 +2,19 @@ type Options<T> = {
     devId: string;
     dpCodes: T[];
 };
-export declare function useDpState<T extends string>(options: Options<T>): [Record<T, number | string | boolean>];
+type Schema = {
+    id: number;
+    code: string;
+    mode: string;
+    property: {
+        type: 'value' | 'enum' | 'bool';
+        unit?: string;
+        min?: number;
+        max?: number;
+        scale?: number;
+        step?: number;
+        range?: Array<unknown>;
+    };
+};
+export declare function useDpState<T extends string>(options: Options<T>): [Record<T, number | string | boolean>, Record<string, Schema>];
 export {};

package/lib/hooks/useDpState/useDpState.js

@@ -14,6 +14,7 @@ export function useDpState(options) {
     dpCodes
   } = options;
   const codeMapToIdRef = useRef();
+  const dpCodeSchemaMapsRef = useRef();
   const [values, setValues] = useState(() => {
     return getInitData(options.dpCodes);
   });
@@ -42,38 +43,44 @@ export function useDpState(options) {
     }
   }, [devId]);
   useEffect(() => {
-    getDeviceInfo({
-      deviceId: devId,
-      success: res => {
-        const {
-          schema
-        } = res;
-        const IdMapToCode = {};
-        let count = 0;
-        for (const schemaItem of schema) {
-          // @ts-ignore
-          if (dpCodes.includes(schemaItem.code)) {
+    if (devId) {
+      getDeviceInfo({
+        deviceId: devId,
+        success: res => {
+          const {
+            schema
+          } = res;
+          const IdMapToCode = {};
+          const dpCodeSchemaMaps = {};
+          let count = 0;
+          for (const schemaItem of schema) {
             // @ts-ignore
-            IdMapToCode[schemaItem.id] = schemaItem.code;
-            count += 1;
+            if (dpCodes.includes(schemaItem.code)) {
+              // @ts-ignore
+              IdMapToCode[schemaItem.id] = schemaItem.code;
+              // @ts-ignore
+              dpCodeSchemaMaps[schemaItem.code] = schemaItem;
+              count += 1;
+            }
+            if (count >= dpCodes.length) break;
           }
-          if (count >= dpCodes.length) break;
+          codeMapToIdRef.current = IdMapToCode;
+          dpCodeSchemaMapsRef.current = dpCodeSchemaMaps;
+          const initValue = options.dpCodes.reduce((ret, key) => {
+            return _objectSpread(_objectSpread({}, ret), {}, {
+              [key]: res.dpCodes[key]
+            });
+          }, {});
+          setValues(initValue);
         }
-        codeMapToIdRef.current = IdMapToCode;
-        const initValue = options.dpCodes.reduce((ret, key) => {
-          return _objectSpread(_objectSpread({}, ret), {}, {
-            [key]: res.dpCodes[key]
-          });
-        }, {});
-        setValues(initValue);
-      }
-    });
-  }, [options.devId]);
+      });
+    }
+  }, [devId]);
   useEffect(() => {
     onDpDataChange(listenDpChange);
     return () => {
       offDpDataChange(listenDpChange);
     };
   }, [listenDpChange]);
-  return [values];
+  return [values, dpCodeSchemaMapsRef.current];
 }

package/lib/plugins/ptz/ptzControl.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useContext } from 'react';
 import { CoverView } from '@ray-js/ray';
 import clsx from 'clsx';
@@ -10,19 +9,21 @@ import { startTimeToHideAllComponent, pauseTimeToHideAllComponent } from '../../
 import './ptz.less';
 export const PtzControl = props => {
   const {
-    screenType
+    screenType,
+    brandColor
   } = useStore({
-    screenType: props.screenType
+    screenType: props.screenType,
+    brandColor: props.brandColor
   });
   const [shouldHide] = useComponentHideState(screenType);
   const {
     event
   } = useContext(UIEventContext);
-  return /*#__PURE__*/React.createElement(CoverView, _extends({
+  return /*#__PURE__*/React.createElement(CoverView, {
     className: clsx('ipc-player-plugin-full-screen-ptz-control', {
       'ipc-player-plugin-full-screen-ptz-control-hide': shouldHide
     })
-  }, props), /*#__PURE__*/React.createElement(IpcPtzZoom, {
+  }, /*#__PURE__*/React.createElement(IpcPtzZoom, {
     ptzSize: "172px",
     zoomData: [],
     ptzData: [{
@@ -58,7 +59,7 @@ export const PtzControl = props => {
       console.log('dsads');
       event.emit(startTimeToHideAllComponent);
     },
-    brandColor: "red",
+    brandColor: brandColor,
     iconClassName: clsx('arrow-icon-wrapper')
   }));
 };

package/lib/plugins/resolution/fullResolutionControl.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useContext } from 'react';
 import { Text, View } from '@ray-js/ray';
 import clsx from 'clsx';
@@ -42,19 +41,16 @@ export const FullResolutionControl = props => {
       setFullResolutionActive(false);
     }
   };
-  console.log(brandColor, 'brandColor');
-  console.log(resolution, 'resolution');
-  console.log(resolutionList, 'resolutionList');
-  return /*#__PURE__*/React.createElement(View, _extends({
+  return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-resolution-control', {
       'ipc-player-plugin-full-resolution-control-hide': shouldHide || !fullResolutionActive
     })
-  }, props), resolutionList.map(item => /*#__PURE__*/React.createElement(Text, {
+  }, resolutionList.map(item => /*#__PURE__*/React.createElement(Text, {
     onClick: () => changeResolution(item),
     key: item,
     className: clsx('ipc-player-plugin-full-resolution-control-text'),
     style: item === resolution && {
       color: brandColor
     }
-  }, Strings.getLang(`ipc_player_resolution_${item}`))));
+  }, I18n.t(`ipc_player_resolution_${item}`))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-15",
+  "version": "0.0.1-beta-17",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [