From 132ef8524e38d06da8cf74292a3ac1eff065bb1b Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期二, 23 三月 2021 16:38:01 +0800
Subject: [PATCH] 整好新风的UI,待真实设备测试

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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..dba2330 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -122,7 +122,10 @@
                 }
                 //new寮曞鐣岄潰
                 View.ReplicationView replication = new View.ReplicationView();
-                replication.Show();
+               // MainPage.BasePageView.AddChidren(replication);
+                replication.Show(this);
+               // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
 
                 //娣诲姞鏁版嵁瀵硅薄
                 Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
@@ -134,11 +137,12 @@
                     if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                     {
                         Method method = new Method();
-                        var mqttdate = method.MqttDate(control.sid, 25);
-                        if (mqttdate !=null)
+                        Method.buttondata = "";
+                        var mqttdate = method.MqttDate("鎸夐敭", control.sid, 25);
+                        if (mqttdate != null)
                         {
                             //浼戠湢鏄负鏄剧ず寮曞鐣岄潰
-                           // System.Threading.Thread.Sleep(3000);
+                            // System.Threading.Thread.Sleep(3000);
                             //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
                             replication.RemView();
                             var buttonName = control.status.Find((c) => c.value == buttonObj.value);
@@ -155,7 +159,7 @@
                                 var view = MainPage.BasePageView.GetChildren(i);
                                 if (view.GetType() == typeof(AddControl))
                                 {
-                                    new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+                                    new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
                                     view.RemoveFromParent();
                                 }
 
@@ -173,12 +177,12 @@
                             new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
 
                         }
-                     
+
                     }
                     else
                     {
                         Method method = new Method();
-                        method.ErrorShow(responsePackNew);
+                        method.ErrorShow(responsePackNew, "");
                     }
 
                 });

--
Gitblit v1.8.0