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 |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 28d0f31..ed65648 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -8,10 +8,11 @@
     {
         public AddButton()
         {
-            Tag = "Pir";
+            Tag = "PirView";
         }
         public void Show(Control control)
         {
+           
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
             PirDevice.View.TopView topView = new View.TopView();
@@ -114,7 +115,7 @@
                     //鍚嶇О涓嶈兘涓虹┖
                     return;
                 }
-                var butName = Pir.BuottonList.Find((c) => c.value == texts);
+                var butName = control.status.Find((c) => c.value == texts);
                 if (butName != null)
                 {
                     //鍚嶇О宸茬粡瀛樺湪
@@ -122,26 +123,26 @@
                 }
                 //new寮曞鐣岄潰
                 View.ReplicationView replication = new View.ReplicationView();
-                replication.Show();
+                replication.Show(this);
 
                 //娣诲姞鏁版嵁瀵硅薄
                 Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
-                buttonObj.key = "key" + Pir.BuottonList.Count.ToString();
+                buttonObj.key = "key" + control.status.Count.ToString();
                 buttonObj.value = texts;
 
-                PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
+                PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
                 {
-                    //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
-                    System.Threading.Thread.Sleep(5000);
-                    //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
-                    replication.RemView();
-                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+                    if (mqttdate != null)
                     {
-                        var buttonName = Pir.BuottonList.Find((c) => c.value == buttonObj.value);
+                        //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+                        // System.Threading.Thread.Sleep(3000);
+                        //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+                        replication.RemView();
+                        var buttonName = control.status.Find((c) => c.value == buttonObj.value);
                         if (buttonName == null)
                         {
                             //娣诲姞鏁版嵁
-                            Pir.BuottonList.Add(buttonObj);
+                            control.status.Add(buttonObj);
                         }
                         //绉婚櫎娣诲姞鎸夐挳鐣岄潰
                         this.RemoveFromParent();
@@ -151,6 +152,7 @@
                             var view = MainPage.BasePageView.GetChildren(i);
                             if (view.GetType() == typeof(AddControl))
                             {
+                                //鎵惧埌绉婚櫎
                                 view.RemoveFromParent();
                             }
 
@@ -164,15 +166,16 @@
                     }
                     else
                     {
-                        Method method = new Method();
-                        method.ErrorShow(responsePackNew);
+                        replication.RemView();
+                        new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+
                     }
 
                 });
-
-
             };
 
         }
+
+      
     }
 }

--
Gitblit v1.8.0