@ray-js/ipc-player-integration 0.0.45-beta.1 → 0.0.45-beta.2

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

@@ -1 +1,5 @@
-export declare const useWaterTemperature: (devId: string) => string;
+export declare const useWaterTemperature: (devId: string) => {
+    tempUnit: string;
+    waterTempC: string;
+    waterTempF: string;
+};

package/lib/hooks/useWaterTemperature/index.js

@@ -1,23 +1,38 @@
 import { useEffect, useState } from 'react';
 import { useDpState } from '../useDpState';
-import { IPC_WATER_TEMPERATURE } from '../../utils/content/dpCode';
+import { TEMP_UNIT_SELECT, IPC_WATER_TEMPERATURE, IPC_WATER_TEMPERATURE_F } from '../../utils/content/dpCode';
 import { showMathPowValue } from '../../utils/device';
 export const useWaterTemperature = devId => {
-  const [waterTemp, setWaterTemp] = useState('');
+  const [tempUnit, setTempUnit] = useState('');
+  const [waterTempC, setWaterTempC] = useState('');
+  const [waterTempF, setWaterTempF] = useState('');
   const [dpState, schemaObj] = useDpState({
     devId,
-    dpCodes: [IPC_WATER_TEMPERATURE]
+    dpCodes: [TEMP_UNIT_SELECT, IPC_WATER_TEMPERATURE, IPC_WATER_TEMPERATURE_F]
   });
   useEffect(() => {
-    var _schema$property;
-    if (dpState[IPC_WATER_TEMPERATURE] === undefined) {
-      setWaterTemp('');
-      return;
+    //  1=华氏度  0=摄氏度
+    if (dpState[TEMP_UNIT_SELECT] !== undefined) {
+      setTempUnit(dpState[TEMP_UNIT_SELECT] + '');
     }
-    const schema = schemaObj === null || schemaObj === void 0 ? void 0 : schemaObj[IPC_WATER_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[IPC_WATER_TEMPERATURE], scale);
-    setWaterTemp(`${value}°C`);
-  }, [dpState, schemaObj]);
-  return waterTemp;
+    if (dpState[IPC_WATER_TEMPERATURE] !== undefined) {
+      var _schema$property;
+      const schema = schemaObj && schemaObj[IPC_WATER_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[IPC_WATER_TEMPERATURE], scale);
+      setWaterTempC(value + '°C');
+    }
+    if (dpState[IPC_WATER_TEMPERATURE_F] !== undefined) {
+      var _schema$property2;
+      const schema = schemaObj && schemaObj[IPC_WATER_TEMPERATURE_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[IPC_WATER_TEMPERATURE_F], scale);
+      setWaterTempF(value + '°F');
+    }
+  }, [dpState]);
+  return {
+    tempUnit,
+    waterTempC,
+    waterTempF
+  };
 };

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

@@ -4,6 +4,7 @@ export declare const SENSOR_TEMPERATURE = "sensor_temperature";
 export declare const SENSOR_HUMIDITY = "sensor_humidity";
 export declare const IPC_EC = "ipc_ec";
 export declare const IPC_WATER_TEMPERATURE = "ipc_water_temperature";
+export declare const IPC_WATER_TEMPERATURE_F = "ipc_water_temperature_f";
 export declare const PTZ_CONTROL = "ptz_control";
 export declare const GUN_BALL = "ipc_multi_locate_coor";
 export declare const ZOOM_CONTROL = "zoom_control";

package/lib/utils/content/dpCode.js

@@ -8,7 +8,9 @@ export const SENSOR_HUMIDITY = 'sensor_humidity'; // 湿度
 
 export const IPC_EC = 'ipc_ec'; // EC 值（电导率）
 
-export const IPC_WATER_TEMPERATURE = 'ipc_water_temperature'; // 水温
+export const IPC_WATER_TEMPERATURE = 'ipc_water_temperature'; // 水温（摄氏度）
+
+export const IPC_WATER_TEMPERATURE_F = 'ipc_water_temperature_f'; // 水温（华氏度）
 
 export const PTZ_CONTROL = 'ptz_control'; // ptz
 

package/lib/widgets/tempHumidity/tempHumidity.js

@@ -19,7 +19,10 @@ export const TempHumidity = props => {
   } = useTemperature(devId);
   const humidity = useHumidity(devId);
   const ec = useEc(devId);
-  const waterTemp = useWaterTemperature(devId);
+  const {
+    waterTempC,
+    waterTempF
+  } = useWaterTemperature(devId);
   // 稳定 dpCodes 引用，避免每次渲染都生成新数组导致 useDpSupport 内 getDeviceInfo 被反复触发
   const dpCodes = useMemo(() => [...DP_CODES], []);
   const dpSupport = useDpSupport({
@@ -51,14 +54,15 @@ export const TempHumidity = props => {
       });
     }
     if (dpSupport[IPC_WATER_TEMPERATURE]) {
+      const waterTempText = tempUnit === '1' && waterTempF ? waterTempF : waterTempC || '--';
       list.push({
         key: 'waterTemp',
         iconClass: 'icon-panel-lvye1',
-        text: waterTemp || '--'
+        text: waterTempText
       });
     }
     return list;
-  }, [dpSupport, ec, tempUnit, tempF, tempC, humidity, waterTemp]);
+  }, [dpSupport, ec, tempUnit, tempF, tempC, humidity, waterTempC, waterTempF]);
   if (!items.length) {
     return null;
   }

package/package.json

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