合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -472,8 +472,25 @@
            btnFunction.AddBottomLine();

            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                var form = new DevicePanel.PanelButtonSettionForm();

                form.AddForm(listNewDevice[0]);

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    //方悦面板的按键配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

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

                {

                    //方悦环境面板的按键配置

                    var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                else

                {

                    var form = new DevicePanel.PanelButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

            };

        }



@@ -587,6 +604,11 @@
            {

                return;

            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

            {

                //环境面板没有功能设置

                return;

            }



            //功能设置

            string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);

@@ -599,8 +621,16 @@
            btnFunction.AddBottomLine();

            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                //方悦面板

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                //河东的面板设备

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

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

                {

                    var form = new DevicePanel.PanelFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);