From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 1e4c027..cfacb7f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -12,6 +12,7 @@
}
public void Show(Control control)
{
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
@@ -122,17 +123,14 @@
}
//new寮曞鐣岄潰
View.ReplicationView replication = new View.ReplicationView();
- // MainPage.BasePageView.AddChidren(replication);
replication.Show(this);
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
//娣诲姞鏁版嵁瀵硅薄
Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
buttonObj.key = "key" + control.status.Count.ToString();
buttonObj.value = texts;
- PirSend.CodeStudy(control, buttonObj, (responsePackNew) =>
+ PirSend.CodeStudy(control.deviceId, buttonObj, (responsePackNew) =>
{
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
@@ -159,7 +157,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.tianjiachenggong));
view.RemoveFromParent();
}
@@ -191,5 +189,7 @@
};
}
+
+
}
}
--
Gitblit v1.8.0