From bd2c6c39668f2495d14440ae2d6bb7a7856e9d2f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 12 三月 2021 17:47:57 +0800
Subject: [PATCH] 2021-3-12-3

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   88 +++++++++++++++++++++++++-------------------
 1 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 4f2aec5..559e88a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -8,7 +8,7 @@
     {
         public AddButton()
         {
-            Tag = "Pir";
+            Tag = "PirView";
         }
         public void Show(Control control)
         {
@@ -114,7 +114,7 @@
                     //鍚嶇О涓嶈兘涓虹┖
                     return;
                 }
-                var butName = Pir.BuottonList.Find((c) => c.value == texts);
+                var butName = control.status.Find((c) => c.value == texts);
                 if (butName != null)
                 {
                     //鍚嶇О宸茬粡瀛樺湪
@@ -125,49 +125,61 @@
                 replication.Show();
 
                 //娣诲姞鏁版嵁瀵硅薄
-                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;
 
-                PirSend.CodeStudy(buttonObj, (responsePackNew) =>
+                PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
                 {
-                    ///杩欓噷锛氱洃鍚琈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)
+                    if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                     {
-                        //娣诲姞鏁版嵁
-                        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))
+                        Method method = new Method();
+                        var mqttdate = method.MqttDate(control.sid, 25);
+                        if (mqttdate !=null)
                         {
-                            view.RemoveFromParent();
+                            //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
+                           // 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();
+
+                            for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
+                            {
+                                var view = MainPage.BasePageView.GetChildren(i);
+                                if (view.GetType() == typeof(AddControl))
+                                {
+                                    new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+                                    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
-                    //{
-                    //    PirSend.Error(responsePackNew);
-                    //}
+                    else
+                    {
+                        Method method = new Method();
+                        method.ErrorShow(responsePackNew);
+                    }
 
                 });
 

--
Gitblit v1.8.0