合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

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

old mode 100755
new mode 100644
@@ -446,10 +446,19 @@
            }

            //新风面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {

                //方悦新风面板的按键配置

                var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                form.AddForm(device);

            {
                //方悦新风面板的按键配置
                //干接点
                if (device.Type == DeviceType.FreshAir)

                {

                    var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
                    form.AddForm(device);

                }
                else
                {
                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);
                }
            }

            //方悦面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo