From e37cdac9c10e37dd9bbdf81c69a886b1fa281978 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 08 三月 2021 10:08:45 +0800
Subject: [PATCH] 2021-3-8-3

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   92 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index f6e3b65..4f2aec5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -4,12 +4,13 @@
 using Shared;
 namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
 {
-    public class AddButton:FrameLayout
+    public class AddButton : FrameLayout
     {
         public AddButton()
         {
+            Tag = "Pir";
         }
-        public void Show()
+        public void Show(Control control)
         {
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -97,69 +98,80 @@
             #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) {
+                if (butName != null)
+                {
                     //鍚嶇О宸茬粡瀛樺湪
                     return;
                 }
-              
+                //new寮曞鐣岄潰
+                View.ReplicationView replication = new View.ReplicationView();
+                replication.Show();
+
                 //娣诲姞鏁版嵁瀵硅薄
                 ButtonObj buttonObj = new ButtonObj();
                 buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
                 buttonObj.value = texts;
-              
-                HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
-                new System.Threading.Thread(() =>
+
+                PirSend.CodeStudy(buttonObj, (responsePackNew) =>
                 {
-
-                    try
+                    ///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰橈紝鎵嶇煡閬撴槸鍚︽坊鍔犳垚鍔�
+                    ///
+                    //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+                      System.Threading.Thread.Sleep(5000);
+                    //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+                    replication.RemView();
+                    //if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+                    //{
+                    var buttonName = Pir.BuottonList.Find((c) => c.value == buttonObj.value);
+                    if (buttonName == null)
                     {
-                        //鍙戦�佺孩澶栫爜瀛︿範鍛戒护
-                        responsePackNew = PirSend.CodeStudy(buttonObj);
+                        //娣诲姞鏁版嵁
+                        Pir.BuottonList.Add(buttonObj);
                     }
-                    catch { }
-                    finally
+                    //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+                    this.RemoveFromParent();
+
+                    for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
                     {
-                        Application.RunOnMainThread(() =>
+                        var view = MainPage.BasePageView.GetChildren(i);
+                        if (view.GetType() == typeof(AddControl))
                         {
-                            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();
-
-                        });
+                            view.RemoveFromParent();
+                        }
+                        
                     }
+                  
+                    //鍔犺浇鏁版嵁鐣岄潰
+                    AddControl addControl = new AddControl();
+                    MainPage.BasePageView.AddChidren(addControl);
+                    addControl.Show(control);
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    //}
+                    //else
+                    //{
+                    //    PirSend.Error(responsePackNew);
+                    //}
 
-                })
-                { IsBackground = true }.Start();
-               
+                });
+
+
             };
 
         }

--
Gitblit v1.8.0