From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 93 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 4f6f23d..e9fd37d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -259,28 +259,33 @@
//鍚庡彴楠岃瘉璐﹀彿
System.Threading.Tasks.Task.Run (() => {
try {
- //var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
- //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- //var revertObj = MainPage.RequestHttps (API.Login, requestJson);
-
var revertObj = HttpServerRequest.Current.LoginByPassword (MainPage.LoginUser.AccountString, MainPage.LoginUser.Password);
if (revertObj != null) {
- Application.RunOnMainThread (() => {
- if (revertObj.Code == StateCode.SUCCESS) {
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.Data.ToString ());
- //MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
- MainPage.LoginUser.LastTime = DateTime.Now;
- MainPage.LoginUser.SaveUserInfo ();
- //2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏�
- GetNowHomeGatewayAfterLoginSuccess ();
- } else if (!string.IsNullOrEmpty (revertObj.Code)) {
- if (revertObj.Code != StateCode.NETWORK_ERROR && revertObj.Code != StateCode.DATA_EXCEPTION) {
- MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
- MainPage.LoginUser.SaveUserInfo ();
- new AccountLogin ().Show ();
- }
+ //Application.RunOnMainThread (() => {
+ if (revertObj.Code == StateCode.SUCCESS) {
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.Data.ToString ());
+ //MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
+ MainPage.LoginUser.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ MainPage.LoginUser.RefreshToken = revertData.refreshToken;
+ MainPage.LoginUser.LastTime = DateTime.Now;
+ MainPage.LoginUser.SaveUserInfo ();
+ //2020-01-14 楠岃瘉璐﹀彿閫氳繃鍚�
+ if (!bFromLogin) {
+ HttpServerRequest.Current.GetHomeGatewayList ();
}
- });
+ } else if (!string.IsNullOrEmpty (revertObj.Code)) {
+ if (revertObj.Code != StateCode.NETWORK_ERROR && revertObj.Code != StateCode.DATA_EXCEPTION) {
+ MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
+ MainPage.LoginUser.SaveUserInfo ();
+ //鎻愮ず閿欒鍘熷洜
+ IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
+ Application.RunOnMainThread (() => {
+ new AccountLogin ().Show ();
+ });
+
+ }
+ }
+ //});
}
} catch { } finally {
UserConfig.Instance.SaveUserConfig ();
@@ -324,6 +329,8 @@
}
}
+
+
/// <summary>
@@ -548,32 +555,32 @@
- /// <summary>
- /// 鐧诲綍鎴愬姛鍚庯紝鏌ヨ鍒锋柊涓�娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
- /// 2020-01-11
- /// </summary>
- static void GetNowHomeGatewayAfterLoginSuccess ()
- {
- 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 = 10;
- string urlHead = MainPage.RequestHttpsHost;
- if (requestObj3.IsOtherAccountCtrl) {
- urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
- requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
- }
+ ///// <summary>
+ ///// 鐧诲綍鎴愬姛鍚庯紝鏌ヨ鍒锋柊涓�娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃
+ ///// 2020-01-11
+ ///// </summary>
+ //static void GetNowHomeGatewayAfterLoginSuccess ()
+ //{
+ // 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 = 10;
+ // string urlHead = MainPage.RequestHttpsHost;
+ // if (requestObj3.IsOtherAccountCtrl) {
+ // urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ // requestObj3.ReqDto.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ // }
- var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
- var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
- if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
- var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
- //2020-01-11
- UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
+ // var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
+ // var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
+ // if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
+ // var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
+ // //2020-01-11
+ // UserConfig.Instance.SetNowHomeGateways (infoResult.PageData);
- }
- }
+ // }
+ //}
}
}
--
Gitblit v1.8.0