225552552525

黄学彪

2020-05-18 b0505adb3ea1ba3f1812ee1046499410c8ea57f5

 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs

@@ -108,7 +108,12 @@
        /// 0：设备不在线
        /// <para>1：设备在线</para>
        /// </summary>
        public int IsOnline;
        public int IsOnline;

        /// <summary>

        /// 1：路由设备

        /// <para>2：终端设备，电池设备</para>

        /// </summary>

        public int ZigbeeType;
        /// <summary>
        /// 当前运行程序版本信息。 最大64字节
        /// </summary>
@@ -291,6 +296,10 @@
            {
                device = Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
            }
            else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
            {
                return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
            }
            else { return null; }
            //能少存一个变量就少存一个
            device.Type = (DeviceType)device.DeviceID;
@@ -376,6 +385,11 @@
                    //新风 
                    IconPath = "Device/FreshAirEpoint.png";
                }
                else if (this.Type == DeviceType.PMSensor)
                {
                    //PM2.5空气质量传感器 
                    IconPath = "Device/AirQualitySensorEpoint.png";
                }
                else if (this.Type == DeviceType.FreshAirHumiditySensor)
                {
                    //湿度传感器