2019.11.28

gxc

2019-11-28 427d1c7ecd04b03419eae157e32fe3367d8dffea

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

@@ -21,10 +21,10 @@
        {
            if (flage == true)
            {
                //if (msg.Contains("DeviceStatusReport") == false)

                //{

                System.Console.WriteLine(msg);

                //}
                if (msg.Contains("DeviceStatusReport") == false)

                {

                    System.Console.WriteLine(msg + "  " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);

                }
            }
        }

@@ -163,6 +163,10 @@
            else if (strDeviceType == ZigBee.Device.DeviceType.DoorLock.ToString())
            {
                return Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLock>(strDeviceByte);
            }

            else if (strDeviceType == ZigBee.Device.DeviceType.TemperatureSensor.ToString())
            {
                return Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor>(strDeviceByte);
            }
            return null;
        }
@@ -208,12 +212,12 @@
                else if (this.Type == DeviceType.ColorDimmableLight)
                {
                    //彩灯
                    IconPath = "Device/ColorDimmableLight.png";
                    IconPath = "Device/ColorLight.png";
                }

                else if (this.Type == DeviceType.DimmableLight)
                {
                    //调光器
                    IconPath = "Device/ColorDimmableLight.png";
                    IconPath = "Device/Light.png";
                }
                else if (this.Type == DeviceType.OnOffOutput)
                {
@@ -224,6 +228,19 @@
                {
                    //空调
                    IconPath = "Device/AirConditionerEpoint.png";
                }
                else if (this.Type == DeviceType.TemperatureSensor)

                {

                    if (((TemperatureSensor)this).SensorDiv == 1)

                    {

                        //温度传感器

                        IconPath = "Device/SensorTemperature.png";

                    }

                    else if (((TemperatureSensor)this).SensorDiv == 2)

                    {

                        //湿度传感器

                        IconPath = "Device/SensorHumidity.png";

                    }

                }
                else if (this.Type != DeviceType.UnKown)

                {

@@ -276,9 +293,9 @@
        /// </summary>
        public DeviceType Type = DeviceType.UnKown;
        /// <summary>

        /// 设备的功能类型(此类型目前只针对继电器回路有效,默认为灯光)

        /// 设备的功能类型(此类型目前只针对继电器回路有效,默认未指定)

        /// </summary>
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A灯光;
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A未定义;
        /// <summary>
        /// MAC地址
        /// </summary>
@@ -984,7 +1001,7 @@
            /// <summary>
            /// 设备所在网关的网关id
            /// </summary>
            public int GwId;
            public string GwId;
            /// <summary>
            /// 设备名
            /// </summary>