From 163777d8a2cb7cfa469f54a7042528870ebc10a3 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 17:46:20 +0800
Subject: [PATCH] 一个新版本
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 139 +++++++++++++++++++++++++++++++++-------------
1 files changed, 100 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 8c1ef41..dffdf80 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -603,7 +603,8 @@
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 82 } };
var data = new JObject { { "HomeId", homeId }, { "AccountId", accountId } };
jObject.Add("Data", data);
- Send("GwSetHomeId", jObject.ToString());
+ //浣忓畢ID鐨勮缃�,鍥哄畾浣跨敤灞�鍩熺綉,涓嶅瓨鍦ㄨ繙绋嬬殑璇存硶
+ SendLocation("GwSetHomeId", System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
}
catch { }
@@ -3177,7 +3178,7 @@
.WithTcpServer(brokerName, 1883)
.WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
.WithCleanSession()
- .WithCommunicationTimeout(TimeSpan.FromSeconds(4))
+ //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
.WithCredentials("", "")
.Build();
await localMqttClient.ConnectAsync(options, CancellationToken.None);
@@ -3358,7 +3359,7 @@
{
DebugPrintLog($"杩滅▼杩炴帴鏂紑");
await DisConnectRemoteMqttClient("StartRemoteMqtt.DisconnectedHandler");
- await StartRemoteMqtt();
+ //await StartRemoteMqtt();
});
}
if (RemoteMqttClient.ConnectedHandler == null)
@@ -3411,21 +3412,35 @@
try
{
- var jsonData = new Dictionary<string, object> { ["RequestVersion"] = "RequestVersion", ["RequestSource"] = 0, ["LoginAccessToken"] = Config.Instance.Token, ["RequestProtocolType"] = 0 };
- var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
-
- var result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
- //{
- //"ResponseVersion": "RequestVersion1",
- //"StateCode": "Success",
- //"ErrorInfo": null,
- //"ResponseData": { < !--濡備笅淇℃伅鍙兘浣跨敤涓�娆★紝鍗充究浣犺繛鎺ュけ璐�!-- >
- // "ConnEmqDomainPort": "tcp://developer.hdlcontrol.com:1883",
- // "ConnEmqClientId": "ZigbeeClientTcp_33094de8-34ba-4e38-93c2-ac8da16d0e68_Zigbee",
- // "ConnEmqUserName": "33094de8-34ba-4e38-93c2-ac8da16d0e68",
- // "ConnEmqPwd": "4a265b65-d6cc-4a"
- //}
- //}
+ byte[] result = null;
+ if (Config.Instance.Home.IsOthreShare == false)
+ {
+ //涓讳汉
+ var jsonData = new Dictionary<string, object>
+ {
+ ["RequestVersion"] = CommonPage.RequestVersion,
+ ["RequestSource"] = 0,
+ ["LoginAccessToken"] = Config.Instance.Token,
+ ["RequestProtocolType"] = 0
+ };
+ var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
+ result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
+ }
+ else
+ {
+ //鍒嗕韩鐨�
+ var jsonData = new Dictionary<string, object>
+ {
+ ["RequestVersion"] = CommonPage.RequestVersion,
+ ["RequestSource"] = 0,
+ ["LoginAccessToken"] = Config.Instance.Token,
+ ["RequestProtocolType"] = 0,
+ ["MainUserDistributedMark"] = Config.Instance.Home.MainUserDistributedMark,
+ ["HomeId"] = Config.Instance.Home.Id
+ };
+ var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
+ result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
+ }
if (result != null)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
@@ -3447,7 +3462,7 @@
.WithCredentials(connEmqUserName, connEmqPwd)
.WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
.WithCleanSession()
- .WithCommunicationTimeout(TimeSpan.FromSeconds(6))
+ //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
.Build();
await DisConnectRemoteMqttClient("StartRemoteMqtt");
await RemoteMqttClient.ConnectAsync(options, CancellationToken.None);
@@ -3601,9 +3616,7 @@
//鏂囦欢娴佷笉鐢ㄥ姞瀵�
if (topic != "FileTransfer/SendFile")
{
- topic = ZigBee.Common.SecuritySet.AesEncrypt(System.Text.Encoding.UTF8.GetBytes(topic), Password);
- topic = topic.Replace("/", "[[$-MQTT_TILT_SYMBOL_REPLACE-$]]").Replace("+", "[[$-MQTT_PLUS_SYMBOL_REPLACE-$]]");
- message = System.Text.Encoding.UTF8.GetBytes(SecuritySet.AesEncrypt(message, password));
+ message = SecuritySet.AesEncryptBytes(message, password);
}
}
if (localIsConnected)
@@ -3614,10 +3627,12 @@
}
catch(Exception e)
{
+ DebugPrintLog($"Local涓诲姩鏂紑_{e.Message}");
await DisConnectLocalMqttClient(e.Message);
await StartLocalMqtt("ReConnect");
if (localIsConnected)
{
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
}
}
@@ -3644,8 +3659,58 @@
return;
}
await Send(topic, System.Text.Encoding.UTF8.GetBytes(message), retain);
+ }
+
+ /// <summary>
+ /// 寮哄埗鎸囧畾浣跨敤鏈湴灞�鍩熺綉鍙戦�佹秷鎭埌鏈嶅姟鍣�
+ /// </summary>
+ /// <returns></returns>
+ /// <param name="topic"></param>
+ /// <param name="message"></param>
+ /// <param name="retain"></param>
+ public async Task SendLocation(string topic, byte[] message, bool retain = false)
+ {
+ try
+ {
+ if (Shared.Common.Config.Instance.HomeId == "")
+ {
+ return;
+ }
+
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+
+ if (IsEncry)
+ {
+ //鏂囦欢娴佷笉鐢ㄥ姞瀵�
+ if (topic != "FileTransfer/SendFile")
+ {
+ message = SecuritySet.AesEncryptBytes(message, password);
+ }
+ }
+ if (localIsConnected)
+ {
+ try
+ {
+ await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ catch (Exception e)
+ {
+ DebugPrintLog($"Local涓诲姩鏂紑_{e.Message}");
+ await DisConnectLocalMqttClient(e.Message);
+ await StartLocalMqtt("ReConnect");
+ if (localIsConnected)
+ {
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ DebugPrintLog($"Send:{ex.Message}");
+ }
}
-
[Serializable]
public class CloudTimeResponse
@@ -3664,8 +3729,7 @@
{
try
{
- var topic = e.ApplicationMessage.Topic.TrimStart('/');
- topic = topic.Replace("[[$-MQTT_TILT_SYMBOL_REPLACE-$]]", "/").Replace("[[$-MQTT_PLUS_SYMBOL_REPLACE-$]]", "+");
+ var topic = e.ApplicationMessage.Topic.TrimStart('/');
var payload = e.ApplicationMessage.Payload;
var message = string.Empty;
@@ -3680,7 +3744,7 @@
{
return;
}
- if (topics[2]== "NotifyGateWayInfoChagne") {
+ if (topics[2]== "NotifyGateWayInfoChange") {
initGateWayBaseInfomation();
return;
}
@@ -3727,39 +3791,36 @@
{
try
{
- var topic = e.ApplicationMessage.Topic;
- topic = topic.Replace("[[$-MQTT_TILT_SYMBOL_REPLACE-$]]", "/").Replace("[[$-MQTT_PLUS_SYMBOL_REPLACE-$]]", "+");
- var message = System.Text.Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
+ var topic = e.ApplicationMessage.Topic;
+ string payloadString = "";
if (IsEncry)
{
//涓婚
- topic = Common.SecuritySet.AesDecrypt(System.Text.Encoding.UTF8.GetBytes(topic), Password);
//涓嬭浇鐨勫瓧鑺傛祦涓嶉渶瑕佽В瀵�
if (topic.Split('/')[0] + "/" + topic.Split('/')[1] == topic.Split('/')[0] + "/" + "FileTransfer")
{
if (topic.Split('/')[2] != "DownloadFile")
{
- message = Common.SecuritySet.AesDecrypt(e.ApplicationMessage.Payload, Password);
+ payloadString = System.Text.Encoding.UTF8.GetString(Common.SecuritySet.AesDecryptBytes(e.ApplicationMessage.Payload, Password));
}
}
else if (topic == topic.Split('/')[0] + "/" + "SendAESKey_Respon") { }//鍥炲涓婚鏄鏂囷紝鏁版嵁鏄槑鏂�
else
{
- message = Common.SecuritySet.AesDecrypt(e.ApplicationMessage.Payload, Password);
+ payloadString = System.Text.Encoding.UTF8.GetString(Common.SecuritySet.AesDecryptBytes(e.ApplicationMessage.Payload, Password));
}
}
-
-#if DEBUG
- DebugPrintLog($"缃戝叧杩斿洖鐨勪富棰�:{topic}_缃戝叧杩斿洖鐨勮礋杞�:{message}_{System.DateTime.Now.ToString()}");
-#endif
- ReceiveMessage(topic, message, e.ApplicationMessage.Payload);
+ else
+ {
+ payloadString = System.Text.Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
+ }
+ DebugPrintLog($"缃戝叧杩斿洖鐨勪富棰�:{topic}_缃戝叧杩斿洖鐨勮礋杞�:{payloadString}");
+ ReceiveMessage(topic, payloadString, e.ApplicationMessage.Payload);
}
catch (Exception ex)
{
-#if DEBUG
DebugPrintLog($"鎺ユ敹缃戝叧鏁版嵁寮傚父:{ex.Message}");
-#endif
}
}
--
Gitblit v1.8.0