@ray-js/ipc-player-integration 0.0.42 → 0.0.43-beta.1

package/lib/iconfont/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "icon-panel-",
   "description": "IPC 小程序公版",
   "glyphs": [
+    {
+      "icon_id": "47934817",
+      "name": "绿叶",
+      "font_class": "lvye1",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "47934689",
+      "name": "绿叶",
+      "font_class": "lvye",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "47917149",
+      "name": "植物记录",
+      "font_class": "zhiwujilu",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "47915428",
+      "name": "水位",
+      "font_class": "shuiwei",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "47915429",
+      "name": "EC值",
+      "font_class": "ECzhi",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "47915427",
+      "name": "灯光",
+      "font_class": "dengguang",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "47915426",
+      "name": "总开关",
+      "font_class": "zongkaiguan",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
     {
       "icon_id": "47777351",
       "name": "智能画质-关闭",

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

@@ -2,6 +2,8 @@ export declare const TEMP_UNIT_SELECT = "temp_unit_select";
 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 IPC_EC = "ipc_ec";
+export declare const IPC_WATER_TEMPERATURE = "ipc_water_temperature";
 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

@@ -6,6 +6,10 @@ export const SENSOR_TEMPERATURE = 'sensor_temperature'; //  摄氏度
 
 export const SENSOR_HUMIDITY = 'sensor_humidity'; // 湿度
 
+export const IPC_EC = 'ipc_ec'; // EC 值（电导率）
+
+export const IPC_WATER_TEMPERATURE = 'ipc_water_temperature'; // 水温
+
 export const PTZ_CONTROL = 'ptz_control'; // ptz
 
 export const GUN_BALL = 'ipc_multi_locate_coor'; // 旧枪球联动-定位器

package/lib/widgets/tempHumidity/tempHumidity.js

@@ -1,8 +1,12 @@
-import React from 'react';
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+import React, { useMemo } from 'react';
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
-import { useTemperature, useHumidity } from '../../hooks';
+import { useTemperature, useHumidity, useEc, useWaterTemperature, useDpSupport } from '../../hooks';
+import { IPC_EC, IPC_WATER_TEMPERATURE, SENSOR_HUMIDITY, SENSOR_TEMPERATURE } from '../../utils/content/dpCode';
 import './tempHumidity.less';
+const DP_CODES = [IPC_EC, SENSOR_TEMPERATURE, SENSOR_HUMIDITY, IPC_WATER_TEMPERATURE];
 export const TempHumidity = props => {
   const {
     className,
@@ -14,48 +18,61 @@ export const TempHumidity = props => {
     tempF
   } = useTemperature(devId);
   const humidity = useHumidity(devId);
-  const tempRender = () => {
-    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));
+  const ec = useEc(devId);
+  const waterTemp = useWaterTemperature(devId);
+  const dpSupport = useDpSupport({
+    devId,
+    dpCodes: [...DP_CODES]
+  });
+  const items = useMemo(() => {
+    const list = [];
+    if (dpSupport[IPC_EC]) {
+      list.push({
+        key: 'ec',
+        iconClass: 'icon-panel-ECzhi',
+        text: ec || '--'
+      });
     }
-    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));
+    if (dpSupport[SENSOR_TEMPERATURE]) {
+      const tempText = tempUnit === '1' && tempF ? tempF : tempC || '--';
+      list.push({
+        key: 'temp',
+        iconClass: 'icon-panel-temperature',
+        text: tempText
+      });
     }
-    return null;
-  };
-  const humRender = () => {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
-      className: "ipc-player-plugin-tempHumidity-text-icon icon-panel icon-panel-humidity"
-    }), /*#__PURE__*/React.createElement(Text, {
-      className: "tempHumidity"
-    }, `${humidity}`));
-  };
-  // 当无值时返回null
-  if (!tempC && !tempF && !humidity) {
+    if (dpSupport[SENSOR_HUMIDITY]) {
+      list.push({
+        key: 'humidity',
+        iconClass: 'icon-panel-humidity',
+        text: humidity || '--'
+      });
+    }
+    if (dpSupport[IPC_WATER_TEMPERATURE]) {
+      list.push({
+        key: 'waterTemp',
+        iconClass: 'icon-panel-lvye1',
+        text: waterTemp || '--'
+      });
+    }
+    return list;
+  }, [dpSupport, ec, tempUnit, tempF, tempC, humidity, waterTemp]);
+  if (!items.length) {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className)
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-tempHumidity')
-  }, (() => {
-    if ((tempC || tempUnit === '1' && tempF) && humidity) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, tempRender(), /*#__PURE__*/React.createElement(View, {
-        className: "ipc-player-plugin-tempHumidity-divider"
-      }), humRender());
-    }
-    if (tempC || tempUnit === '1' && tempF) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, tempRender());
-    }
-    if (humidity) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, humRender());
-    }
-    return null;
-  })()));
+  }, items.map((item, index) => /*#__PURE__*/React.createElement(React.Fragment, {
+    key: item.key
+  }, index > 0 && /*#__PURE__*/React.createElement(View, {
+    className: "ipc-player-plugin-tempHumidity-divider"
+  }), /*#__PURE__*/React.createElement(View, {
+    className: "ipc-player-plugin-tempHumidity-item"
+  }, /*#__PURE__*/React.createElement(Text, {
+    className: clsx('ipc-player-plugin-tempHumidity-text-icon', 'icon-panel', item.iconClass)
+  }), /*#__PURE__*/React.createElement(Text, {
+    className: "tempHumidity"
+  }, item.text))))));
 };

package/lib/widgets/tempHumidity/tempHumidity.less

@@ -10,6 +10,11 @@
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
 }
 
+.ipc-player-plugin-tempHumidity-item {
+    display: flex;
+    align-items: center;
+}
+
 .ipc-player-plugin-tempHumidity-divider {
     margin: calc(6px * var(--ipc-player-size-scale, 1));
     color: rgba(0,0,0,0.2);

package/package.json

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