请合并新代码，更改多功能面板绑定表重复问题

xm

2020-08-14 a45fe56aeeac8f28a9891b83362954067c8166dc

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

old mode 100755
new mode 100644
@@ -294,6 +294,7 @@
                this.AddFunctionSettionRow();

                this.AddHumiditySourceRow(deviceMacTemp);

                this.AddTemperatureSensorRow(deviceMacTemp);

                this.DataCorrectionRow(deviceMacTemp);

            }

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

            {

@@ -602,7 +603,7 @@
            btnFunction.ButtonClickEvent += (sender, e) =>

            {

                //简约环境面板的按键配置

                var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();

                var form = new DevicePanel.PanelSettionWithSourceForm();

                form.AddForm(listNewDevice[0]);

            };

        }

@@ -643,16 +644,10 @@
                        var form = new DevicePanel.PanelFangyueButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

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

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

                    {

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

                        var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

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

                    {

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

                        var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

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

                        var form = new DevicePanel.PanelSettionWithSourceForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else

@@ -1031,13 +1026,48 @@
            //底线

            btnBindTargets.AddBottomLine();

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

            {
                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
                if (dev != null)
                {
                    var curControlDev = dev as Panel;
                    var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    simpleMutilfunctionTargetsPage.Show();
                }

            };

        }

        #region ■ 数据矫正_________________________ 
        /// <summary>

        ///  数据矫正行

        /// </summary>

        private void DataCorrectionRow(string deviceMac)

        {

            //数据矫正

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

            listview.AddChidren(rowLight);

            rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600);

            //底线

            rowLight.AddBottomLine();

            //右箭头

            rowLight.AddRightArrow();

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

            {

                var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac);

                Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);

                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;

                simpleMutilfunctionTargetsPage.Show();

                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备

                var device = new CommonDevice();

                if (dev != null)

                {

                    device.CurrentGateWayId = dev.CurrentGateWayId;

                }

                device.DeviceAddr = deviceMac;

                device.DeviceEpoint = 65;

                var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm();

                form.AddForm(device);

            };

        }

        #endregion



        /// <summary>

        ///  湿度来源行

@@ -1162,7 +1192,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1174,7 +1204,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }