From 351bdda734832d821a9764b0cde8be5d83c4ec50 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 01 十二月 2022 09:56:25 +0800
Subject: [PATCH] 2022年12月01日09:56:23
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 999cd5d..a4606e0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -84,15 +84,15 @@
{
//杩囨护鎺変笉鏀寔鐨勮澶�
continue;
- }
- if (device.Type == DeviceType.DoorLock)
- {
- var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
- {
- //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
- //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
- continue;
+ }
+ if (device.Type == DeviceType.DoorLock)
+ {
+ var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ {
+ //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
+ //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
+ continue;
}
}
if (type == "condition_mould")
@@ -293,16 +293,29 @@
break;
case DeviceType.TemperatureSensor:
{
- var temperatureSensor = device as TemperatureSensor;
- if (temperatureSensor.SensorDiv == 1)
+
+
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
{
- patm = $"ZigeeLogic/temperature.png";
- selectedpatm = $"ZigeeLogic/selectedtemperature.png";
+ patm = $"ZigeeLogic/airquality.png";
+ selectedpatm = $"ZigeeLogic/airqualityselected.png";
}
else
{
- patm = "ZigeeLogic/humidity.png";
- selectedpatm = "ZigeeLogic/selectedhumidity.png";
+ var temperatureSensor = device as TemperatureSensor;
+ if (temperatureSensor.SensorDiv == 1)
+ {
+ patm = $"ZigeeLogic/temperature.png";
+ selectedpatm = $"ZigeeLogic/selectedtemperature.png";
+ }
+ else
+ {
+ patm = "ZigeeLogic/humidity.png";
+ selectedpatm = "ZigeeLogic/selectedhumidity.png";
+ }
}
}
break;
--
Gitblit v1.8.0