Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs

@@ -4,19 +4,25 @@
using Shared;
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
    public class AddButton:FrameLayout
    public class AddButton : FrameLayout
    {
        public AddButton()
        {
            Tag = "PirView";
        }
        public void Show()
        public void Show(Control control)
        {

            #region 界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            PirDevice.View.TopView topView = new View.TopView();
            topView.topNameBtn.TextID = StringId.tianjiayaokongqi;
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {

                RemoveFromParent();
            };

            FrameLayout editfLayout = new FrameLayout
            {
@@ -97,71 +103,81 @@
            #endregion
            View.Buttons buttons = new View.Buttons();
            var buttonNameList = buttons.GetList("默认按钮");
            buttons.AddButton(buttonFLayout, buttonNameList, (s) => {
            buttons.AddButton(buttonFLayout, buttonNameList, (s) =>
            {
                editText.Text = s;
               #if __Android__
#if __Android__
                editText.SetSelectionEnd();
               #endif
#endif
            });
            ///下一步的点击事件
            saveBtn.MouseUpEventHandler += (sender, e) =>
            {
                View.ReplicationView replication = new View.ReplicationView();
                //new引导界面
                replication.GuideShow();

                var texts = editText.Text.Trim();
                if (string.IsNullOrEmpty( editText.Text)) {
                if (string.IsNullOrEmpty(editText.Text))
                {
                    //名称不能为空
                    return;
                }
                var butName = Pir.BuottonList.Find((c) => c.value == texts);
                if (butName!=null) {
                var butName = control.status.Find((c) => c.value == texts);
                if (butName != null)
                {
                    //名称已经存在
                    return;
                }
              
                //new引导界面
                View.ReplicationView replication = new View.ReplicationView();
                replication.Show(this);

                //添加数据对象
                ButtonObj buttonObj = new ButtonObj();
                buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
                Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
                buttonObj.key = "key" + control.status.Count.ToString();
                buttonObj.value = texts;
              
                HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
                new System.Threading.Thread(() =>

                PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
                {

                    try
                    if (mqttdate != null)
                    {
                        //发送红外码学习命令
                        responsePackNew = PirSend.CodeStudy(buttonObj);
                    }
                    catch { }
                    finally
                    {
                        Application.RunOnMainThread(() =>
                        //休眠是为显示引导界面
                        // System.Threading.Thread.Sleep(3000);
                        //移除添加按钮引导界面
                        replication.RemView();
                        var buttonName = control.status.Find((c) => c.value == buttonObj.value);
                        if (buttonName == null)
                        {
                            if (PirSend.Error(responsePackNew))
                            {
                                //添加数据
                                Pir.BuottonList.Add(buttonObj);
                                //移除添加按钮界面
                                this.RemoveFromParent();
                                //加载数据界面
                                AddControl addControl = new AddControl();
                                addControl.Show();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            }
                            //移除添加按钮引导界面
                         //  replication.dialog.Close();

                        });
                            //添加数据
                            control.status.Add(buttonObj);
                        }
                        //移除添加按钮界面
                        this.RemoveFromParent();
                        //移除之前可能存在的界面
                        PirMethod.RemoveView("AddControl");
                        //加载数据界面
                        AddControl addControl = new AddControl();
                        MainPage.BasePageView.AddChidren(addControl);
                        addControl.Show(control);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    }
                    else
                    {
                        replication.RemView();
                        PirMethod method = new PirMethod();
                        method.ErrorShow(null,"添加失败");
                    }

                })
                { IsBackground = true }.Start();
               
                });
            };

        }

        /// <summary>
        /// 移除界面
        /// </summary>
        public override void RemoveFromParent()
        {
            //刷新指定界面
            PirMethod.RefreshView("PirMain");
            base.RemoveFromParent();
        }
    }
}