From 1d1cad99a27c9f644c84eb3d376c70bd30a55879 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 三月 2021 18:02:13 +0800
Subject: [PATCH] 2021-3-10-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |   85 +++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
old mode 100755
new mode 100644
index 331e653..17453a7
--- 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();
             }
         }
 
@@ -186,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
 
@@ -294,21 +255,29 @@
 
         #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 ThirdPartyBrandListPage();
+                // MainPage.BasePageView.AddChidren(page);
+                // page.LoadPage();
+                //鑾峰彇鍒楄〃
+                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;
+        }
         #endregion
 
         #region 鍏充簬On銆佽幏鍙栨敮鎸�

--
Gitblit v1.8.0