请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs

old mode 100644
new mode 100755
@@ -139,6 +139,11 @@
            //首次初始化数据
            CommonPage.Loading.Start("");
            InitData();

            //备注弹窗提示
            string msg = Language.StringByID(R.MyInternationalizationString.BindRemarkTip1).Replace("{0}", "\r\n");
            var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.Iknown));
            alert.Show();
        }

        /// <summary>
@@ -600,6 +605,13 @@

                EventHandler<MouseEventArgs> hander = (sender, e) =>
                {
                    //目标备注处理
                    var localName = System.Text.Encoding.UTF8.GetBytes(Common.LocalDevice.Current.GetDeviceEpointName(device));
                    if (localName.Length > 20)
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindRemarkTip2), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        return;
                    }
                    btnChoose.IsSelected = !btnChoose.IsSelected;
                    if (curBindType != 6)
                    {
@@ -831,6 +843,18 @@

                EventHandler<MouseEventArgs> hander = (sender, e) =>
                {

                    //目标备注处理
                    if (!string.IsNullOrEmpty(scene.Name))
                    {
                        var localName = System.Text.Encoding.UTF8.GetBytes(scene.Name);
                        if (localName.Length > 20)
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindRemarkTip2), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            return;
                        }
                    }

                    btnChoose.IsSelected = !btnChoose.IsSelected;

                    if (curSupportBindEpointList.Count == 0)
@@ -1315,7 +1339,6 @@
                                curD.BindScenesId = dev.BindScenesId;
                                curD.BindMacAddr = dev.BindMacAddr;
                                curD.BindEpoint = dev.BindEpoint;
                                curD.ESName = dev.ESName;
                                curD.BindType = dev.BindType;
                                bList.Add(curD);