请合并代码，优化面板问题

xm

2020-05-18 cf0bffdf072bae11bdb8c780d0a355818700f713

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

old mode 100755
new mode 100644
@@ -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,11 +296,11 @@
            {
                device = Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
            }
            else { return null; }
            //能少存一个变量就少存一个
            device.Type = (DeviceType)device.DeviceID;

            return device;
            else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
            {
                return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
            }
            return null;
        }

        /// <summary>
@@ -368,13 +373,18 @@
                }
                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.PMSensor)
                {
                    //PM2.5空气质量传感器
                    IconPath = "Device/AirQualitySensorEpoint.png";
                }
                else if (this.Type == DeviceType.FreshAirHumiditySensor)
                {
@@ -462,6 +472,8 @@
            /// 温度测量功能的设备如：温度传感器。。。
            /// <para>1029:Relative Humidity Measurement,设备支持“湿度测量功能”</para>
            /// 湿度测量功能的设备如：湿度传感器。。。
            /// <para>1066:Pm2.5  Measurement,设备支持“pm2.5测量功能”</para>
            /// Pm2.5测量功能的设备如：Pm2.5传感器。。。
            /// </summary>
            public int InCluster;
        }