From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 957fb02..ced74cc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -33,7 +33,7 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.id;
}
}
/// <summary>
@@ -43,7 +43,7 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
}
}
/// <summary>
@@ -150,7 +150,7 @@
/// 绾㈠鐮佸涔�
/// </summary>
/// <returns></returns>
- public static void CodeStudy(Control control,AttributesStatus buttonObj,Action<ResponsePackNew> action)
+ public static void CodeStudy(Control control, AttributesStatus buttonObj, Action<Cloud> action)
{
var job = new JObject { };
job.Add("key", buttonObj.key);
@@ -161,21 +161,32 @@
var jArray = new JArray { };
jArray.Add(job);
var jObject = new JObject { { "homeId", HomeId }, { "deviceId", control.deviceId }, { "attributes", jArray } };
- ResponsePackNew responsePackNew = null;
+ Cloud cloud = null;
new System.Threading.Thread(() =>
{
try
{
//鍙戦�佺孩澶栫爜瀛︿範鍛戒护
- responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeStudy);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeStudy);
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ PirMethod method = new PirMethod();
+ PirMethod.buttondata = "";
+ cloud = method.MqttDate("鎸夐敭", control.sid, 25);
+ }
+ else
+ {
+ PirMethod method = new PirMethod();
+ method.ErrorShow(responsePackNew, "");
+ }
}
catch { }
finally
{
Application.RunOnMainThread(() =>
{
- action(responsePackNew);
+ action(cloud);
});
}
@@ -267,7 +278,6 @@
{ IsBackground = true }.Start();
}
-
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
--
Gitblit v1.8.0