请合并最新版代码

xm

2020-06-19 ce1feeeb0aaa2e53bca4e8d64953edaba2b41106

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

@@ -602,38 +602,13 @@
                var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
                form.AddForm(listNewDevice[0]);

            };

        }



        #region ■ 简约环境(面板)_____________________



        /// <summary>

        /// 添加【按键设置】行简约环境(面板)

        /// </summary>

        private void AddSimplePanelSettionRow()

        {

            //按键设置

            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 DeviceBind.PanelSimpleEnvironmentTargetsForm();



            };

        }



        #endregion



        }

        #endregion

        #endregion




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




        /// <summary>

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

        /// </summary>

@@ -1101,9 +1076,8 @@
                    });
                };
            };
        }

        #endregion



        }

        /// <summary>
        ///  温度来源行
        /// </summary>