合并新代码，提供逻辑需要的门锁接口

xm

2020-04-28 dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b

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

@@ -582,8 +582,8 @@
        private void AddDryContactSettionRow()

        {

            if (this.listDeviceType.Contains(DeviceType.OnOffSwitch) == false)

            {

                //必须有一路回路是OnOffSwitch才行,面板的干接点的话，使用的是别的菜单

            {
                //必须有一路回路是OnOffSwitch才行,面板的干接点的话，使用的是别的菜单
                return;

            }

            if (deviceEnumInfo.IsHdlDevice == true && deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板)

@@ -679,8 +679,12 @@
        {

            //只有回路数大于1才能有这个菜单

            if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)

            {

                return;

            {
                //要求新风小模块的新风有功能设置
                if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
                {
                    return;
                }
            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)