From 365eadb33ee86b05ac74d408025d102a758c2efd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 15:27:17 +0800
Subject: [PATCH] 2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。
---
Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
index 7f96fc6..ae7399e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
@@ -68,13 +68,13 @@
public static async System.Threading.Tasks.Task StartCloudMqtt ()
{
- Application.RunOnMainThread (() => {
- if (5 < (DateTime.Now - dateTime).TotalSeconds) {
- return;
- }
- //MainPage.Loading.Start (Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.Connecting));
- dateTime = DateTime.Now;
- });
+ //Application.RunOnMainThread (() => {
+ // if (5 < (DateTime.Now - dateTime).TotalSeconds) {
+ // return;
+ // }
+ // //MainPage.Loading.Start (Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.Connecting));
+ // dateTime = DateTime.Now;
+ //});
if (!MainPage.LoginUser.IsLogin) {
return;
}
@@ -104,10 +104,11 @@
//Console.WriteLine ("Topic={0}", aesDecryptTopic);
if (aesDecryptTopic == $"NotifyBusGateWayInfoChagne/{CurRemoteMACInfo.md5_mac_string}") {//缃戝叧涓婄嚎锛岄渶瑕佹洿鏂癮eskey
- //----绗簩姝ワ細璇诲彇璐﹀彿涓嬮潰鐨勭綉鍏冲垪琛�
- var gatewayListUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetGatewayPagger"; //App銆丅uspro杞欢鐧诲綍鍚庤幏鍙栫綉鍏冲垪琛� http 璇锋眰
+ Console.WriteLine ("缃戝叧涓婄嚎锛岄渶瑕佹洿鏂癮eskey");
+ //----绗簩姝ワ細璇诲彇璐﹀彿涓嬮潰鐨勭綉鍏冲垪琛�
+ var gatewayListUrl = $"{MainPage.RequestHttpsHostMqtt}/Center/Center/GetGatewayPagger"; //App銆丅uspro杞欢鐧诲綍鍚庤幏鍙栫綉鍏冲垪琛� http 璇锋眰
var gatewayListRequestPar = new RemoteRequestParameters () { Mac = CurRemoteMACInfo.mac, LoginAccessToken = mqttRequestParToken, RequestVersion = "RequestVersion1", RequestProtocolType = 0, RequestSource = 1 };
- var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar), false, false, gatewayListUrl);
+ var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar),gatewayListUrl);
var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (gatewayListRequestResult.ResponseData.ToString ());
if (gatewayListRequestResult_Obj != null && gatewayListRequestResult_Obj.pageData.Count > 0) {
CurRemoteMACInfo.aesKey = gatewayListRequestResult_Obj.pageData [0].aesKey;
@@ -139,7 +140,7 @@
//});
break;
case "Success":
- MainPage.AddTip (UserConfig.Instance.CurrentRegion.RegionName + ":" + Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.LinkSuccess));
+ MainPage.AddTip (UserConfig.Instance.CurrentRegion.Name + ":" + Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.LinkSuccess));
MainPage.WiFiStatus = "CrabtreeAdd/CloudLink.png";
break;
default:
@@ -189,8 +190,12 @@
//});
Shared.SimpleControl.Phone.UserMiddle.ReadAllDeviceStatus ();
System.Console.WriteLine ($"杩滅▼杩炴帴鎴愬姛");
- MainPage.WiFiStatus = "CrabtreeAdd/CloudLink.png";
- UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
+ if (CommonPage.IsRemote) {
+ Utlis.ShowAppLinkStatus (AppLinkStatus.CloudLink);
+ }
+
+ //MainPage.WiFiStatus = "CrabtreeAdd/CloudLink.png";
+ //UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
if (CurRemoteMACInfo != null) {
if (CurRemoteMACInfo.isValid == "InValid") {
MainPage.AddTip ("Remote failed,gateway offline");
@@ -217,9 +222,9 @@
try {
try {
//鏂紑鍚庨噸鏂伴摼鎺ラ渶瑕侀噸鏂扮櫥褰曡幏鍙栬繛鎺ョ殑瀵嗙爜
- var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString.ToLower (), Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
+ var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString.ToLower (), Password = MainPage.LoginUser.Password };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var tempResult = MainPage.RequestHttps ("Login", requestJson, false);
+ var tempResult = MainPage.RequestHttps (API.Login, requestJson);
if (tempResult == null) {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -242,17 +247,34 @@
return;
}
- var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
+ var requestObj3 = new GetSingleHomeGatewayPaggerObj ();
+ requestObj3.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString;
+ requestObj3.ReqDto.HomeId = UserConfig.Instance.CurrentRegion.Id;
+ requestObj3.ReqDto.PageSetting.Page = 1;
+ requestObj3.ReqDto.PageSetting.PageSize = 999;
+ string urlHead = MainPage.RequestHttpsHost;
+ if (requestObj3.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ }
+
+
+ //var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
- var revertObj3 = MainPage.RequestHttps ("GatewayByRegionList", requestJson3, true, false);
- if (revertObj3.StateCode == "SUCCESS") {
- var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>> (revertObj3.ResponseData.ToString ());
- var gatewayList = responseDataObj;
+ var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
+ if (revertObj3.StateCode.ToUpper() == "SUCCESS") {
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
+ var gatewayList = infoResult.PageData;
if (gatewayList != null && gatewayList.Count > 0) {
- UserConfig.Instance.CurrentRegion.MAC = gatewayList [0].MAC;
- UserConfig.Instance.SaveUserConfig ();
- Console.WriteLine ("Remote mqtt get Region MAC : " + gatewayList [0].MAC);
+ if (UserConfig.Instance.CheckHomeGateways ()) {
+ UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId = gatewayList [0].GatewayUniqueId;
+ UserConfig.Instance.SaveUserConfig ();
+ Console.WriteLine ("Remote mqtt get Region MAC : " + gatewayList [0].GatewayUniqueId);
+ }
}
+ } else {
+ //鎻愮ず閿欒
+ //GetSingleHomeGatewayPagger
}
if (tempResult == null) {
@@ -264,9 +286,9 @@
}
try {
//--绗竴姝ワ細鑾峰彇mqtt閾炬帴鍙傛暟
- var mqttInfoUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetConnMqttInfo";//鑾峰彇杩炴帴杩滅▼浜戠Emq Mqtt 鏈嶅姟鍣ㄨ繛鎺ヤ俊鎭�
- var mqttInfoRequestPar = new RemoteRequestParameters () { LoginAccessToken = mqttRequestParToken, RequestVersion = MainPage.CodeIDString, RequestProtocolType = 0, RequestSource = 1 };
- var mqttInfoRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar), false, false, mqttInfoUrl);
+ var mqttInfoUrl = $"{MainPage.RequestHttpsHostMqtt}/Center/Center/GetConnMqttInfo";//鑾峰彇杩炴帴杩滅▼浜戠Emq Mqtt 鏈嶅姟鍣ㄨ繛鎺ヤ俊鎭�
+ var mqttInfoRequestPar = new RemoteRequestParameters () { LoginAccessToken = mqttRequestParToken, RequestVersion = MainPage.RequestVersion, RequestProtocolType = 0, RequestSource = 1 };
+ var mqttInfoRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar), mqttInfoUrl);
if (mqttInfoRequestResult != null && mqttInfoRequestResult.ResponseData != null) {
var mqttInfoRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo> (mqttInfoRequestResult.ResponseData.ToString ());
if (mqttInfoRequestResult_Obj != null) {
@@ -275,30 +297,33 @@
username = mqttInfoRequestResult_Obj.connEmqUserName;
passwordRemote = mqttInfoRequestResult_Obj.connEmqPwd;
//----绗簩姝ワ細璇诲彇璐﹀彿涓嬮潰鐨勭綉鍏冲垪琛�
- var gatewayListUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetGatewayPagger"; //App銆丅uspro杞欢鐧诲綍鍚庤幏鍙栫綉鍏冲垪琛� http 璇锋眰
+ var gatewayListUrl = $"{MainPage.RequestHttpsHostMqtt}/Center/Center/GetGatewayPagger"; //App銆丅uspro杞欢鐧诲綍鍚庤幏鍙栫綉鍏冲垪琛� http 璇锋眰
var gatewayListRequestPar = new RemoteRequestParameters () { LoginAccessToken = mqttRequestParToken, RequestVersion = "RequestVersion1", RequestProtocolType = 0, RequestSource = 1 };
- var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar), false, false, gatewayListUrl);
+ var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar), gatewayListUrl);
var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (gatewayListRequestResult.ResponseData.ToString ());
//--鎵惧嚭鏄惁瀛樺湪鍖归厤褰撳墠浣忓畢鐨刴ac锛屽瓨鍦ㄥ啀杩涜杩滅▼銆�
- CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData.Find ((obj) => obj.mac == UserConfig.Instance.CurrentRegion.MAC);
- CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData [0];
- if (CurRemoteMACInfo != null) {
- CurRemoteMACInfo.LoginAccessToken = mqttRequestPar.Token;
- mqttEncryptKey = CurRemoteMACInfo.aesKey;
- var options1 = new MQTTnet.Client.Options.MqttClientOptionsBuilder ()
- .WithClientId (clientId)
- .WithTcpServer (url.Split (':') [1].Substring ("//".Length), int.Parse (url.Split (':') [2]))
- .WithCredentials (username, passwordRemote)
- .WithCleanSession ()
- .WithCommunicationTimeout (new TimeSpan (0, 0, 20))
- .Build ();
+ if (UserConfig.Instance.CheckHomeGateways ()) {
+ CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData.Find ((obj) => obj.mac == UserConfig.Instance.CurrentRegion.HomeGateways[0].GatewayUniqueId);
+ CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData [0];
+ if (CurRemoteMACInfo != null) {
+ CurRemoteMACInfo.LoginAccessToken = mqttRequestPar.Token;
+ mqttEncryptKey = CurRemoteMACInfo.aesKey;
+ var options1 = new MQTTnet.Client.Options.MqttClientOptionsBuilder ()
+ .WithClientId (clientId)
+ .WithTcpServer (url.Split (':') [1].Substring ("//".Length), int.Parse (url.Split (':') [2]))
+ .WithCredentials (username, passwordRemote)
+ .WithCleanSession ()
+ .WithCommunicationTimeout (new TimeSpan (0, 0, 20))
+ .Build ();
- await DisConnectRemoteMqttClient ("StartRemoteMqtt");
- await RemoteMqttClient.ConnectAsync (options1);
- remoteIsConnected = true;
- await MqttRemoteSend (new byte [] { 0 }, 1);
- await MqttRemoteSend (new byte [] { 0 }, 2);
+ await DisConnectRemoteMqttClient ("StartRemoteMqtt");
+ await RemoteMqttClient.ConnectAsync (options1);
+ remoteIsConnected = true;
+ await MqttRemoteSend (new byte [] { 0 }, 1);
+ await MqttRemoteSend (new byte [] { 0 }, 2);
+ }
}
+
}
}
@@ -353,7 +378,7 @@
}
//base64鍔犲瘑
var m = new MqttApplicationMessage { Topic = topicName, Payload = messageSend, Retain = false, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce };
- if (remoteIsConnected) {
+ //if (remoteIsConnected) {
try {
await RemoteMqttClient.PublishAsync (m);
} catch (Exception e) {
@@ -363,11 +388,11 @@
await RemoteMqttClient.PublishAsync (m);
}
}
- }
+ //}
break;
case 1:
topicName = $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/Common/#";
- if (remoteIsConnected) {
+ //if (remoteIsConnected) {
try {
await RemoteMqttClient.SubscribeAsync (topicName);
} catch (Exception e) {
@@ -377,7 +402,7 @@
await RemoteMqttClient.SubscribeAsync (topicName);
}
}
- }
+ // }
break;
case 2:
var macStr = CurRemoteMACInfo.mac.ToUpper ();
@@ -395,7 +420,7 @@
}
topicName = $"/NotifyBusGateWayInfoChagne/{CurRemoteMACInfo.md5_mac_string}";
- if (remoteIsConnected) {
+ //if (remoteIsConnected) {
try {
await RemoteMqttClient.SubscribeAsync (topicName);
} catch (Exception e) {
@@ -405,7 +430,7 @@
await RemoteMqttClient.SubscribeAsync (topicName);
}
}
- }
+ //}
break;
case 3:
@@ -695,7 +720,7 @@
var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
var revertObj3 = MainPage.RequestHttps ("GatewayByRegionList", requestJson3, true, false);
- if (revertObj3.StateCode == "SUCCESS") {
+ if (revertObj3.StateCode.ToUpper() == "SUCCESS") {
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>> (revertObj3.ResponseData.ToString ());
var gatewayList = responseDataObj;
if (gatewayList != null && gatewayList.Count > 0) {
@@ -1094,4 +1119,4 @@
}
}
-*/
\ No newline at end of file
+*/
--
Gitblit v1.8.0