From c877bc16eb02df246e48377101af0fa5ec626c14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 八月 2021 10:00:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 1a46ca6..559725c 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -446,12 +446,12 @@
//瀹夐槻鐘舵�佸彉鍖�
else if (topic == $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/security/status/up")
{
- MainPage.Log($"瀹夐槻鐘舵�佸彉鍖�");
if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
{
var securityBytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
var securityString = Encoding.UTF8.GetString(securityBytes);
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
+ MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
if (temp != null)
{
@@ -462,6 +462,7 @@
if (updataLocalSecurity != null)
{
updataLocalSecurity.status = updataSecurity.status;
+ updataLocalSecurity.alarm = updataSecurity.alarm;
}
}
HomePage.LoadEvent_RefreshSecurityStatus();
--
Gitblit v1.8.0