先上传个版本吧

黄学彪

2020-02-21 bd46c57c77c276014db3192a4e2cc96e23c93202

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

@@ -227,8 +227,12 @@
                this.AddDirectionAndLimitRow();

                //添加【手拉控制】行(开合帘专用)

                this.AddHandPullControlRow();

                //添加【按键设置】行(方悦专用) --这个有可能和面板重叠

                if (this.AddFangyuePanelSettionRow() == false)

                {

                //添加【按键设置】行(面板专用)

                this.AddPanelSettionRow();

                }

                //添加【功能设置】行

                this.AddFunctionSettionRow();

                //添加【干接点设置】行

@@ -452,7 +456,7 @@
        #region ■ 按键设置(面板)_____________________



        /// <summary>

        /// 添加【按键设置】行

        /// 添加【按键设置】行(面板)

        /// </summary>

        private void AddPanelSettionRow()

        {

@@ -461,6 +465,37 @@
            {

                return;

            }

            //按键设置

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

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

            listview.AddChidren(btnFunction);

            btnFunction.AddLeftCaption(caption, 600);

            //向右图标

            btnFunction.AddRightArrow();

            //底线

            btnFunction.AddBottomLine();

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

            {

                var form = new DevicePanel.PanelButtonSettionForm();

                form.AddForm(listNewDevice[0]);

            };

        }



        #endregion



        #region ■ 按键设置(方悦)_____________________



        /// <summary>

        /// 添加【按键设置】行(方悦)

        /// </summary>

        private bool AddFangyuePanelSettionRow()

        {

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

            {

            //按键设置

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

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

@@ -488,10 +523,12 @@
                }

                else

                {

                    var form = new DevicePanel.PanelButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

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

                }

            };

                return true;

            }

            return false;

        }



        #endregion

@@ -604,7 +641,8 @@
            {

                return;

            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

            {

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

                return;