@ray-js/ipc-player-integration 0.0.1-beta-16 → 0.0.1-beta-18

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/hooks/useHumidity/index.js

@@ -1,15 +1,20 @@
 import { useEffect, useState } from 'react';
 import { useDpState } from '../useDpState';
 import { SENSOR_HUMIDITY } from '../../utils/content/dpCode';
+import { showMathPowValue } from '../../utils/device';
 export const useHumidity = devId => {
   const [humidity, setHumidity] = useState('');
-  const [dpState] = useDpState({
+  const [dpState, schemaObj] = useDpState({
     devId,
     dpCodes: [SENSOR_HUMIDITY]
   });
   useEffect(() => {
     if (dpState[SENSOR_HUMIDITY] !== undefined) {
-      setHumidity(dpState[SENSOR_HUMIDITY] + '%');
+      var _schema$property;
+      const schema = schemaObj && schemaObj[SENSOR_HUMIDITY];
+      const scale = (schema === null || schema === void 0 || (_schema$property = schema.property) === null || _schema$property === void 0 ? void 0 : _schema$property.scale) || 0;
+      const value = showMathPowValue(dpState[SENSOR_HUMIDITY], scale);
+      setHumidity(value + '%');
     }
   }, [dpState]);
   return humidity;

package/lib/hooks/useTemperature/index.js

@@ -1,11 +1,12 @@
 import { useEffect, useState } from 'react';
 import { TEMP_REPORT_F, TEMP_UNIT_SELECT, SENSOR_TEMPERATURE } from '../../utils/content/dpCode';
 import { useDpState } from '../useDpState';
+import { showMathPowValue } from '../../utils/device';
 export const useTemperature = devId => {
   const [tempUnit, setTempUnit] = useState('');
   const [tempC, setTempC] = useState('');
   const [tempF, setTempF] = useState('');
-  const [dpState] = useDpState({
+  const [dpState, schemaObj] = useDpState({
     devId,
     dpCodes: [TEMP_UNIT_SELECT, SENSOR_TEMPERATURE, TEMP_REPORT_F]
   });
@@ -15,10 +16,18 @@ export const useTemperature = devId => {
       setTempUnit(dpState[TEMP_UNIT_SELECT] + '');
     }
     if (dpState[SENSOR_TEMPERATURE] !== undefined) {
-      setTempC(dpState[SENSOR_TEMPERATURE] + '°C');
+      var _schema$property;
+      const schema = schemaObj && schemaObj[SENSOR_TEMPERATURE];
+      const scale = (schema === null || schema === void 0 || (_schema$property = schema.property) === null || _schema$property === void 0 ? void 0 : _schema$property.scale) || 0;
+      const value = showMathPowValue(dpState[SENSOR_TEMPERATURE], scale);
+      setTempC(value + '°C');
     }
     if (dpState[TEMP_REPORT_F] !== undefined) {
-      setTempF(dpState[TEMP_REPORT_F] + '°F');
+      var _schema$property2;
+      const schema = schemaObj && schemaObj[TEMP_REPORT_F];
+      const scale = (schema === null || schema === void 0 || (_schema$property2 = schema.property) === null || _schema$property2 === void 0 ? void 0 : _schema$property2.scale) || 0;
+      const value = showMathPowValue(dpState[TEMP_REPORT_F], scale);
+      setTempF(value + '°F');
     }
   }, [dpState]);
   return {

package/lib/plugins/tempHumidity/tempHumidity.js

@@ -15,18 +15,19 @@ export const TempHumidity = props => {
   } = useTemperature(devId);
   const humidity = useHumidity(devId);
   const tempRender = () => {
-    if (tempUnit === '1') {
-      return tempF && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
+    if (tempUnit === '1' && tempF) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
         className: "ipc-player-plugin-tempHumidity-text-icon icon-panel icon-panel-temperature"
       }), /*#__PURE__*/React.createElement(Text, {
         className: "tempHumidity"
       }, tempF));
     }
-    return tempC && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
-      className: "ipc-player-plugin-tempHumidity-text-icon icon-panel icon-panel-temperature"
-    }), /*#__PURE__*/React.createElement(Text, null, tempC), /*#__PURE__*/React.createElement(Text, {
-      className: "ipc-player-plugin-tempHumidity-divider"
-    }, "/"));
+    if (tempC) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
+        className: "ipc-player-plugin-tempHumidity-text-icon icon-panel icon-panel-temperature"
+      }), /*#__PURE__*/React.createElement(Text, null, tempC));
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null);
   };
   const humRender = () => {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
@@ -35,13 +36,15 @@ export const TempHumidity = props => {
       className: "tempHumidity"
     }, `${humidity}`));
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (tempC || humidity) && /*#__PURE__*/React.createElement(View, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (tempC || tempF || humidity) && /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-tempHumidity', className)
   }, (() => {
-    if (tempC && humidity) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, tempRender(), humRender());
+    if ((tempC || tempUnit === '1' && tempF) && humidity) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, tempRender(), /*#__PURE__*/React.createElement(Text, {
+        className: "ipc-player-plugin-tempHumidity-divider"
+      }, "/"), humRender());
     }
-    if (tempC) {
+    if (tempC || tempUnit === '1' && tempF) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, tempRender());
     }
     if (humidity) {

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

@@ -9,5 +9,5 @@ export interface IDpCode {
     time: number;
     type: string;
 }
-export declare function getDpCodeObj(devId: string, dpCode: string): Promise<IDpCode | undefined>;
 export declare function getDpIdsByCodes<T extends string>(devId: string, dpIds: T[]): Promise<Record<T, string>>;
+export declare const showMathPowValue: (value: any, scale: any) => string | 0;

package/lib/utils/device/index.js

@@ -1,4 +1,3 @@
-import { getDpsInfos } from '@ray-js/ray';
 export function getDpValue(options) {
   return new Promise((resolve, reject) => {
     ty.device.getDeviceInfo({
@@ -21,30 +20,6 @@ export function getDpValue(options) {
     });
   });
 }
-export function getDpCodeObj(devId, dpCode) {
-  return new Promise((resolve, reject) => {
-    getDpsInfos({
-      devId: devId,
-      gwId: devId
-    }).then(res => {
-      let result;
-      for (let i = 0; i < res.length; i++) {
-        const ele = res[i];
-        const {
-          code,
-          value
-        } = ele;
-        if (code === dpCode) {
-          result = ele;
-          break;
-        }
-      }
-      resolve(result);
-    }).catch(error => {
-      reject(error);
-    });
-  });
-}
 export function getDpIdsByCodes(devId) {
   return new Promise((resolve, reject) => {
     ty.device.getDeviceInfo({
@@ -65,4 +40,16 @@ export function getDpIdsByCodes(devId) {
       }
     });
   });
-}
+}
+export const showMathPowValue = (value, scale) => {
+  if (isNaN(Number(value))) {
+    return 0;
+  }
+  let v = '';
+  if (scale === 0) {
+    v = (Number(value) / Math.pow(10, scale)).toFixed(0);
+  } else {
+    v = (Number(value) / Math.pow(10, scale)).toFixed(1);
+  }
+  return v;
+};

package/package.json

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