From e34270918f2e831048114ecdfcfec3e3cdbb6fd7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 26 五月 2022 17:42:58 +0800
Subject: [PATCH] Merge branch 'release0123' into wxr0114
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 01d44d8..883d94a 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -357,20 +357,20 @@
{
try
{
- //var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
- //Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
- //var pairSid = pairs.GetValue("sid").ToString();
- //var pairOnline = pairs.GetValue("online");
- //if (!string.IsNullOrEmpty(pairSid.ToString()))
- //{
- // var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
- // if (function_online != null){
- // function_online.online = (bool)pairOnline;
- // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- // FunctionPage.UpdataOnline(function_online);
- // RoomPage.UpdataOnline(function_online);
- // }
- //}
+ var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
+ Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
+ var pairSid = pairs.GetValue("sid").ToString();
+ var pairOnline = pairs.GetValue("online");
+ if (!string.IsNullOrEmpty(pairSid.ToString()))
+ {
+ var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
+ if (function_online != null){
+ function_online.online = (bool)pairOnline;
+ HomePage.LoadEvent_RefreshDevcieOnline(function_online);
+ FunctionPage.UpdataOnline(function_online);
+ RoomPage.UpdataOnline(function_online);
+ }
+ }
}
catch(Exception ex)
@@ -1094,8 +1094,17 @@
//鍒涘缓AES瑙ｅ瘑鍣ㄥ璞�
var cTransform = rm.CreateDecryptor();
+ byte[] reData = null;
//浣跨敤AES灏嗗瘑鏂囨祦杞垚鏄庢枃鐨勫瓧鑺傛暟缁�
- return cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+ try
+ {
+ reData = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ return reData;
}
#endregion
--
Gitblit v1.8.0