From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 61ca982..90cc0da 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -189,38 +189,38 @@
};
var topicAlinkStatus = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/property/send",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//App璁㈤槄绾㈠瀹� / 缃戝叧閬ユ帶鍣ㄦ坊鍔犳垚鍔熼�氱煡
var pirStatus = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/topo/found",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/topo/found",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//App璁㈤槄閬ユ帶鍣ㄨ嚜瀛︽寜閿涔犳垚鍔熼�氱煡
var pirStudy = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/irCodeStudyDone/up",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
var appHomeRefresh = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//appRoomRefresh锛氭埧闂存暟鎹埛鏂伴�氱煡
var appRoomRefresh = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appRoomRefresh/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//appDeviceRefresh锛氳澶囨暟鎹埛鏂伴�氱煡
var appDeviceRefresh = new MqttTopicFilter()
{
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up",
+ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
#endregion
@@ -258,7 +258,7 @@
{
return;
}
- if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
+ if (DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.id == null)
{
return;
}
@@ -287,7 +287,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())
{
@@ -326,27 +326,29 @@
ReceiveNotifySqueezeAsync(mMes);
}
//App璁㈤槄绾㈠瀹�/缃戝叧閬ユ帶鍣ㄦ坊鍔犳垚鍔熼�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/topo/found")
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/topo/found")
{
var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
var revString = Encoding.UTF8.GetString(bytes);
HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.controldata = revString;
}
//App璁㈤槄閬ユ帶鍣ㄨ嚜瀛︽寜閿涔犳垚鍔熼�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/irCodeStudyDone/up")
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up")
{
var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
var revString = Encoding.UTF8.GetString(bytes);
- UI.UI2.PersonalCenter.PirDevice.Method.controldata = revString;
+ UI.UI2.PersonalCenter.PirDevice.Method.buttondata = revString;
}
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up") {
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
+ {
MainPage.Log("浣忓畢鏁版嵁鍒锋柊閫氱煡");
new HttpServerRequest().GetHomePager();
}
//appRoomRefresh锛氭埧闂存暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up"){
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appRoomRefresh/up")
+ {
MainPage.Log("鎴块棿鏁版嵁鍒锋柊閫氱煡");
var roomResult = new HttpServerRequest().GetRoomList();
if (roomResult.Code == StateCode.SUCCESS)
@@ -367,7 +369,8 @@
}
}
//appDeviceRefresh锛氳澶囨暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up") {
+ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
+ {
MainPage.Log("璁惧鏁版嵁鍒锋柊閫氱煡");
var deviceResult = new HttpServerRequest().GetDeviceList();
if (deviceResult.Code == StateCode.SUCCESS)
@@ -414,11 +417,11 @@
}
#endregion
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/property/send")
+ 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);
- Control.Ins.UpdataFunctionStatus(revString, null,true);
+ Control.Ins.UpdataFunctionStatus(revString, null, true);
}
//涓�绔彛鏁版嵁瑙ｆ瀽
else
@@ -578,13 +581,13 @@
MqttInfoConfig.Current.Save();
-
+
mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
//瑙ｅ瘑瀵嗛挜瑙勫垯锛氬凡鐜版湁鐨勪綇瀹匢D涓哄熀鍑�,浠庡彸杈逛竴涓�鑾峰彇鍊�,鏈�鍚庡鏋滀笉澶�16浣�,鍒欏線鍙宠ˉ闆�
string aesKey = string.Empty;
- for (int i = DB_ResidenceData.Instance.CurrentRegion.RegionID.Length - 1; i >= 0; i--)
+ for (int i = DB_ResidenceData.Instance.CurrentRegion.id.Length - 1; i >= 0; i--)
{
- aesKey += DB_ResidenceData.Instance.CurrentRegion.RegionID[i].ToString();
+ aesKey += DB_ResidenceData.Instance.CurrentRegion.id[i].ToString();
if (aesKey.Length == 16) { break; }
}
aesKey = aesKey.PadRight(16, '0');
@@ -666,7 +669,7 @@
/// </summary>
static void ReceiveNotifySqueezeAsync(string mMes)
{
- if (mMes == PushSignStr ) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
+ if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
@@ -682,6 +685,7 @@
case "13602944661":
case "18778381374":
case "18316672920":
+ case "15971583093":
return;
}
@@ -984,4 +988,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0