From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期三, 22 四月 2020 16:50:03 +0800 Subject: [PATCH] 合并代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs old mode 100755 new mode 100644 index 0dc5e74..c20f9e1 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs @@ -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 -- Gitblit v1.8.0