From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Common/Device.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 78875ab..182d93c 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1648,6 +1648,12 @@
//闈㈡澘鐨勬俯搴︽帰澶村彨 闈㈡澘鍚嶅瓧+娓╁害
return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.uTemperature);
}
+ else if (deviceInfoType.BeloneType == DeviceBeloneType.A绌烘皵璐ㄩ噺)
+ {
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣ㄧ殑娓╁害鎺㈠ご鍙┖姘旇川閲忎紶鎰熷櫒+娓╁害
+ return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
else if (((TemperatureSensor)device).SensorDiv == 1)
{
//娓╁害浼犳劅鍣�
@@ -2334,12 +2340,18 @@
{
bool temperatrue = false;
bool humidity = false;
+ bool airQualitySensor = false;
//鑾峰彇鍏ㄩ儴鐨勫洖璺�
var listTemp = this.GetDevicesByMac(listdevice[0].DeviceAddr, false);
foreach (var device in listTemp)
{
if (device is TemperatureSensor)
{
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (device.isAirQualitySensor(device))
+ {
+ airQualitySensor = true;
+ }
//娓╁害浼犳劅鍣�
if (((TemperatureSensor)device).SensorDiv == 1)
{
@@ -2374,6 +2386,15 @@
info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
}
info.ObjectTypeName = this.dicDeviceModelIdEnum["A411"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (airQualitySensor == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A422"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A绌烘皵璐ㄩ噺;
+ info.ConcreteType = DeviceConcreteType.AirQualitySensor;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A422"].A绫诲瀷鍚嶅瓧;
+ }
}
//14鏂伴璁惧
else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
@@ -2406,14 +2427,6 @@
info.BeloneType = DeviceBeloneType.A鏅捐。鏋�;
info.ConcreteType = DeviceConcreteType.Airer;
info.ObjectTypeName = this.dicDeviceModelIdEnum["A421"].A绫诲瀷鍚嶅瓧;
- }
- //18绌烘皵璐ㄩ噺浼犳劅鍣�
- else if (dicType.ContainsKey(DeviceType.AirQualitySensor) == true)
- {
- info.ConcreteText = this.dicDeviceModelIdEnum["A422"].A瀹樻柟鍚嶅瓧;
- info.BeloneType = DeviceBeloneType.A绌烘皵璐ㄩ噺;
- info.ConcreteType = DeviceConcreteType.AirQualitySensor;
- info.ObjectTypeName = this.dicDeviceModelIdEnum["A422"].A绫诲瀷鍚嶅瓧;
}
//璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
--
Gitblit v1.8.0