From 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 八月 2023 14:28:22 +0800
Subject: [PATCH] 备份1
---
OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs | 62 -------------------------------
1 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs b/OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs
index f4e129f..a500624 100644
--- a/OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -270,11 +270,6 @@
topicFilterPush2, topicAlinkStatus ,mqttkeyChange,
deviceOnlinePush,
securityStatusChange});
- //璁㈤槄缇ゆ帶鐘舵��
- if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
- {
- await RemoteMqttClient.SubscribeAsync(groupControlStatus);
- }
if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
{
isSubscribeSuccess = true;
@@ -443,20 +438,6 @@
}
}
- //App璁㈤槄绾㈠瀹�/缃戝叧閬ユ帶鍣ㄦ坊鍔犳垚鍔熼�氱煡
- 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.PirMethod.controldata = revString;
- }
- //App璁㈤槄閬ユ帶鍣ㄨ嚜瀛︽寜閿涔犳垚鍔熼�氱煡
- 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.PirMethod.buttondata = revString;
- }
#region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
//appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
@@ -499,50 +480,7 @@
pm.GetHomeGatewayList();
MainPage.Log($"缃戝叧瀵嗛挜鍙樻洿.鏂板瘑閽ワ細{DB_ResidenceData.Instance.HomeGateway.aesKey}");
}
- //瀹夐槻鐘舵�佸彉鍖�
- else if (topic == $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/security/status/up")
- {
- if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
- {
- try
- {
- 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}");
- //Control.Ins.MsgInfoList.Add($"杩滅▼瀹夐槻鐘舵�佸彉鍖栵細{securityString}" + "\r\n");
-
- if (temp != null)
- {
- foreach (var updataSecurity in temp.objects)
- {
- var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
- if (updataLocalSecurity != null)
- {
- updataLocalSecurity.status = updataSecurity.status;
- updataLocalSecurity.alarm = updataSecurity.alarm;
- ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
- }
- }
- HomePage.LoadEvent_RefreshSecurityStatus();
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"瀹夐槻杩滅▼淇℃伅寮傚父:{ex.Message}");
- }
- }
- }
#endregion
- //缇ゆ帶鐘舵��
- else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/device/group/control/property/send")
- {
- var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
- var revString = Encoding.UTF8.GetString(bytes);
- MainPage.Log($"mqtt 缇ゆ帶鐘舵�佹洿鏂�:{revString}");
- Control.Ins.UpdataGroupControlStatus(revString, null, true);
- }
//A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
//Tag 缃戠粶鐘舵�佽В鏋�
else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
--
Gitblit v1.8.0