From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
index 88fab8d..981bf1c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
@@ -133,9 +133,9 @@
buttonObj.key = "key" + control.attributes.Count.ToString();
buttonObj.value = texts;
- PirSend.CodeStudy(control.deviceId, buttonObj, (responsePackNew) =>
+ PirSend.CodeStudy(new Control() { deviceId = control.deviceId,sid = control.sid }, buttonObj, (mqttData) =>
{
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ if (mqttData != null)// && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
Method method = new Method();
Method.buttondata = "";
@@ -154,7 +154,7 @@
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew, "");
+ new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiashibai));
}
});
--
Gitblit v1.8.0