From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |   86 ++++++++++--------------------------------
 1 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index e9a23bf..6096b8e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -22,9 +22,7 @@
             {
                 LoadEvent_SkipResdentialManagePage();
                 LoadEvent_GoMemberManagement();
-                #region F3闃舵
-                //LoadEvent_SkipbtnAddFunctionPage();
-                #endregion
+                LoadEvent_SkipbtnAddFunctionPage();
             }
         }
 
@@ -163,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,49 +182,12 @@
             {
                 return;
             }
-            DB_ResidenceData.Instance.SetCurrentRegion(UserInfo.Current.regionList.IndexOf(homeTemp));
+            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
 
@@ -293,21 +255,19 @@
 
         #endregion
 
-        #region F3闃舵
         #region 娣诲姞璁惧
-        //void LoadEvent_SkipbtnAddFunctionPage()
-        //{
-        //    EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-        //    {
-        //        var page = new SearchDevicePage();
-        //        MainPage.BasePageView.AddChidren(page);
-        //        page.LoadPage();
-        //        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-        //    };
-        //    btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
-        //    btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
-        //}
-        #endregion
+        void LoadEvent_SkipbtnAddFunctionPage()
+        {
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
+                var page = new BrandListPage();
+                MainPage.BasePageView.AddChidren(page);
+                page.LoadPage();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            };
+            btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
+            btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+        }
         #endregion
 
         #region 鍏充簬On銆佽幏鍙栨敮鎸�
@@ -331,11 +291,7 @@
         {
             btnSupportText.MouseUpEventHandler = (sender, e) =>
             {
-                //var getsupportPage = new GetSupportPage();
-                //MainPage.BasePageView.AddChidren(getsupportPage);
-                //getsupportPage.LoadPage();
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
+                //throw new Exception("寮傚父娴嬭瘯");
                 
                 var getsupportPage = new FAQHelpPage();
                 MainPage.BasePageView.AddChidren(getsupportPage);

--
Gitblit v1.8.0