安川

黄学彪

2020-05-09 21736b2944d5e88cd705a39ff87fd73d5a16e609

 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)
                {
                    //湿度传感器