From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/DAL/Mqtt/MqttClient.cs | 120 ++++-------------------------------------------------------
1 files changed, 9 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 61ca982..a3fe1fe 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -11,7 +11,6 @@
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI;
-using HDL_ON.DAL.Server;
namespace HDL_ON.DAL.Mqtt
{
@@ -199,37 +198,16 @@
QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
};
//App璁㈤槄閬ユ帶鍣ㄨ嚜瀛︽寜閿涔犳垚鍔熼�氱煡
- var pirStudy = new MqttTopicFilter()
+ var study = new MqttTopicFilter()
{
Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/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",
- QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
- };
- //appRoomRefresh锛氭埧闂存暟鎹埛鏂伴�氱煡
- var appRoomRefresh = new MqttTopicFilter()
- {
- Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/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",
- QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
- };
- #endregion
-
Utlis.WriteLine("寮�濮嬭闃咃紒");
var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
- pirStatus,pirStudy,
- appDeviceRefresh,appHomeRefresh,appRoomRefresh,
+ pirStatus,
+ study,
topicFilterPush2, topicAlinkStatus });
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
@@ -255,10 +233,6 @@
}
if (!UserInfo.Current.IsLogin)
- {
- return;
- }
- if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
{
return;
}
@@ -313,12 +287,6 @@
}
}
- //涓�浜涚壒娈婄殑涓婚澶勭悊(涓轰簡鎵ц閫熷害,灏藉彲鑳界殑鍒姞鑰楁椂鐨勬搷浣� true:鎵ц浜嗙壒娈婂鐞� false:娌℃湁鎵ц鐗规畩澶勭悊)
- if (Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(topic, e.ApplicationMessage.Payload, mqttEncryptKey, tuyaEncryptKey) == true)
- {
- return;
- }
-
if (topic == $"/BusGateWayToClient/{UserInfo.Current.ID}" + PushNotifySqueeze)
{
var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
@@ -331,88 +299,18 @@
var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
var revString = Encoding.UTF8.GetString(bytes);
HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.controldata = revString;
+ //ReceiveCheckGateway(ss);
+ //return;
}
//App璁㈤槄閬ユ帶鍣ㄨ嚜瀛︽寜閿涔犳垚鍔熼�氱煡
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/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;
+ HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.buttondata = revString;
+ //ReceiveCheckGateway(ss);
+ //return;
}
- #region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
- //appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/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"){
- MainPage.Log("鎴块棿鏁版嵁鍒锋柊閫氱煡");
- var roomResult = new HttpServerRequest().GetRoomList();
- if (roomResult.Code == StateCode.SUCCESS)
- {
- MainPage.Log($"璇诲彇鎴块棿淇℃伅鎴愬姛");
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
- if (revData == null)
- {
- revData = new SpatialApiPack();
- }
- {
- SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
- }
- }
- else
- {
- MainPage.Log($"璇诲彇鎴块棿鏁版嵁澶辫触:Code:{roomResult.Code}; msg:{roomResult.message}");
- }
- }
- //appDeviceRefresh锛氳澶囨暟鎹埛鏂伴�氱煡
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up") {
- MainPage.Log("璁惧鏁版嵁鍒锋柊閫氱煡");
- var deviceResult = new HttpServerRequest().GetDeviceList();
- if (deviceResult.Code == StateCode.SUCCESS)
- {
- MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
- if (deviceList == null)
- {
- deviceList = new DevcieApiPack();
- }
- string delFile = "";
- if (FunctionList.List.GetDeviceFunctionList().Count > 0)
- {
- for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
- {
- var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
- if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
- {
- i++;
- continue;
- }
- var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
-
- if (delFile == localFunction.savePath)
- {
- i++;
- continue;
- }
- delFile = localFunction.savePath;
- FunctionList.List.DeleteFunction(localFunction);
- }
- }
- //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
- foreach (var newFunction in deviceList.list)
- {
- newFunction.SaveFunctionFile();
- FunctionList.List.IniFunctionList(newFunction.savePath);
- }
- }
- else
- {
- MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁澶辫触:Code:{deviceResult.Code}; Msg:{deviceResult.message}");
- }
- }
- #endregion
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/property/send")
{
@@ -424,7 +322,7 @@
else
{
//SetGatewayOnlineResetCheck();
- //var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, mqttEncryptKey);
+ var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, mqttEncryptKey);
//bus鏁版嵁瑙ｆ瀽
var packet = new Packet();
--
Gitblit v1.8.0