From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index f73ef01..f2e05ad 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -238,12 +238,16 @@
//缁х數鍣�
IconPath = "Device/RelayEpoint.png";
}
- else if (this.Type == DeviceType.Thermostat || this.Type == DeviceType.FreshAir)
+ else if (this.Type == DeviceType.Thermostat)
{
- //绌鸿皟
- //鏂伴鍜岀┖璋冨浘鏍囩浉鍚�
+ //绌鸿皟
IconPath = "Device/AirConditionerEpoint.png";
}
+ else if (this.Type == DeviceType.FreshAir)
+ {
+ //鏂伴
+ IconPath = "Device/FreshAirEpoint.png";
+ }
else if (this.Type == DeviceType.FreshAirHumiditySensor)
{
//婀垮害浼犳劅鍣�
--
Gitblit v1.8.0