From db45c85a6ddebc5018b32a9d9dc04f839db3fa76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 28 九月 2021 15:59:34 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/DAL/DriverLayer/Control.cs | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 0efa582..84584fd 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -63,7 +63,19 @@
/// 鏄惁鎼滅储鏈湴缃戝叧鎴愬姛
/// </summary>
public bool IsSearchLocalGatewaySuccessful = false;
-
+ /// <summary>
+ /// 鏄惁鏈湴鍔犲瘑锛岀洰鍓嶅彧瀵笰缃戝叧鏈夌敤
+ /// </summary>
+ public bool IsLocalEncrypt;
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏈湴鍔犲瘑骞朵笖鍔犲瘑key涓嶄负绌�
+ /// </summary>
+ public bool IsLocalEncryptAndGetAesKey {
+ get {
+ return IsLocalEncrypt && (!string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.localSecret));
+ }
+ }
+
bool _GatewayOnline_Local = false;
/// <summary>
/// 缃戝叧鍦ㄧ嚎-灞�鍩熺綉
@@ -395,9 +407,12 @@
switch (function.spk)
{
case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaAirCleaner2:
case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaFan2:
case SPK.ElectricTuyaWaterValve:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWeepRobot2:
useRemote = true;
break;
}
@@ -689,15 +704,45 @@
/// <summary>
/// 杞崲鍙戦�佹暟鎹�
/// </summary>
- public byte[] ConvertSendBodyData(string topic, string bodyDataString)
+ /// <param name="topic">涓婚</param>
+ /// <param name="bodyDataString">body鍐呭鏁版嵁</param>
+ /// <param name="isEncryption">鏄惁瑕佸body鍔犲瘑</param>
+ /// <returns></returns>
+ public byte[] ConvertSendBodyData(string topic, string bodyDataString, bool isEncryption = true)
{
- string topicString = "Topic:" + topic + "\r\n";
- byte[] bodyBytes = Encoding.ASCII.GetBytes(bodyDataString);
- string lengthString = "Length:" + bodyBytes.Length.ToString() + "\r\n" + "\r\n";
+ //string topicString = "Topic:" + topic + "\r\n";
+ //byte[] bodyBytes = Encoding.ASCII.GetBytes(bodyDataString);
+ //string lengthString = "Length:" + bodyBytes.Length.ToString() + "\r\n" + "\r\n";
- string sendDataString = topicString + lengthString + bodyDataString;
- byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
- MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
+ //string sendDataString = topicString + lengthString + bodyDataString;
+ //byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
+ //MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
+
+ //***************************************************************
+ //2021-09-23 澧炲姞鏈湴閫氫俊鍔犲瘑澶勭悊
+ //1.鎷兼帴澶�
+ string topicString = "Topic:" + topic + "\r\n";
+ //2.Body瀛楃涓茶浆涓篵yte鏁扮粍
+ byte[] bodyBytes = Encoding.ASCII.GetBytes(bodyDataString);
+ //鍒ゆ柇鏄惁闇�鍔犲瘑Body鏁版嵁
+ if (isEncryption && IsLocalEncryptAndGetAesKey)
+ {
+ bodyBytes = Securitys.EncryptionService.AesEncryptPayload(bodyBytes, DB_ResidenceData.Instance.CurrentRegion.localSecret);
+ //bodyDataString = Encoding.UTF8.GetString(bodyBytes);
+ //MainPage.Log($"杞崲HDL-Link鏁版嵁 鍔犲瘑key锛�" + DB_ResidenceData.Instance.CurrentRegion.localSecret);
+ }
+ //3.鎷兼帴body鐨凩ength闀垮害鏁版嵁
+ string lengthString = "Length:" + bodyBytes.Length.ToString() + "\r\n" + "\r\n";
+ string topicAndLengthString = topicString + lengthString;
+ byte[] topicAndLengthBytes = Encoding.ASCII.GetBytes(topicAndLengthString);
+ //4.鎷兼帴鍚堝苟 Topic 鍜� body鐨刡yte鏁扮粍鏁版嵁
+ byte[] sendDataBytes = new byte[topicAndLengthBytes.Length + bodyBytes.Length];
+ topicAndLengthBytes.CopyTo(sendDataBytes, 0);
+ bodyBytes.CopyTo(sendDataBytes, topicAndLengthBytes.Length);
+
+ //var sendDataString = Encoding.UTF8.GetString(sendDataBytes);
+ //MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
+ //***************************************************************
return sendDataBytes;
}
@@ -708,15 +753,19 @@
public void ConvertReceiveData(byte[] receiveBytes)
{
var reString = Encoding.UTF8.GetString(receiveBytes);
- AnalysisReceiveData(reString);
+ AnalysisReceiveData(reString, receiveBytes);
}
/// <summary>
/// 杞崲鎺ユ敹鍒扮殑鏁版嵁
/// </summary>
+ /// <param name="receiveString">杞琒tring鍚庣殑鏁版嵁</param>
+ /// <param name="originalReceiveBytes"鍘熷Bytes鏁版嵁</param>
/// <returns></returns>
- public LocalCommunicationData AnalysisReceiveData(string receiveString)
+ public LocalCommunicationData AnalysisReceiveData(string receiveString, byte[] originalReceiveBytes)
{
LocalCommunicationData receiveObj = new LocalCommunicationData();
+
+ MainPage.Log($"灞�鍩熺綉淇℃伅: \r\n{receiveString}");
var res = receiveString.Split("\r\n\r\n");
@@ -738,8 +787,7 @@
}
}
- MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic} : 鍐呭: {res[1]}");
-
+ //MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic} : 鍐呭: {res[1]}");
//楠岃瘉鏈夋晥鏁版嵁闀垮害
//if (res[1].Length != receiveObj.Length)
@@ -748,6 +796,40 @@
// return receiveObj;
//}
receiveObj.BodyDataString = res[1];
+
+ //2021-09-23 杩囨护涓嶉渶瑕佽В瀵嗙殑涓婚 鐩墠鎼滅储缃戝叧涓婚涓嶅姞瀵�
+ if (receiveObj.Topic != CommunicationTopic.SearchLoaclGatewayReply)
+ {
+ //鍒ゆ柇褰撳墠缃戝叧鏄惁寮�鍚簡鏈湴鍔犲瘑
+ if (IsLocalEncryptAndGetAesKey)
+ {
+ MainPage.Log($"灞�鍩熺綉淇℃伅 寮�濮嬭В瀵�");
+ if (originalReceiveBytes != null)
+ {
+ //鎷垮埌鍘熷Bytes鏁版嵁鍘昏В瀵�
+ byte[] topicBytes = Encoding.UTF8.GetBytes(res[0]);
+ byte[] bodyBytes = new byte[receiveObj.Length];
+ Array.Copy(originalReceiveBytes, topicBytes.Length + 4, bodyBytes, 0, receiveObj.Length);
+ byte[] receiveBytes = Securitys.EncryptionService.AesDecryptPayload(bodyBytes, DB_ResidenceData.Instance.CurrentRegion.localSecret);
+ var revString = Encoding.UTF8.GetString(receiveBytes);
+ receiveObj.BodyDataString = revString;
+ MainPage.Log($"灞�鍩熺綉淇℃伅: 瑙ｅ瘑鍚庯細" + receiveObj.BodyDataString);
+ }
+ else
+ {
+ //鐩墠涓嶆嬁鍘熷Bytes鏁版嵁 瑙ｅ瘑涓嶄簡
+ //byte[] receiveBytes = Encoding.UTF8.GetBytes(res[1]);
+ //MainPage.Log($"灞�鍩熺綉淇℃伅 receiveBytes {receiveBytes.Length}");
+ //receiveBytes = Securitys.EncryptionService.AesDecryptPayload(receiveBytes, DB_ResidenceData.Instance.CurrentRegion.localSecret);
+ //MainPage.Log($"灞�鍩熺綉淇℃伅 瑙ｅ瘑鍚庯細receiveBytes {receiveBytes.Length}");
+ //var revString = Encoding.UTF8.GetString(receiveBytes);
+ //receiveObj.BodyDataString = revString;
+ //MainPage.Log($"灞�鍩熺綉淇℃伅: 瑙ｅ瘑鍚庯細" + receiveObj.BodyDataString);
+ }
+
+ }
+ }
+
if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply || receiveObj.Topic == CommunicationTopic.GatewayBroadcast)
{
@@ -772,7 +854,10 @@
{
Ins.GatewayId = device.device_mac;
}
- reportIp = device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧//"239.0.168.188";//
+ reportIp = device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧//"239.0.168.188";//
+ //2021-09-23 鏂板鑾峰彇褰撳墠缃戝叧鏄惁鏈湴鍔犲瘑
+ Ins.IsLocalEncrypt = device.isLocalEncrypt;
+ //MainPage.Log("缃戝叧鏈湴鍔犲瘑鐘舵�侊細" + device.local_encrypt.ToString());
}
}
else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
@@ -892,6 +977,7 @@
DimmerPage.UpdataStates(localFunction);
break;
case SPK.ElectricFan:
+ case SPK.HvacFan:
localFunction.lastState = Language.StringByID(StringId.Level) + " : " +
localFunction.GetAttrState(FunctionAttributeKey.OpenLevel);
FanPage.UpdataState(localFunction);
@@ -962,6 +1048,7 @@
ACPage.UpdataStates(localFunction);
}
break;
+ case SPK.HvacFloorHeat:
case SPK.FloorHeatStandard:
localFunction.lastState = "";
switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
@@ -1016,14 +1103,19 @@
//A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.ElectricSocket:
+ case SPK.PanelSocket:
SocketPage.UpdataState(localFunction);
break;
case SPK.ElectricTV:
break;
case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaAirCleaner2:
case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaFan2:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWeepRobot2:
case SPK.ElectricTuyaWaterValve:
+ case SPK.ElectricTuyaWaterValve2:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorSmoke:
@@ -1031,7 +1123,9 @@
case SPK.ClothesHanger:
case SPK.AcIr:
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
--
Gitblit v1.8.0