From 9e2ae94d2d3f79fe063fcad7f01867348dc65e1d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 22 六月 2022 14:26:22 +0800 Subject: [PATCH] 备份 --- Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 68 +++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs index 0b48fd0..cdcf69a 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs @@ -234,6 +234,10 @@ } } + /// <summary> + /// 鏄惁鍒锋柊杩囦綇瀹呬俊鎭� 2022-06-22 14:16:27 + /// </summary> + static bool refreshHomeData = false; /// <summary> /// 2020-01-11 @@ -256,7 +260,42 @@ //2020-01-11 Mac娌$粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰 if (bFromLogin) { if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) { - + #region 澶氭杩佺Щ浣忓畢瀵艰嚧缃戝叧琚Щ闄ょ殑鎯呭喌 + if (!refreshHomeData) { + refreshHomeData = true; + //鑾峰彇浣忓畢鍒楄〃 + var revertObjCode = HttpServerRequest.Current.GetHomePager (); + if (revertObjCode == StateCode.SUCCESS) { + var mHomeLists = UserConfig.Instance.HomeLists; + + if (mHomeLists != null && mHomeLists.Count > 0) { + var bFind = false; + foreach (var mHome in mHomeLists) { + if (mHome.isBindGateway) { + bFind = true; + UserConfig.Instance.CurrentRegion = mHome; + break; + } + } + + if (!bFind) { + var findRoom2 = mHomeLists.Find ((obj) => obj.IsOthreShare == false); + if (findRoom2 != null) { + UserConfig.Instance.CurrentRegion = findRoom2; + } else { + UserConfig.Instance.CurrentRegion = mHomeLists [0]; + } + } + + IO.FileUtils.DeleteAllFile (); + } + SaveUserConfig (mHomeLists); + } + return; + } + #endregion + + UserHomePage.FrameLayoutMain.AddChidren (guidePageView); var guide = new GuideAddResidence (); guide.IsHideBack = true; @@ -541,6 +580,7 @@ #endregion + } public static void ShowSettingView () @@ -576,7 +616,7 @@ UserDeviceToFH.readAllStatus (isRefresh); } - + ///// <summary> ///// 鐧诲綍鎴愬姛鍚庯紝鏌ヨ鍒锋柊涓�娆″綋鍓嶄綇瀹� 缃戝叧鍒楄〃 @@ -605,5 +645,29 @@ // } //} + /// <summary> + /// 淇濆瓨鏁版嵁 骞跺姞杞介〉闈� + /// </summary> + /// <param name="revertRoomData"></param> + static void SaveUserConfig (List<RegionInfoRes> revertRoomData) + { + UserConfig.Instance.SaveUserConfig (); + MainPage.LoginUser.LastTime = DateTime.Now; + if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) { + MainPage.LoginUser.SaveUserInfo (); + Scene.Refresh (); + A31MusicModel.Refresh (); + Application.RunOnMainThread (() => { + Init (false, true); + EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus); + }); + } else { + Application.RunOnMainThread (() => { + Init (false, true); + }); + } + + } + } } -- Gitblit v1.8.0