From 78df3d9006b4fa60c312cbda519096c167c1cf21 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 10:46:43 +0800
Subject: [PATCH] 20201210

---
 HDL_ON/UI/MainPage.cs |   89 ++++++++++++++++++++++++++++++--------------
 1 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 1774eb6..ea844b8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -99,11 +99,6 @@
                         var pm = new DAL.Server.HttpServerRequest();
                         pm.RefreshToken();//鍒锋柊Token
                         pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                    })
-                    { IsBackground = true }.Start();
-                    new System.Threading.Thread(() =>
-                    {
-                        var pm =new DAL.Server.HttpServerRequest();
                         pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
                     })
                     { IsBackground = true }.Start();
@@ -148,34 +143,70 @@
         /// </summary>
         public static void GoUserPage()
         {
-            BaseView.RemoveAll();
-            BasePageView = new PageLayout();
-            BasePageView.ScrollEnabled = false;
-            BasePageView.IsShowPoint = false;
-            BasePageView.PageChange = (sender, e) => {
-                if (e < BasePageView.ChildrenCount - 1)
+            //鍔犺浇Loading鏁堟灉
+            var waitPage = new Loading();
+            BaseView.AddChidren(waitPage);
+            waitPage.Start(Language.StringByID(StringId.PleaseWait));
+            new System.Threading.Thread(() =>
+            {
+                if (UserInfo.Current.regionList.Count == 0)
                 {
-                    MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+                    bool loadPage = true;
+                    var pm = new DAL.Server.HttpServerRequest();
+                    while (UserInfo.Current.regionList.Count == 0)
+                    {
+                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+                        System.Threading.Thread.Sleep(1000);
+                        if (loadPage)
+                        {
+                            loadPage = false;
+                            Application.RunOnMainThread(() =>
+                            {
+                                waitPage.Hide();
+                                var addResidencePage = new BindingResidencePage();
+                                BaseView.AddChidren(addResidencePage);
+                                addResidencePage.LoadDialog();
+                            });
+                        }
+                    }
                 }
-
-                while (e < BasePageView.ChildrenCount - 1)
+                ///绛夊緟鑾峰彇浣忓畢淇℃伅
+                Application.RunOnMainThread(() =>
                 {
-                    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
-                }
-            };
-            BasePageView.MouseDownEventHandler += (sender, e) => {
-                BasePageView.ScrollEnabled = true;
-            };
-            BasePageView.MouseUpEventHandler += (sender, e) => {
-                BasePageView.ScrollEnabled = false;
-            };
-            BaseView.AddChidren(BasePageView);
+                    waitPage.Hide();
+                    BaseView.RemoveAll();
+                    BasePageView = new PageLayout();
+                    BasePageView.ScrollEnabled = false;
+                    BasePageView.IsShowPoint = false;
+                    BasePageView.PageChange = (sender, e) =>
+                    {
+                        if (e < BasePageView.ChildrenCount - 1)
+                        {
+                            MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+                        }
 
-            //璺宠浆椤甸潰----
-            var userPage = new UserPage();
-            BasePageView.AddChidren(userPage);
-            userPage.LoadPage();
-            BasePageView.PageIndex = 0;
+                        while (e < BasePageView.ChildrenCount - 1)
+                        {
+                            BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+                        }
+                    };
+                    BasePageView.MouseDownEventHandler += (sender, e) =>
+                    {
+                        BasePageView.ScrollEnabled = true;
+                    };
+                    BasePageView.MouseUpEventHandler += (sender, e) =>
+                    {
+                        BasePageView.ScrollEnabled = false;
+                    };
+                    BaseView.AddChidren(BasePageView);
+
+                    //璺宠浆椤甸潰----
+                    var userPage = new UserPage();
+                    BasePageView.AddChidren(userPage);
+                    userPage.LoadPage();
+                    BasePageView.PageIndex = 0;
+                });
+            }).Start();
         }
 
         /// <summary>

--
Gitblit v1.8.0