请合并小模块

xm

2020-04-30 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -901,9 +901,15 @@
        /// </summary>

        private void AddAirSwitchFunctionTypeRow()

        {

            if (this.deviceEnumInfo.BeloneType != DeviceBeloneType.A智能空开)

            //2020.04.28变更:有个别设备它除了继电器回路，什么都没有了,

            //这个时候也要现实出来

            if (this.listNewDevice.Count != 1)

            {

                //不是空气开关

                return;

            }

            if (this.listNewDevice[0].Type != DeviceType.OnOffOutput

                && this.listNewDevice[0].Type != DeviceType.AirSwitch)

            {

                return;

            }

            //自定义功能类型控件