From 49add64d7f25448baa06ac5a9ebbeac0a3ae97e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 一月 2020 13:50:29 +0800
Subject: [PATCH] Version 2.50113 1.优化更新。 2.第一次引导或者添加住宅，默认添加2个房间。编辑住宅不处理。 3.设备名超过20字节限制。 4.修复编辑住宅名字重复不提示问题。 5.优化添加住宅逻辑。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 36d7c6e..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)));
@@ -206,20 +207,26 @@
new AccountLogin ().Show ();
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
- if (UserConfig.Instance.GatewayList.Count == 0) {
- UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
- var guide = new GuideAddResidence ();
- guidePageView.AddChidren (guide);
- guide.ShowHomeList (false);
- 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;
+ //if (UserConfig.Instance.GatewayList.Count == 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;
+ }
}
InitHomePageView ();
//鍚庡彴楠岃瘉璐﹀彿
@@ -227,10 +234,10 @@
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, false, false);
+ 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;
@@ -445,4 +452,4 @@
UserDeviceToFH.readAllStatus (true);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0