From 32ad85a377b00bc54ad7f15a45d7631d3e2b10d5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 13 六月 2022 17:41:12 +0800
Subject: [PATCH] 2022年06月13日17:39:46
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 2adbeba..882cf3b 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)
@@ -511,12 +511,15 @@
}
#endregion
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
+ //Tag 缃戠粶鐘舵�佽В鏋�
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
{
var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
var revString = Encoding.UTF8.GetString(bytes);
MainPage.Log($"mqtt 鐘舵�佹洿鏂�:{revString}");
Control.Ins.UpdataFunctionStatus(revString, null, true);
+ //Control.Ins.MsgInfoList.Add($"mqtt 鐘舵�佹洿鏂�:{revString}");
+
//Control.Ins.MsgInfoList.Add(revString + "\r\n");
}
//涓�绔彛鏁版嵁瑙ｆ瀽
@@ -1094,8 +1097,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