From 4a61a132ce09b1fd42fd80fcbff1855bad4c0f48 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 15 一月 2020 11:15:24 +0800 Subject: [PATCH] 2020-01-15 1.优化。 --- Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs index 121ba5d..b6f273d 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs @@ -242,6 +242,8 @@ MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid; MainPage.LoginUser.LastTime = DateTime.Now; MainPage.LoginUser.SaveUserInfo (); + //2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏� + GetNowHomeGatewayAfterLoginSuccess (); } else if (!string.IsNullOrEmpty (revertObj.StateCode)) { MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30); MainPage.LoginUser.SaveUserInfo (); @@ -400,6 +402,10 @@ if (e < SettingPageView.ChildrenCount - 1) { SettingPageView.GetChildren (SettingPageView.ChildrenCount - 1).RemoveFromParent (); } + if (e == 0) { + //2020-01-15 鍥炲埌涓荤晫闈紝閲嶇疆涓哄姞瀵� + UserConfig.Instance.IsLocalEncrypt = true; + } }; RoomPageView.PageChange += (sender, e) => { if (e < RoomPageView.ChildrenCount - 1) { @@ -451,5 +457,34 @@ UserDeviceToAC.readAllStatus (true); UserDeviceToFH.readAllStatus (true); } + + + /// <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 () == "SUCCESS") { + var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ()); + //2020-01-11 + UserConfig.Instance.SetNowHomeGateways (infoResult.PageData); + + } + } + } } -- Gitblit v1.8.0