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 | 317 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 256 insertions(+), 61 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs index 6d44aa8..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; @@ -31,13 +34,20 @@ }) { IsBackground = true }.Start (); }); // 璇诲彇浣忓畢鍒楄〃 - var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (new HomeListObj ()); - var revertObj2 = MainPage.RequestHttps ("HomeList", requestJson2); - if (revertObj2.StateCode == "SUCCESS") { - var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>> (revertObj2.ResponseData.ToString ()); + var requestObj2 = new GetHomePagerObj (); + requestObj2.ReqDto.LoginAccessToken = MainPage.LoginUser.LoginTokenString; + + var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2); + var revertObj2 = MainPage.RequestHttps (API.GetHomePager, requestJson2); + if (revertObj2.StateCode.ToUpper() == "SUCCESS") { + var mResidenceRes = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceRes> (revertObj2.ResponseData.ToString ()); + var responseDataObj = mResidenceRes.PageData; + //if(responseDataObj == null && responseDataObj.Count == 0) { + // return; + //} UserConfig.Instance.HomeLists = responseDataObj; - if (UserConfig.Instance.HomeLists.Count > 0) { - if (string.IsNullOrEmpty (UserConfig.Instance.HomeLists [0].RegionName)) { + if (responseDataObj != null && responseDataObj.Count > 0) { + if (string.IsNullOrEmpty (UserConfig.Instance.HomeLists [0].Name)) { Application.RunOnMainThread (() => { MainPage.Loading.Hide (); this.RemoveFromParent (); @@ -45,7 +55,7 @@ }); } UserConfig.Instance.SaveUserConfig (); - UserConfig.Instance.CurrentRegion = responseDataObj.Find ((obj) => obj.RegionName == UserConfig.Instance.CurrentRegion.RegionName); + UserConfig.Instance.CurrentRegion = responseDataObj.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id); } else { Application.RunOnMainThread (() => { MainPage.Loading.Hide (); @@ -54,6 +64,8 @@ return; } } else { + ShowGetHomePagerErrorInfo (revertObj2.StateCode); + Application.RunOnMainThread (() => { MainPage.Loading.Hide (); this.RemoveFromParent (); @@ -76,6 +88,31 @@ needHide = false; } }) { IsBackground = true }.Start (); + } + + + + /// <summary> + /// + /// </summary> + /// <param name="stateCodeStr"></param> + void ShowGetHomePagerErrorInfo (string stateCodeStr) + { + string mes = ""; + //2020-01-06 寰呰ˉ鍏� + if (stateCodeStr == ErrorCode.NetworkError) { + mes = ErrorCode.NetworkError; + } else { + mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr; + + } + if (!string.IsNullOrEmpty (mes)) { + Application.RunOnMainThread (() => { + new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show (); + }); + } + + } void ShowHomeListView (bool showDialog = true) @@ -106,9 +143,10 @@ }; topView.AddChidren (ItemButton); ItemButton.MouseUpEventHandler += (sender1, e1) => { - GuideAddHomeDialog (new RegionInfoRes () { RegionID = 0, RegionName = "" }, 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), @@ -139,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]; @@ -173,13 +218,13 @@ Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Item/Point.png", SelectedImagePath = "Item/Point.png", - Visible = home.RegionID != UserConfig.Instance.CurrentRegion.RegionID + Visible = home.Id != UserConfig.Instance.CurrentRegion.Id }; rowView.AddChidren (btnPoint); var btnName = new Button () { Width = Application.GetRealWidth (390), - Text = home.RegionName, + Text = home.Name, TextAlignment = TextAlignment.CenterLeft, X = Application.GetRealWidth (90), TextColor = SkinStyle.Current.TextColor1, @@ -203,7 +248,7 @@ }; rowView.AddChidren (rightButton1); EventHandler<MouseEventArgs> eHandler = (sender, e) => { - if (home.RegionID == UserConfig.Instance.CurrentRegion.RegionID) { + if (home.Id == UserConfig.Instance.CurrentRegion.Id) { //UserConfig.Instance.GatewayMAC = gatewayMAC; var addGatewayDialog = new GuideAddGateway (); (Parent as PageLayout).AddChidren (addGatewayDialog); @@ -216,14 +261,14 @@ rightButton1.MouseUpEventHandler += eHandler; goNextButton.MouseUpEventHandler += eHandler; btnName.MouseUpEventHandler += (sender,e)=> { - if (home.RegionID == UserConfig.Instance.CurrentRegion.RegionID) { + if (home.Id == UserConfig.Instance.CurrentRegion.Id) { GuideAddHomeDialog (home, false,true, btnName); } else { ChangeRegion (home); } }; - if (home.RegionID == UserConfig.Instance.CurrentRegion.RegionID) { + if (home.Id == UserConfig.Instance.CurrentRegion.Id) { Button btnCheck = new Button () { X = Application.GetRealWidth (20), Y = Application.GetRealHeight (25), @@ -233,7 +278,7 @@ }; rowView.AddChidren (btnCheck); } - if (UserConfig.Instance.CurrentRegion.RegionID != home.RegionID && MainPage.LoginUser.AccountType != 1) { + if (UserConfig.Instance.CurrentRegion.Id != home.Id && MainPage.LoginUser.AccountType != 1) { Button btnDel = new Button () { TextID = R.MyInternationalizationString.Del, BackgroundColor = SkinStyle.Current.DelColor, @@ -329,15 +374,21 @@ }); var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = password }; var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj); - var revertObj = MainPage.RequestHttps ("Login", requestJson, false, false); - if (revertObj.StateCode == "SUCCESS") { - var requestObj2 = new DeleteHomeObj () { Id = home.RegionID }; + var revertObj = MainPage.RequestHttps (API.Login, requestJson); + if (revertObj.StateCode.ToUpper() == "SUCCESS") { + + var requestObj2 = new DelHomeObj () { + HomeId = home.Id, + LoginAccessToken = MainPage.LoginUser.LoginTokenString + }; var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2); - var revertObj2 = MainPage.RequestHttps ("DeleteHome", requestJson2); - if (revertObj2.StateCode == "SUCCESS") { + var revertObj2 = MainPage.RequestHttps (API.DelHome, requestJson2); + if (revertObj2.StateCode.ToUpper () == "SUCCESS") { Application.RunOnMainThread (() => { ShowHomeList (); }); + } else { + ShowDelHomeErrorInfo (revertObj2.StateCode); } } else { Application.RunOnMainThread (() => { @@ -361,23 +412,48 @@ } + void ShowDelHomeErrorInfo (string stateCodeStr) + { + string mes = ""; + if (stateCodeStr == "NoLogin") { + mes = ErrorCode.NoLogin; + } else if (stateCodeStr == "CurrentHomeExixtsGatewayBind") { + mes = ErrorCode.CurrentHomeExixtsGatewayBind; + } else if (stateCodeStr == ErrorCode.NetworkError) { + mes = ErrorCode.NetworkError; + } else { + //RequestServerFailed + //mes = ErrorCode.AddFailed; + mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr; + + } + if (!string.IsNullOrEmpty (mes)) { + Application.RunOnMainThread (() => { + new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show (); + }); + } + } + /// <summary> /// 鏇存崲鏈湴鍖哄煙 /// </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.RegionName)) { + if (string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.Id)) { UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0]; } - string oldRegionRootPath = IO.FileUtils.CreateRegionBackup (UserConfig.Instance.CurrentRegion.RegionName); + 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); @@ -392,13 +468,15 @@ }); } IO.FileUtils.DeleteAllFile (); - string newRegionRootPath = IO.FileUtils.CreateRegionBackup (home.RegionName); + 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), @@ -407,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 (() => { @@ -479,7 +569,7 @@ Radius = 5, BorderColor = SkinStyle.Current.BorderColor, BorderWidth = 2, - Text = home.RegionName, + Text = home.Name, }; bodyView.AddChidren (etZoneName); @@ -511,25 +601,40 @@ return; } if (isChangeName) { - home.RegionName = button.Text = etZoneName.Text; - var requestObj2 = new EditHomeObj () { Id = home.RegionID, Name = home.RegionName }; + home.Name = button.Text = etZoneName.Text; + 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 ("EditHome", requestJson2); - IO.FileUtils.ReNameFoler (UserConfig.Instance.CurrentRegion.RegionName, home.RegionName); + 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) @@ -561,29 +666,62 @@ /// </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.RegionName != residenceName) { - home.RegionName = residenceName; - if (home.RegionID == 0) { - var requestObj21 = new AddHomeObj () { Name = residenceName }; + if (home.Name != residenceName) { + home.Name = residenceName; + if (string.IsNullOrEmpty(home.Id)) { + var requestObj21 = new AddHomeObj () { + Name = residenceName , + LoginAccessToken = MainPage.LoginUser.LoginTokenString, + + }; var requestJson21 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj21); - var revertObj21 = MainPage.RequestHttps ("AddHome", requestJson21); - if ( revertObj21.StateCode != "SUCCESS") { + var revertObj21 = MainPage.RequestHttps (API.AddHome, requestJson21); + if ( revertObj21.StateCode.ToUpper() != "SUCCESS") { + 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 () { Id = home.RegionID, Name = home.RegionName }; + 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 ("EditHome", requestJson2); - IO.FileUtils.ReNameFoler (UserConfig.Instance.CurrentRegion.RegionName, home.RegionName); - if (revertObj2.StateCode != "SUCCESS") { + 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"; @@ -600,12 +738,69 @@ room.Add (newRoomFilePath); room.Save (newRoomFilePath); Room.Lists.Add (room); + + Room.InitAllRoom (); } - if (home.RegionName != residenceName) { - ShowHomeList (); + } + + + void ShowAddHomeErrorInfo (string stateCodeStr) { + string mes = ""; + if (stateCodeStr == "NoLogin") { + mes = ErrorCode.NoLogin; + } else if (stateCodeStr == "Exist") { + mes = ErrorCode.NameExist; + } else if (stateCodeStr == ErrorCode.NetworkError) { + mes = ErrorCode.NetworkError; + } else { + //RequestServerFailed + //mes = ErrorCode.AddFailed; + mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr; + } - return true; - + if (!string.IsNullOrEmpty (mes)) { + Application.RunOnMainThread (() => { + new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show (); + }); + } + } + + + /// <summary> + /// 鍝嶅簲鐘舵�佺爜: + //(1)Success 鍒� [璋冪敤姝ゆ帴鍙f搷浣滄垚鍔焆, ResponseData鍒欎负null + //(2)ParameterOrEmpty,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭�, ResponseData鍒欎负null + //(3)NoLogin,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [鏃犳晥鐧诲綍Token!] + //(5)NoRecord,,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [鏈埌鐩稿叧璁板綍, 璇风‘璁ゆ偍鎻愪氦鍙傛暟鏄惁姝g‘] + //(6)Exist,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [褰撳墠鎻愪氦鐨勭殑浣忓畢:XXXX锛屽悕绉板凡瀛樺湪!] + //(7)NoPermission,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [鎮ㄥ苟涓嶅叿鏈夋鍒嗕韩鑰呮浣忓畢鐨勬潈闄�!] + //(8)InsufficientAuthority,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [鎮ㄥ苟涓嶅叿鏈夋鍒嗕韩鑰呮浣忓畢鐨勫畬鍏ㄦ帶鍒舵潈闄�!] + //(9)HomeIdAndTokenNoConsistent,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [鎮ㄥ綋鍓峊oken涓庝綘褰撳墠鎺у埗鐨凥omeId涓嶄竴鑷�!] + //(10)NoPermission,鍒欏搷搴斿瓧娈典腑 [ErrorInfo] 涓洪敊璇俊鎭负 [XXX] + /// </summary> + /// <param name="stateCodeStr"></param> + void ShowEditHomeErrorInfo (string stateCodeStr) + { + string mes = ""; + if (stateCodeStr == "NoLogin") { + mes = ErrorCode.NoLogin; + } else if (stateCodeStr == "Exist") { + mes = ErrorCode.NameExist; + } else if (stateCodeStr == "HomeIdAndTokenNoConsistent") { + mes = ErrorCode.HomeIdAndTokenNoConsistent; + } else if (stateCodeStr == ErrorCode.NetworkError) { + mes = ErrorCode.NetworkError; + } else { + //RequestServerFailed + //mes = ErrorCode.AddFailed; + mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr; + + } + if (!string.IsNullOrEmpty (mes)) { + Application.RunOnMainThread (() => { + new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show (); + }); + } } } } -- Gitblit v1.8.0