From f26d7b01a57fdb53dbe58ad355e3c45e3ec06d60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 16:14:02 +0800
Subject: [PATCH] 2021-2-26-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   60 +++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 539cbd3..4f2aec5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -8,8 +8,9 @@
     {
         public AddButton()
         {
+            Tag = "Pir";
         }
-        public void Show()
+        public void Show(Control control)
         {
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -120,40 +121,53 @@
                     return;
                 }
                 //new寮曞鐣岄潰
-                ReplicationView replication = new ReplicationView();
-                MainPage.BasePageView.AddChidren(replication);
+                View.ReplicationView replication = new View.ReplicationView();
                 replication.Show();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
 
                 //娣诲姞鏁版嵁瀵硅薄
                 ButtonObj buttonObj = new ButtonObj();
                 buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
                 buttonObj.value = texts;
-               
+
                 PirSend.CodeStudy(buttonObj, (responsePackNew) =>
                 {
+                    ///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰橈紝鎵嶇煡閬撴槸鍚︽坊鍔犳垚鍔�
+                    ///
                     //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
-                  //  System.Threading.Thread.Sleep(5000);
+                      System.Threading.Thread.Sleep(5000);
                     //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
-                    replication.RemoveFromParent();
-                    if (!PirSend.Error(responsePackNew))
+                    replication.RemView();
+                    //if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+                    //{
+                    var buttonName = Pir.BuottonList.Find((c) => c.value == buttonObj.value);
+                    if (buttonName == null)
                     {
-                        var buttonName = Pir.BuottonList.Find((c) => c.value == buttonObj.value);
-                        if (buttonName == null)
-                        {
-                            //娣诲姞鏁版嵁
-                            Pir.BuottonList.Add(buttonObj);
-                        }
-                        //绉婚櫎娣诲姞鎸夐挳鐣岄潰
-                        this.RemoveFromParent();
-                        //绉婚櫎涔嬪墠鐨勭晫闈�
-                        MainPage.BasePageView.RemoveViewByTag("AddControl");
-                        //鍔犺浇鏁版嵁鐣岄潰
-                        AddControl addControl = new AddControl();
-                        MainPage.BasePageView.AddChidren(addControl);
-                        addControl.Show();
-                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        //娣诲姞鏁版嵁
+                        Pir.BuottonList.Add(buttonObj);
                     }
+                    //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+                    this.RemoveFromParent();
+
+                    for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
+                    {
+                        var view = MainPage.BasePageView.GetChildren(i);
+                        if (view.GetType() == typeof(AddControl))
+                        {
+                            view.RemoveFromParent();
+                        }
+                        
+                    }
+                  
+                    //鍔犺浇鏁版嵁鐣岄潰
+                    AddControl addControl = new AddControl();
+                    MainPage.BasePageView.AddChidren(addControl);
+                    addControl.Show(control);
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    //}
+                    //else
+                    //{
+                    //    PirSend.Error(responsePackNew);
+                    //}
 
                 });
 

--
Gitblit v1.8.0