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/Guide/GuideAddResidence.cs | 146 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 108 insertions(+), 38 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 5b6880d..432b59b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -5,12 +5,15 @@
{
public class GuideAddResidence : FrameLayout
{
+ public bool IsHideBack = false;
+
+
public GuideAddResidence ()
{
BackgroundColor = SkinStyle.Current.MainColor;
}
- public void ShowHomeList (bool showDialog = true)
+ public void ShowHomeList (bool showDialog = false)
{
new System.Threading.Thread (() => {
bool needHide = true;
@@ -52,7 +55,7 @@
});
}
UserConfig.Instance.SaveUserConfig ();
- UserConfig.Instance.CurrentRegion = responseDataObj.Find ((obj) => obj.Name == UserConfig.Instance.CurrentRegion.Name);
+ UserConfig.Instance.CurrentRegion = responseDataObj.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id);
} else {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -140,9 +143,10 @@
};
topView.AddChidren (ItemButton);
ItemButton.MouseUpEventHandler += (sender1, e1) => {
- GuideAddHomeDialog (new RegionInfoRes () { Id = "", Name = "" }, false);
+ //GuideAddHomeDialog (new RegionInfoRes () { Id = "", Name = "" }, false);
+ GuideAddHomeDialog (new RegionInfoRes () { Id = "", Name = "" }, false);
};
- if (showDialog) {
+ if (!IsHideBack) {
var back = new Button () {
Height = Application.GetRealHeight (90),
Width = Application.GetRealWidth (85),
@@ -173,7 +177,14 @@
}
} catch { }
- if (UserConfig.Instance.GatewayList !=null && UserConfig.Instance.GatewayList.Count == 0) {
+ //if (UserConfig.Instance.GatewayList != null && UserConfig.Instance.GatewayList.Count == 0) {
+ // if (showDialog) {
+ // GuideAddHomeDialog (UserConfig.Instance.HomeLists [0], true);
+ // UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0];
+ // }
+ //}
+
+ if (!UserConfig.Instance.CheckHomeGateways()) {
if (showDialog) {
GuideAddHomeDialog (UserConfig.Instance.HomeLists [0], true);
UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0];
@@ -363,10 +374,13 @@
});
var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = password };
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.StateCode.ToUpper() == "SUCCESS") {
- var requestObj2 = new DelHomeObj () { HomeId = home.Id };
+ var requestObj2 = new DelHomeObj () {
+ HomeId = home.Id,
+ LoginAccessToken = MainPage.LoginUser.LoginTokenString
+ };
var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
var revertObj2 = MainPage.RequestHttps (API.DelHome, requestJson2);
if (revertObj2.StateCode.ToUpper () == "SUCCESS") {
@@ -404,7 +418,7 @@
if (stateCodeStr == "NoLogin") {
mes = ErrorCode.NoLogin;
} else if (stateCodeStr == "CurrentHomeExixtsGatewayBind") {
- mes = ErrorCode.HomeIdAndTokenNoConsistent;
+ mes = ErrorCode.CurrentHomeExixtsGatewayBind;
} else if (stateCodeStr == ErrorCode.NetworkError) {
mes = ErrorCode.NetworkError;
} else {
@@ -425,18 +439,21 @@
/// </summary>
/// <param name="home">Home.</param>
/// <param name="gatewayMAC">Gateway mac.</param>
- void ChangeRegion (RegionInfoRes home, bool goHomePage = true)
+ ///
+ void ChangeRegion (RegionInfoRes home, bool goHomePage = true, bool bNeedCheckAddRoom = false, bool goToGuideAddGatewayView = false)
{
+ if (home == null || string.IsNullOrEmpty (home.Id)) return;
+
MainPage.Loading.Start ("Please wait...");
System.Threading.Tasks.Task.Run (() => {
try {
//if (home.RegionID != UserConfig.Instance.CurrentRegion.RegionID) {
var backuplist = IO.FileUtils.ReadFiles ();
int index = 0;
- if (string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.Name)) {
+ if (string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.Id)) {
UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0];
}
- string oldRegionRootPath = IO.FileUtils.CreateRegionBackup (UserConfig.Instance.CurrentRegion.Name);
+ string oldRegionRootPath = IO.FileUtils.CreateRegionBackup (UserConfig.Instance.CurrentRegion.Id);
IO.FileUtils.DeleteRegionFiles (oldRegionRootPath);
foreach (var fileName in backuplist) {
System.IO.FileInfo fileInfo = new System.IO.FileInfo (IO.FileUtils.RootPath + fileName);
@@ -451,13 +468,15 @@
});
}
IO.FileUtils.DeleteAllFile ();
- string newRegionRootPath = IO.FileUtils.CreateRegionBackup (home.Name);
+ string newRegionRootPath = IO.FileUtils.CreateRegionBackup (home.Id);
IO.FileUtils.RestoreRegionFiles (newRegionRootPath);
UserConfig.Instance.CurrentRegion = home;
UserConfig.Instance.SaveUserConfig ();
Room.InitAllRoom ();
Application.RunOnMainThread (() => {
- ShowHomeList ();
+ ShowHomeList (false);
+
+
if (goHomePage) {
UserConfig.Instance.RefreshUserConfig ();
new Alert ("", Language.StringByID (R.MyInternationalizationString.SwitchRegionSuccessfully),
@@ -466,8 +485,20 @@
CommonPage.IsRemote = false;
EquipmentPublicClass.CheckLinkRemote (2);
}
+ if (bNeedCheckAddRoom) {
+ CheckIfNeedAddRoom ();
+ }
+
+ if (goToGuideAddGatewayView) {
+ var addGatewayDialog = new GuideAddGateway ();
+ UserMiddle.guidePageView.AddChidren (addGatewayDialog);
+ addGatewayDialog.ShowPage (home);//guidePageView
+ UserMiddle.guidePageView.PageIndex = 1;
+ }
});
MainPage.LoginUser.SaveUserInfo ();
+
+
//}
} catch (Exception ex) {
Application.RunOnMainThread (() => {
@@ -571,24 +602,39 @@
}
if (isChangeName) {
home.Name = button.Text = etZoneName.Text;
- var requestObj2 = new EditHomeObj () { HomeId = home.Id, Name = home.Name };
+ var requestObj2 = new EditHomeObj () { HomeId = home.Id, Name = home.Name, LoginAccessToken = MainPage.LoginUser.LoginTokenString };
+ string urlHead = MainPage.RequestHttpsHost;
+ if (requestObj2.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ requestObj2.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ }
+
var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
- var revertObj2 = MainPage.RequestHttps (API.EditHome, requestJson2);
+ var revertObj2 = MainPage.RequestHttps (API.EditHome, requestJson2, urlHead);
+ if (revertObj2.StateCode.ToUpper () != "SUCCESS") {
+ ShowEditHomeErrorInfo (revertObj2.StateCode);
+ return;
+ }
IO.FileUtils.ReNameFoler (UserConfig.Instance.CurrentRegion.Name, home.Name);
return;
}
- ChangeRegion (home, false);
- var addGatewayDialog = new GuideAddGateway ();
- if (guide) {
- EditResidence (home, etZoneName.Text.Trim ());
- UserMiddle.guidePageView.AddChidren (addGatewayDialog);
- addGatewayDialog.ShowPage (home);//guidePageView
- UserMiddle.guidePageView.PageIndex = 1;
- } else {
- UserMiddle.SettingPageView.AddChidren (addGatewayDialog);
- addGatewayDialog.ShowPage (home);
- UserMiddle.SettingPageView.PageIndex = 2;
- }
+
+ //ChangeRegion (home, false);
+ EditResidence (home, etZoneName.Text.Trim (), guide);
+
+
+ //if (guide) {
+
+ // //ShowHomeList ();
+ // EditResidence (home, etZoneName.Text.Trim ());
+ // var addGatewayDialog = new GuideAddGateway ();
+ // UserMiddle.guidePageView.AddChidren (addGatewayDialog);
+ // addGatewayDialog.ShowPage (home);//guidePageView
+ // UserMiddle.guidePageView.PageIndex = 1;
+ //} else {
+ // EditResidence (home, etZoneName.Text.Trim ());
+
+ //}
};
if(!guide)
@@ -620,7 +666,7 @@
/// </summary>
/// <param name="home">Home.</param>
/// <param name="residenceName">Et zone name string.</param>
- bool EditResidence (RegionInfoRes home,string residenceName)
+ bool EditResidence (RegionInfoRes home, string residenceName, bool goToGuideAddGatewayView = false)
{
if (home.Name != residenceName) {
home.Name = residenceName;
@@ -636,19 +682,46 @@
ShowAddHomeErrorInfo (revertObj21.StateCode);
return false;
}
+ //鍒涘缓浣忓畢鎴愬姛锛屽垏鎹㈠埌璇ヤ綇瀹�
+ var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>> (revertObj21.ResponseData.ToString ());
+ if (responseDataObj != null && responseDataObj.Count > 0) {
+ ChangeRegion (responseDataObj [0], false, true, goToGuideAddGatewayView);
+
+ }
} else {
- var requestObj2 = new EditHomeObj () { HomeId = home.Id, Name = home.Name };
+ var requestObj2 = new EditHomeObj () { HomeId = home.Id, Name = home.Name, LoginAccessToken = MainPage.LoginUser.LoginTokenString };
+ string urlHead = MainPage.RequestHttpsHost;
+ if (requestObj2.IsOtherAccountCtrl) {
+ urlHead = UserConfig.Instance.MasterAccountRequestBaseUrl;
+ requestObj2.LoginAccessToken = UserConfig.Instance.MasterAccountToken;
+ }
var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2);
- var revertObj2 = MainPage.RequestHttps (API.EditHome, requestJson2);
- IO.FileUtils.ReNameFoler (UserConfig.Instance.CurrentRegion.Name, home.Name);
+ var revertObj2 = MainPage.RequestHttps (API.EditHome, requestJson2, urlHead);
if (revertObj2.StateCode.ToUpper() != "SUCCESS") {
ShowEditHomeErrorInfo (revertObj2.StateCode);
return false;
}
+ IO.FileUtils.ReNameFoler (UserConfig.Instance.CurrentRegion.Name, home.Name);
+ ChangeRegion (home, false, true, goToGuideAddGatewayView);
+ //CheckIfNeedAddRoom ();
}
- UserConfig.Instance.CurrentRegion = home;
- UserConfig.Instance.SaveUserConfig ();
+
+ //ShowHomeList (false);
+ //2020-01-09 鍘绘帀鍒囨崲浣忓畢
+ //UserConfig.Instance.CurrentRegion = home;
+ //UserConfig.Instance.SaveUserConfig ();
+ }else {
+ ChangeRegion (home, false, true, goToGuideAddGatewayView);
+ //CheckIfNeedAddRoom ();
}
+ return true;
+
+ }
+
+ /// <summary>
+ /// 妫�娴嬫槸鍚﹂粯璁ゅ垱寤烘埧闂�
+ /// </summary>
+ void CheckIfNeedAddRoom () {
if (Room.Lists.FindAll ((obj) => obj.Name == "Living Room" || obj.Name == "Bedroom").Count == 0) {
Room room = new Room ();
string newRoomFilePath = typeof (Room).Name + "_Living Room";
@@ -665,12 +738,9 @@
room.Add (newRoomFilePath);
room.Save (newRoomFilePath);
Room.Lists.Add (room);
+
+ Room.InitAllRoom ();
}
- if (home.Name != residenceName) {
- ShowHomeList ();
- }
- return true;
-
}
--
Gitblit v1.8.0