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 | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..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,23 +123,24 @@
}
//new寮曞鐣岄潰
View.ReplicationView replication = new View.ReplicationView();
- replication.Show();
+ replication.Show(this);
//娣诲姞鏁版嵁瀵硅薄
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() != "")
{
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 +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();
}
@@ -173,12 +175,12 @@
new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
}
-
+
}
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew);
+ method.ErrorShow(responsePackNew, "");
}
});
@@ -187,5 +189,7 @@
};
}
+
+
}
}
--
Gitblit v1.8.0