From 59245577d31fbcea4df72d2811ed00ba20fa0e29 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 25 三月 2021 15:43:02 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   72 +++++++++++++++--------------------
 1 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 559e88a..ed65648 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -12,6 +12,7 @@
         }
         public void Show(Control control)
         {
+           
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
             PirDevice.View.TopView topView = new View.TopView();
@@ -122,70 +123,59 @@
                 }
                 //new寮曞鐣岄潰
                 View.ReplicationView replication = new View.ReplicationView();
-                replication.Show();
+                replication.Show(this);
 
                 //娣诲姞鏁版嵁瀵硅薄
                 Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
                 buttonObj.key = "key" + control.status.Count.ToString();
                 buttonObj.value = texts;
 
-                PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
+                PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
                 {
-                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+                    if (mqttdate != null)
                     {
-                        Method method = new Method();
-                        var mqttdate = method.MqttDate(control.sid, 25);
-                        if (mqttdate !=null)
+                        //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+                        // System.Threading.Thread.Sleep(3000);
+                        //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+                        replication.RemView();
+                        var buttonName = control.status.Find((c) => c.value == buttonObj.value);
+                        if (buttonName == null)
                         {
-                            //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
-                           // System.Threading.Thread.Sleep(3000);
-                            //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
-                            replication.RemView();
-                            var buttonName = control.status.Find((c) => c.value == buttonObj.value);
-                            if (buttonName == null)
-                            {
-                                //娣诲姞鏁版嵁
-                                control.status.Add(buttonObj);
-                            }
-                            //绉婚櫎娣诲姞鎸夐挳鐣岄潰
-                            this.RemoveFromParent();
+                            //娣诲姞鏁版嵁
+                            control.status.Add(buttonObj);
+                        }
+                        //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+                        this.RemoveFromParent();
 
-                            for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
+                        for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
+                        {
+                            var view = MainPage.BasePageView.GetChildren(i);
+                            if (view.GetType() == typeof(AddControl))
                             {
-                                var view = MainPage.BasePageView.GetChildren(i);
-                                if (view.GetType() == typeof(AddControl))
-                                {
-                                    new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
-                                    view.RemoveFromParent();
-                                }
-
+                                //鎵惧埌绉婚櫎
+                                view.RemoveFromParent();
                             }
 
-                            //鍔犺浇鏁版嵁鐣岄潰
-                            AddControl addControl = new AddControl();
-                            MainPage.BasePageView.AddChidren(addControl);
-                            addControl.Show(control);
-                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         }
-                        else
-                        {
-                            replication.RemView();
-                            new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
 
-                        }
-                     
+                        //鍔犺浇鏁版嵁鐣岄潰
+                        AddControl addControl = new AddControl();
+                        MainPage.BasePageView.AddChidren(addControl);
+                        addControl.Show(control);
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                     }
                     else
                     {
-                        Method method = new Method();
-                        method.ErrorShow(responsePackNew);
+                        replication.RemView();
+                        new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+
                     }
 
                 });
-
-
             };
 
         }
+
+      
     }
 }

--
Gitblit v1.8.0