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

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/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon-panel"; /* Project id 4727767 */
-  src: url('iconfont.woff2?t=1782702695877') format('woff2'),
-       url('iconfont.woff?t=1782702695877') format('woff'),
-       url('iconfont.ttf?t=1782702695877') format('truetype');
+  src: url('iconfont.woff2?t=1784625396313') format('woff2'),
+       url('iconfont.woff?t=1784625396313') format('woff'),
+       url('iconfont.ttf?t=1784625396313') format('truetype');
 }
 
 .icon-panel {
@@ -13,19 +13,59 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-panel-lvye1:before {
+.icon-panel-v-alarm-light-siren:before {
+  content: "\e6d5";
+}
+
+.icon-panel-v-alarm-light:before {
+  content: "\e6d6";
+}
+
+.icon-panel-stream-standard:before {
+  content: "\e6d7";
+}
+
+.icon-panel-feature-track:before {
+  content: "\e6d0";
+}
+
+.icon-panel-v-alarm-siren:before {
+  content: "\e6d1";
+}
+
+.icon-panel-v-alarm-off:before {
+  content: "\e6d2";
+}
+
+.icon-panel-stream-flowing:before {
+  content: "\e6d3";
+}
+
+.icon-panel-anti-flicker:before {
+  content: "\e6d4";
+}
+
+.icon-panel-Access-Key-Password:before {
+  content: "\e643";
+}
+
+.icon-panel-Access-Play:before {
+  content: "\e6cf";
+}
+
+.icon-panel-plant_water_temp:before {
   content: "\e6ce";
 }
 
-.icon-panel-lvye:before {
+.icon-panel-plant_footer:before {
   content: "\e6cd";
 }
 
-.icon-panel-zhiwujilu:before {
+.icon-panel-plant_record:before {
   content: "\e6cc";
 }
 
-.icon-panel-shuiwei:before {
+.icon-panel-plant_water_level:before {
   content: "\e6c8";
 }
 
@@ -33,11 +73,11 @@
   content: "\e6c9";
 }
 
-.icon-panel-dengguang:before {
+.icon-panel-plant_light:before {
   content: "\e6ca";
 }
 
-.icon-panel-zongkaiguan:before {
+.icon-panel-plant_main_switch:before {
   content: "\e6cb";
 }
 
@@ -205,10 +245,6 @@
   content: "\e6a1";
 }
 
-.icon-panel-Access-Key-Password:before {
-  content: "\e643";
-}
-
 .icon-panel-Access-Mobile1:before {
   content: "\e638";
 }