@ray-js/ipc-player-integration 0.0.43-beta.3 → 0.0.44

package/lib/iconfont/iconfont.json

@@ -5,55 +5,6 @@
   "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,8 +2,6 @@ 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,10 +6,6 @@ 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,12 +1,8 @@
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.map.js";
-import React, { useMemo } from 'react';
+import React from 'react';
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
-import { useTemperature, useHumidity, useEc, useWaterTemperature, useDpSupport } from '../../hooks';
-import { IPC_EC, IPC_WATER_TEMPERATURE, SENSOR_HUMIDITY, SENSOR_TEMPERATURE } from '../../utils/content/dpCode';
+import { useTemperature, useHumidity } from '../../hooks';
 import './tempHumidity.less';
-const DP_CODES = [IPC_EC, SENSOR_TEMPERATURE, SENSOR_HUMIDITY, IPC_WATER_TEMPERATURE];
 export const TempHumidity = props => {
   const {
     className,
@@ -18,61 +14,48 @@ export const TempHumidity = props => {
     tempF
   } = useTemperature(devId);
   const humidity = useHumidity(devId);
-  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 || '--'
-      });
+  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));
     }
-    if (dpSupport[SENSOR_TEMPERATURE]) {
-      const tempText = tempUnit === '1' && tempF ? tempF : tempC || '--';
-      list.push({
-        key: 'temp',
-        iconClass: 'icon-panel-temperature',
-        text: tempText
-      });
+    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_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;
+  };
+  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) {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(className)
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-tempHumidity')
-  }, 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))))));
+  }, (() => {
+    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;
+  })()));
 };

package/lib/widgets/tempHumidity/tempHumidity.less

@@ -10,11 +10,6 @@
     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.43-beta.3",
+  "version": "0.0.44",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [
@@ -38,7 +38,7 @@
     "@ray-js/direction-control": "^0.0.8",
     "@ray-js/ipc-ptz-zoom": "^0.0.3",
     "@ray-js/ray-ipc-player": "^2.1.3",
-    "@ray-js/ray-ipc-utils": "^1.1.15",
+    "@ray-js/ray-ipc-utils": "^1.1.16",
     "@ray-js/svg": "0.2.0",
     "clsx": "^1.2.1",
     "color": "^5.0.2",

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

@@ -1 +0,0 @@
-export declare const useEc: (devId: string) => string;

package/lib/hooks/useEc/index.js

@@ -1,25 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useDpState } from '../useDpState';
-import { IPC_EC } from '../../utils/content/dpCode';
-import { showMathPowValue } from '../../utils/device';
-export const useEc = devId => {
-  const [ec, setEc] = useState('');
-  const [dpState, schemaObj] = useDpState({
-    devId,
-    dpCodes: [IPC_EC]
-  });
-  useEffect(() => {
-    var _schema$property;
-    if (dpState[IPC_EC] === undefined) {
-      setEc('');
-      return;
-    }
-    const schema = schemaObj === null || schemaObj === void 0 ? void 0 : schemaObj[IPC_EC];
-    const scale = (schema === null || schema === void 0 || (_schema$property = schema.property) === null || _schema$property === void 0 ? void 0 : _schema$property.scale) || 0;
-    // const unit = schema?.property?.unit || 'μS/cm';
-    const value = showMathPowValue(dpState[IPC_EC], scale);
-    // EC 值始终以整数形式展示（showMathPowValue 在 scale !== 0 时会保留一位小数，如 "0.0"）
-    setEc(`${Math.round(Number(value))}`);
-  }, [dpState, schemaObj]);
-  return ec;
-};

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

@@ -1 +0,0 @@
-export declare const useWaterTemperature: (devId: string) => string;

package/lib/hooks/useWaterTemperature/index.js

@@ -1,23 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useDpState } from '../useDpState';
-import { IPC_WATER_TEMPERATURE } from '../../utils/content/dpCode';
-import { showMathPowValue } from '../../utils/device';
-export const useWaterTemperature = devId => {
-  const [waterTemp, setWaterTemp] = useState('');
-  const [dpState, schemaObj] = useDpState({
-    devId,
-    dpCodes: [IPC_WATER_TEMPERATURE]
-  });
-  useEffect(() => {
-    var _schema$property;
-    if (dpState[IPC_WATER_TEMPERATURE] === undefined) {
-      setWaterTemp('');
-      return;
-    }
-    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;
-};