From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 85177d4..b7de875 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鍔犲瘑閫氳KEY
/// </summary>
- static string mqttEncryptKey = "";
+ //static string mqttEncryptKey = "";
static string tuyaEncryptKey = "";
//static string checkGatewayTopicBase64 = "";
static bool hadGateway = true;
@@ -204,11 +204,18 @@
Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
+
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
- //appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
+ //appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡--鏉ㄦ稕
var appHomeRefresh = new MqttTopicFilter()
{
Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up",
+ QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
+ };
+ //浣忓畢娑堟伅鍙樻洿鎺ㄩ��--璞嗚眴
+ var residenceChange = new MqttTopicFilter()
+ {
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//appRoomRefresh锛氭埧闂存暟鎹埛鏂伴�氱煡
@@ -220,17 +227,24 @@
//appDeviceRefresh锛氳澶囨暟鎹埛鏂伴�氱煡
var appDeviceRefresh = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
+ Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/event/appHomeRefresh/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
Utlis.WriteLine("寮�濮嬭闃咃紒");
var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
pirStatus,pirStudy,
- appDeviceRefresh,appHomeRefresh,appRoomRefresh,
- topicFilterPush2, topicAlinkStatus });
+ appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
+ topicFilterPush2, topicAlinkStatus ,mqttkeyChange});
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
isSubscribeSuccess = true;
@@ -287,7 +301,7 @@
try
{
var topic = e.ApplicationMessage.Topic;
- //MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
+ MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
//涓�绔彛涓婚澶勭悊
if (DB_ResidenceData.Instance.GatewayType == 0 && !DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
{
@@ -314,10 +328,7 @@
}
//涓�浜涚壒娈婄殑涓婚澶勭悊(涓轰簡鎵ц閫熷害,灏藉彲鑳界殑鍒姞鑰楁椂鐨勬搷浣� true:鎵ц浜嗙壒娈婂鐞� false:娌℃湁鎵ц鐗规畩澶勭悊)
- if (Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(topic, e.ApplicationMessage.Payload, mqttEncryptKey, tuyaEncryptKey) == true)
- {
- return;
- }
+ Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(topic, e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey, tuyaEncryptKey);
if (topic == $"/BusGateWayToClient/{UserInfo.Current.ID}" + PushNotifySqueeze)
{
@@ -341,7 +352,8 @@
}
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up"
+ || topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
{
MainPage.Log("浣忓畢鏁版嵁鍒锋柊閫氱煡");
new HttpServerRequest().GetHomePager();
@@ -415,6 +427,14 @@
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($"缃戝叧瀵嗛挜鍙樻洿.鏂板瘑閽ワ細{DB_ResidenceData.Instance.HomeGateway.aesKey}");
+ }
+
#endregion
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
@@ -431,9 +451,9 @@
//bus鏁版嵁瑙ｆ瀽
var packet = new Packet();
- if (!string.IsNullOrEmpty(mqttEncryptKey))
+ if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
{
- packet.Bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, mqttEncryptKey);
+ packet.Bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
}
else
{
@@ -469,6 +489,25 @@
#endregion
//(4)===========寮�濮嬭繛鎺ヨ繃绋�==========
+
+ ////涓�绔彛姣忔閮借鍒锋柊瀵嗛挜
+ //if (DB_ResidenceData.Instance.HomeGateway != null && DB_ResidenceData.Instance.HomeGateway.gatewayType == "BUSUDPGATEWAY") {
+ // var pm = new HttpServerRequest();
+ // var result = pm.GetHomeGatewayList();
+ // if(result == StateCode.SUCCESS)
+ // {
+ // MainPage.Log($"鍒锋柊涓�绔彛瀵嗛挜");
+ // MainPage.Log($"鏃у瘑閽ワ細{mqttEncryptKey}");
+ // mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
+ // MainPage.Log($"鏂板瘑閽ワ細{mqttEncryptKey}");
+ // }else
+ // {
+ // return;
+ // }
+ //}
+
+
+
//涔嬪墠宸茬粡鑾峰彇鍙傛暟鎴愬姛杩�
if (MqttInfoConfig.Current.IfGetMqttInfoSuccess)
{
@@ -584,7 +623,7 @@
- mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
+ //mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
//瑙ｅ瘑瀵嗛挜瑙勫垯锛氬凡鐜版湁鐨勪綇瀹匢D涓哄熀鍑�,浠庡彸杈逛竴涓�鑾峰彇鍊�,鏈�鍚庡鏋滀笉澶�16浣�,鍒欏線鍙宠ˉ闆�
string aesKey = string.Empty;
for (int i = DB_ResidenceData.Instance.CurrentRegion.id.Length - 1; i >= 0; i--)
@@ -675,7 +714,7 @@
{
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
- switch (UserInfo.Current.AccountString)
+ switch (UserInfo.Current.userMobileInfo)
{
case "13415629083":
case "18316120654":
@@ -691,6 +730,7 @@
case "18316672920":
case "15971583093":
case "15626203746":
+ case "551775569@qq.com":
return;
}
@@ -759,9 +799,9 @@
{
case 0:
topicName = $"/ClientToBusGateWay/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/Common/ON";
- if (!string.IsNullOrEmpty(mqttEncryptKey))
+ if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
{
- message = Securitys.EncryptionService.AesEncryptPayload(message, mqttEncryptKey);
+ message = Securitys.EncryptionService.AesEncryptPayload(message, DB_ResidenceData.Instance.HomeGateway.aesKey);
}
await RemoteMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topicName, Payload = message, Retain = false, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce });
break;
--
Gitblit v1.8.0