From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | 15 ++++++++-------
1 files changed, 8 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 aecbe5b..d22a2ca 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)
{
@@ -134,11 +134,12 @@
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
Method method = new Method();
- var mqttdate = method.MqttDate(control.sid, 20);
- 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);
@@ -170,15 +171,15 @@
else
{
replication.RemView();
- new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
+ new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
}
-
+
}
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew);
+ method.ErrorShow(responsePackNew, "");
}
});
--
Gitblit v1.8.0