From ac2ee45fadc64fe840bbba6264df3ca4622adb15 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 12 一月 2020 16:06:13 +0800
Subject: [PATCH] 2020-01-12 1.优化修改。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index c5b7169..121ba5d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -197,7 +197,8 @@
UserMiddle.updateSensorhreadList.Clear ();
}
- public static void Init (bool isGuide = false)
+ //2020-01-11
+ public static void Init (bool isGuide = false, bool bFromLogin = false)
{
if (MainPage.LoginUser == null)
MainPage.LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo> (System.Text.Encoding.UTF8.GetString (Shared.IO.FileUtils.ReadFile (UserInfo.GlobalRegisterFile)));
@@ -207,23 +208,25 @@
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
//if (UserConfig.Instance.GatewayList.Count == 0) {
- //2020-01-10 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙�
- if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty() && MainPage.LoginUser.AccountType == 0) {
+ //2020-01-11 Mac娌＄粦瀹氬苟涓斾负涓昏处鍙� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
+ if (bFromLogin) {
+ if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty () && MainPage.LoginUser.AccountType == 0) {
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
- var guide = new GuideAddResidence ();
- guide.IsHideBack = true;
- guidePageView.AddChidren (guide);
-
- guide.ShowHomeList (true);
- guidePageView.PageIndex = 0;
- MainPage.LoginUser.LastTime = DateTime.MinValue;
- MainPage.LoginUser.SaveUserInfo ();
- guidePageView.PageChange += (ddf, ffd) => {
- if (ffd < guidePageView.ChildrenCount - 1) {
- guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
- }
- };
- return;
+ var guide = new GuideAddResidence ();
+ guide.IsHideBack = true;
+ guidePageView.AddChidren (guide);
+
+ guide.ShowHomeList (true);
+ guidePageView.PageIndex = 0;
+ MainPage.LoginUser.LastTime = DateTime.MinValue;
+ MainPage.LoginUser.SaveUserInfo ();
+ guidePageView.PageChange += (ddf, ffd) => {
+ if (ffd < guidePageView.ChildrenCount - 1) {
+ guidePageView.GetChildren (guidePageView.ChildrenCount - 1).RemoveFromParent ();
+ }
+ };
+ return;
+ }
}
InitHomePageView ();
//鍚庡彴楠岃瘉璐﹀彿
@@ -234,7 +237,7 @@
var revertObj = MainPage.RequestHttps (API.Login, requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode.ToUpper() == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper () == "SUCCESS") {
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
MainPage.LoginUser.LastTime = DateTime.Now;
@@ -449,4 +452,4 @@
UserDeviceToFH.readAllStatus (true);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0