请合并代码，优化面板问题

xm

2020-05-18 cf0bffdf072bae11bdb8c780d0a355818700f713

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

old mode 100755
new mode 100644
@@ -268,16 +268,16 @@
                if (this.CheckCanShowFunctionSettionRow() == true)

                {

                    //添加【功能设置】行

                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)

                    {

                        //PM传感器

                        this.AddFunctionSettionRowPM();

                    }

                    else

                    {

                        this.AddFunctionSettionRow();

                    }



                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
                    {
                        //PM传感器
                        this.AddFunctionSettionRowPM();
                    }
                    else
                    {
                        this.AddFunctionSettionRow();
                    }

                }



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

@@ -756,8 +756,8 @@
        /// 添加传感器【功能设置】行

        /// </summary>

        private void AddFunctionSettionRowPM()

        {

            //功能设置

        {
            //功能设置
            string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);

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

            listview.AddChidren(btnFunction);

@@ -767,8 +767,8 @@
            //底线

            btnFunction.AddBottomLine();

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

            {

                var form = new DeviceFunctionSettionForm();

            {
                var form = new DeviceFunctionSettionForm();
                form.AddForm(listNewDevice[0], false);

            };

        }