Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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);

                }
            }
        }

@@ -212,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)
                {
@@ -293,9 +293,9 @@
        /// </summary>
        public DeviceType Type = DeviceType.UnKown;
        /// <summary>

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

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

        /// </summary>
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A灯光;
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A未定义;
        /// <summary>
        /// MAC地址
        /// </summary>
@@ -416,10 +416,6 @@
        /// 序列号
        /// </summary>
        public string SerialNumber = string.Empty;
        /// <summary>

        /// 整个设备所属的区域ID(因为设备也能够分配区域了)

        /// </summary>
        public string DeviceRoomId = string.Empty;
        /// <summary>
        /// 所有指定cluster是否都已经成功绑定协调器
        ///<para>0:未完全绑定</para>