From c1863db0158fb6c2a1cd96686d514c98c1073937 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 17 一月 2020 11:58:18 +0800
Subject: [PATCH] 2020-01-17
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 121ba5d..8c619e6 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -175,6 +175,21 @@
}
#endregion
+ //public static void CleanPageView ()
+ //{
+ // FavoriteRoom.RemoveAll ();
+ // FavoriteBodyView.RemoveAll ();
+ // FavoritePageView.RemoveAll ();
+ // DeviceView.RemoveAll ();
+ // DeviceBodyView.RemoveAll ();
+ // DevicePageView.RemoveAll ();
+ // RoomBodyView.RemoveAll ();
+ // RoomPageView.RemoveAll ();
+ // SettingView.RemoveAll ();
+ // SettingBodyView.RemoveAll ();
+ // SettingPageView.RemoveAll ();
+ // UserPageView.RemoveAll ();
+ //}
static void CleanPageView (FrameLayout BodyView)
{
FavoriteRoom.RemoveAll ();
@@ -208,20 +223,24 @@
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
//if (UserConfig.Instance.GatewayList.Count == 0) {
- //2020-01-11 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
+ //2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
- if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty () && MainPage.LoginUser.AccountType == 0) {
+ if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
+ if (guidePageView.Parent != null) {
+ guidePageView.RemoveAll ();
+ guidePageView.RemoveFromParent ();
+ }
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
var guide = new GuideAddResidence ();
guide.IsHideBack = true;
guidePageView.AddChidren (guide);
- guide.ShowHomeList (true);
+ guide.ShowHomeView (true);
guidePageView.PageIndex = 0;
MainPage.LoginUser.LastTime = DateTime.MinValue;
MainPage.LoginUser.SaveUserInfo ();
- guidePageView.PageChange += (ddf, ffd) => {
- if (ffd < guidePageView.ChildrenCount - 1) {
+ guidePageView.PageChange += (sender, e) => {
+ if (e < guidePageView.ChildrenCount - 1) {
guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
}
};
@@ -242,6 +261,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 +421,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 +476,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