合并门锁，完成住宅管理

黄学彪

2019-10-12 c6b35c3138b944830b5336bf610f918154dd47c7

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

@@ -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>