From f60ce72c3c29c7d31a046795c88ec39a69e73d45 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 06 一月 2021 17:33:54 +0800
Subject: [PATCH] 2021-01-06 1.替换新云端前期准备相关接口，和修改相关参数。
---
Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
index 18c142a..d6bf05b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
@@ -397,7 +397,7 @@
LoginAccessToken = mqttRequestParToken,
PlatformStr = "L1",
PublishPayloadJsonStr = PushSignStr,
- MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
+ //MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
HomeId = UserConfig.Instance.CurrentRegion.Id
};
var mqttInfoRequestResult = MainPage.RequestHttps (API.ShareMemberConnMqttInfo, Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar));
@@ -587,7 +587,7 @@
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
+ if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
if (bNeedConnect) {
//2020-01-11
@@ -596,7 +596,7 @@
//var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (revertObj3.ResponseData.ToString ());
//--鎵惧嚭鏄惁瀛樺湪鍖归厤褰撳墠浣忓畢鐨刴ac锛屽瓨鍦ㄥ啀杩涜杩滅▼銆�
if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
+ var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
if (mGatewayRes != null) {
CurRemoteMACInfo = new RemoteMACInfo ();
CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
@@ -612,7 +612,7 @@
Utlis.WriteLine ("============>Mqtt 鍙栨秷杩炴帴锛屽綋鍓嶄綇瀹呮病缁戝畾缃戝叧");
}
} else {
- var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
+ var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
if (mGatewayRes != null) {
CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
mqttEncryptKey = CurRemoteMACInfo.aesKey;
@@ -1083,7 +1083,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.ToUpper() == "SUCCESS") {
+ if (revertObj3.StateCode.ToUpper() == StateCode.SUCCESS) {
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>> (revertObj3.ResponseData.ToString ());
var gatewayList = responseDataObj;
if (gatewayList != null && gatewayList.Count > 0) {
@@ -1162,7 +1162,7 @@
Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
});
break;
- case "Success":
+ case StateCode.SUCCESS:
CommonPage.IsRemote = true;
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
--
Gitblit v1.8.0