From 9c33e4ccb90fae87a614abd2ed1ab034d3b7a13d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 26 三月 2021 11:26:01 +0800 Subject: [PATCH] 2021-03-26 1.对接接口优化。 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 67 ++++++++++----------------------- 1 files changed, 21 insertions(+), 46 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs index 37ea120..8073d56 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs @@ -161,7 +161,8 @@ { var regionId = (string)btnHomeName.Tag; dialog.Close(); - LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId)); + //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId)); + LoadEvent_ChangeCurHome(home); LoadContentView(); }; } @@ -183,47 +184,10 @@ } DB_ResidenceData.Instance.CurrentRegion = homeTemp; DB_ResidenceData.Instance.SaveResidenceData(); - var waitPage = new Loading(); - bodyView.AddChidren(waitPage); - waitPage.Start(Language.StringByID(StringId.PleaseWait)); - new System.Threading.Thread(() => - { - try - { - DB_ResidenceData.Instance.EixtAccount(); - //鍒锋柊涓�娆′綇瀹呯綉鍏� - new HttpServerRequest().GetHomeGatewayList(); - - Application.RunOnMainThread(() => - { - btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name; - //閲嶇疆缃戝叧鐘舵�� - DriverLayer.Control.Ins.GatewayOnline = false; - }); - - //鎼滅储缃戝叧 - DriverLayer.Control.Ins.SearchLoaclGateway(); - } - catch (Exception ex) - { - Application.RunOnMainThread(() => - { - new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.OperationFailed), - Language.StringByID(StringId.Close)).Show(); - }); - MainPage.Log(ex.Message); - } - finally - { - Application.RunOnMainThread(() => - { - waitPage.Hide(); - waitPage.RemoveFromParent(); - MainPage.InitializationData(); - }); - } - }) - { IsBackground = true }.Start(); + btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name; + DB_ResidenceData.Instance.EixtAccount(); + //鍒锋柊浣忓畢鏁版嵁 + Common.ApiUtlis.Ins.DownloadData(); } #endregion @@ -296,10 +260,21 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { - var page = new SearchDevicePage(); - MainPage.BasePageView.AddChidren(page); - page.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //var page = new BrandListPage(); + //MainPage.BasePageView.AddChidren(page); + //page.LoadPage(); + //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //鑾峰彇鍒楄〃 + HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () => + { + Application.RunOnMainThread(() => + { + var page = new UI2.PersonalCenter.PirDevice.PirMain(); + MainPage.BasePageView.AddChidren(page); + page.Show(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + }); + }); }; btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler; btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler; -- Gitblit v1.8.0