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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/lib/hooks/useWaterTemperature/index.d.ts +5 -1
  2. package/lib/hooks/useWaterTemperature/index.js +28 -13
  3. package/lib/iconfont/iconfont.css +49 -13
  4. package/lib/iconfont/iconfont.js +4 -4
  5. package/lib/iconfont/iconfont.json +84 -21
  6. package/lib/iconfont/iconfont.ttf +0 -0
  7. package/lib/iconfont/iconfont.woff +0 -0
  8. package/lib/iconfont/iconfont.woff2 +0 -0
  9. package/lib/utils/content/dpCode.d.ts +1 -0
  10. package/lib/utils/content/dpCode.js +3 -1
  11. package/lib/widgets/tempHumidity/tempHumidity.js +8 -4
  12. package/package.json +1 -1
package/lib/iconfont/iconfont.json CHANGED
@@ -5,58 +5,128 @@
5
5
  "css_prefix_text": "icon-panel-",
6
6
  "description": "IPC 小程序公版",
7
7
  "glyphs": [
8
+ {
9
+ "icon_id": "48122923",
10
+ "name": "v-alarm-light-siren",
11
+ "font_class": "v-alarm-light-siren",
12
+ "unicode": "e6d5",
13
+ "unicode_decimal": 59093
14
+ },
15
+ {
16
+ "icon_id": "48122922",
17
+ "name": "v-alarm-light",
18
+ "font_class": "v-alarm-light",
19
+ "unicode": "e6d6",
20
+ "unicode_decimal": 59094
21
+ },
22
+ {
23
+ "icon_id": "48122921",
24
+ "name": "stream-standard",
25
+ "font_class": "stream-standard",
26
+ "unicode": "e6d7",
27
+ "unicode_decimal": 59095
28
+ },
29
+ {
30
+ "icon_id": "48122928",
31
+ "name": "feature-track",
32
+ "font_class": "feature-track",
33
+ "unicode": "e6d0",
34
+ "unicode_decimal": 59088
35
+ },
36
+ {
37
+ "icon_id": "48122927",
38
+ "name": "v-alarm-siren",
39
+ "font_class": "v-alarm-siren",
40
+ "unicode": "e6d1",
41
+ "unicode_decimal": 59089
42
+ },
43
+ {
44
+ "icon_id": "48122925",
45
+ "name": "v-alarm-off",
46
+ "font_class": "v-alarm-off",
47
+ "unicode": "e6d2",
48
+ "unicode_decimal": 59090
49
+ },
50
+ {
51
+ "icon_id": "48122926",
52
+ "name": "stream-flowing",
53
+ "font_class": "stream-flowing",
54
+ "unicode": "e6d3",
55
+ "unicode_decimal": 59091
56
+ },
57
+ {
58
+ "icon_id": "48122924",
59
+ "name": "anti-flicker",
60
+ "font_class": "anti-flicker",
61
+ "unicode": "e6d4",
62
+ "unicode_decimal": 59092
63
+ },
64
+ {
65
+ "icon_id": "48114313",
66
+ "name": "Access-Key-Password",
67
+ "font_class": "Access-Key-Password",
68
+ "unicode": "e643",
69
+ "unicode_decimal": 58947
70
+ },
71
+ {
72
+ "icon_id": "48095603",
73
+ "name": "Access-Play",
74
+ "font_class": "Access-Play",
75
+ "unicode": "e6cf",
76
+ "unicode_decimal": 59087
77
+ },
8
78
  {
9
79
  "icon_id": "47934817",
10
- "name": "绿叶",
11
- "font_class": "lvye1",
80
+ "name": "plant_water_temp",
81
+ "font_class": "plant_water_temp",
12
82
  "unicode": "e6ce",
13
83
  "unicode_decimal": 59086
14
84
  },
15
85
  {
16
86
  "icon_id": "47934689",
17
- "name": "绿叶",
18
- "font_class": "lvye",
87
+ "name": "plant_footer",
88
+ "font_class": "plant_footer",
19
89
  "unicode": "e6cd",
20
90
  "unicode_decimal": 59085
21
91
  },
22
92
  {
23
93
  "icon_id": "47917149",
24
- "name": "植物记录",
25
- "font_class": "zhiwujilu",
94
+ "name": "plant_record",
95
+ "font_class": "plant_record",
26
96
  "unicode": "e6cc",
27
97
  "unicode_decimal": 59084
28
98
  },
29
99
  {
30
100
  "icon_id": "47915428",
31
- "name": "水位",
32
- "font_class": "shuiwei",
101
+ "name": "plant_water_level",
102
+ "font_class": "plant_water_level",
33
103
  "unicode": "e6c8",
34
104
  "unicode_decimal": 59080
35
105
  },
36
106
  {
37
107
  "icon_id": "47915429",
38
- "name": "EC值",
108
+ "name": "ECzhi",
39
109
  "font_class": "ECzhi",
40
110
  "unicode": "e6c9",
41
111
  "unicode_decimal": 59081
42
112
  },
43
113
  {
44
114
  "icon_id": "47915427",
45
- "name": "灯光",
46
- "font_class": "dengguang",
115
+ "name": "plant_light",
116
+ "font_class": "plant_light",
47
117
  "unicode": "e6ca",
48
118
  "unicode_decimal": 59082
49
119
  },
50
120
  {
51
121
  "icon_id": "47915426",
52
- "name": "总开关",
53
- "font_class": "zongkaiguan",
122
+ "name": "plant_main_switch",
123
+ "font_class": "plant_main_switch",
54
124
  "unicode": "e6cb",
55
125
  "unicode_decimal": 59083
56
126
  },
57
127
  {
58
128
  "icon_id": "47777351",
59
- "name": "智能画质-关闭",
129
+ "name": "zhinenghuazhi-guanbi",
60
130
  "font_class": "zhinenghuazhi-guanbi",
61
131
  "unicode": "e6c7",
62
132
  "unicode_decimal": 59079
@@ -341,13 +411,6 @@
341
411
  "unicode": "e6a1",
342
412
  "unicode_decimal": 59041
343
413
  },
344
- {
345
- "icon_id": "47073070",
346
- "name": "Access-Key-Password",
347
- "font_class": "Access-Key-Password",
348
- "unicode": "e643",
349
- "unicode_decimal": 58947
350
- },
351
414
  {
352
415
  "icon_id": "47073029",
353
416
  "name": "Access-Mobile",
package/lib/iconfont/iconfont.ttf CHANGED
Binary file
package/lib/iconfont/iconfont.woff CHANGED
Binary file
package/lib/iconfont/iconfont.woff2 CHANGED
Binary file
package/lib/utils/content/dpCode.d.ts CHANGED
@@ -4,6 +4,7 @@ export declare const SENSOR_TEMPERATURE = "sensor_temperature";
4
4
  export declare const SENSOR_HUMIDITY = "sensor_humidity";
5
5
  export declare const IPC_EC = "ipc_ec";
6
6
  export declare const IPC_WATER_TEMPERATURE = "ipc_water_temperature";
7
+ export declare const IPC_WATER_TEMPERATURE_F = "ipc_water_temperature_f";
7
8
  export declare const PTZ_CONTROL = "ptz_control";
8
9
  export declare const GUN_BALL = "ipc_multi_locate_coor";
9
10
  export declare const ZOOM_CONTROL = "zoom_control";
package/lib/utils/content/dpCode.js CHANGED
@@ -8,7 +8,9 @@ export const SENSOR_HUMIDITY = 'sensor_humidity'; // 湿度
8
8
 
9
9
  export const IPC_EC = 'ipc_ec'; // EC 值（电导率）
10
10
 
11
- export const IPC_WATER_TEMPERATURE = 'ipc_water_temperature'; // 水温
11
+ export const IPC_WATER_TEMPERATURE = 'ipc_water_temperature'; // 水温（摄氏度）
12
+
13
+ export const IPC_WATER_TEMPERATURE_F = 'ipc_water_temperature_f'; // 水温（华氏度）
12
14
 
13
15
  export const PTZ_CONTROL = 'ptz_control'; // ptz
14
16
 
package/lib/widgets/tempHumidity/tempHumidity.js CHANGED
@@ -19,7 +19,10 @@ export const TempHumidity = props => {
19
19
  } = useTemperature(devId);
20
20
  const humidity = useHumidity(devId);
21
21
  const ec = useEc(devId);
22
- const waterTemp = useWaterTemperature(devId);
22
+ const {
23
+ waterTempC,
24
+ waterTempF
25
+ } = useWaterTemperature(devId);
23
26
  // 稳定 dpCodes 引用，避免每次渲染都生成新数组导致 useDpSupport 内 getDeviceInfo 被反复触发
24
27
  const dpCodes = useMemo(() => [...DP_CODES], []);
25
28
  const dpSupport = useDpSupport({
@@ -51,14 +54,15 @@ export const TempHumidity = props => {
51
54
  });
52
55
  }
53
56
  if (dpSupport[IPC_WATER_TEMPERATURE]) {
57
+ const waterTempText = tempUnit === '1' && waterTempF ? waterTempF : waterTempC || '--';
54
58
  list.push({
55
59
  key: 'waterTemp',
56
- iconClass: 'icon-panel-lvye1',
57
- text: waterTemp || '--'
60
+ iconClass: 'icon-panel-plant_water_temp',
61
+ text: waterTempText
58
62
  });
59
63
  }
60
64
  return list;
61
- }, [dpSupport, ec, tempUnit, tempF, tempC, humidity, waterTemp]);
65
+ }, [dpSupport, ec, tempUnit, tempF, tempC, humidity, waterTempC, waterTempF]);
62
66
  if (!items.length) {
63
67
  return null;
64
68
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ray-js/ipc-player-integration",
3
- "version": "0.0.45-beta.1",
3
+ "version": "0.0.45-beta.3",
4
4
  "description": "IPC 融合播放器",
5
5
  "main": "lib/index",
6
6
  "files": [