From 21736b2944d5e88cd705a39ff87fd73d5a16e609 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 11:06:35 +0800
Subject: [PATCH] 安川
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index f73ef01..2eb6f8a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -182,6 +182,10 @@
{
return Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
}
+ else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
+ }
return null;
}
@@ -238,12 +242,21 @@
//缁х數鍣�
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.FreshAir)
+ {
+ //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ IconPath = "Device/FreshAirEpoint.png";
+ }
else if (this.Type == DeviceType.FreshAirHumiditySensor)
{
//婀垮害浼犳劅鍣�
--
Gitblit v1.8.0