From d4973876384be55df64de45db8a511d1e0330872 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 六月 2021 17:06:20 +0800
Subject: [PATCH] 房间小图列表
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 85177d4..93d0ae7 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -204,6 +204,7 @@
Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
+
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
var appHomeRefresh = new MqttTopicFilter()
@@ -223,6 +224,13 @@
Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
+ //涓�绔彛瀵嗛挜鏇存柊閫氱煡
+ var mqttkeyChange = new MqttTopicFilter()
+ {
+ Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/mqtt/secret/change",
+ QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
+ };
+
#endregion
@@ -230,7 +238,7 @@
var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
pirStatus,pirStudy,
appDeviceRefresh,appHomeRefresh,appRoomRefresh,
- topicFilterPush2, topicAlinkStatus });
+ topicFilterPush2, topicAlinkStatus ,mqttkeyChange});
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
isSubscribeSuccess = true;
@@ -415,6 +423,17 @@
MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁澶辫触:Code:{deviceResult.Code}; Msg:{deviceResult.message}");
}
}
+ //缃戝叧瀵嗛挜鍙樺寲
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change")
+ {
+ var pm = new HttpServerRequest();
+ pm.GetHomeGatewayList();
+ MainPage.Log($"缃戝叧瀵嗛挜鍙樻洿");
+ MainPage.Log($"鏃у瘑閽ワ細{mqttEncryptKey}");
+ mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
+ MainPage.Log($"鏂板瘑閽ワ細{mqttEncryptKey}");
+ }
+
#endregion
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
@@ -675,7 +694,7 @@
{
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
- switch (UserInfo.Current.AccountString)
+ switch (UserInfo.Current.userMobileInfo)
{
case "13415629083":
case "18316120654":
@@ -691,6 +710,7 @@
case "18316672920":
case "15971583093":
case "15626203746":
+ case "551775569@qq.com":
return;
}
--
Gitblit v1.8.0