From 488efb508eb0648773fe7b68e810e04bcd7ca075 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:15 +0800
Subject: [PATCH] 20201211

---
 HDL_ON/UI/MainPage.cs |  105 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index ea844b8..dbc4eed 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -48,6 +48,11 @@
         /// 杩滅▼妯″紡
         /// </summary>
         public static bool IsRemote = false;
+        /// <summary>
+        /// 缃戠粶杩炴帴鐘舵��
+        /// 0:鏃犵綉缁�
+        /// </summary>
+        public static int InternetStatus = 2;
 
         ///// <summary>
         ///// 鍏徃浠g爜
@@ -102,7 +107,7 @@
                         pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
                     })
                     { IsBackground = true }.Start();
-                    
+
                     GoUserPage();
                     //鍚姩瀵嗙爜楠岃瘉
                     new AppUnlockPage().LoadPage();
@@ -149,63 +154,69 @@
             waitPage.Start(Language.StringByID(StringId.PleaseWait));
             new System.Threading.Thread(() =>
             {
-                if (UserInfo.Current.regionList.Count == 0)
+                try
                 {
-                    bool loadPage = true;
-                    var pm = new DAL.Server.HttpServerRequest();
-                    while (UserInfo.Current.regionList.Count == 0)
+                    if (UserInfo.Current.regionList.Count == 0)
                     {
-                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                        System.Threading.Thread.Sleep(1000);
-                        if (loadPage)
+                        bool loadPage = true;
+                        var pm = new DAL.Server.HttpServerRequest();
+                        while (UserInfo.Current.regionList.Count == 0)
                         {
-                            loadPage = false;
-                            Application.RunOnMainThread(() =>
+                            pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+                            System.Threading.Thread.Sleep(3000);
+                            if (loadPage)
                             {
-                                waitPage.Hide();
-                                var addResidencePage = new BindingResidencePage();
-                                BaseView.AddChidren(addResidencePage);
-                                addResidencePage.LoadDialog();
-                            });
+                                loadPage = false;
+                                Application.RunOnMainThread(() =>
+                                {
+                                    waitPage.Hide();
+                                    var addResidencePage = new BindingResidencePage();
+                                    BaseView.AddChidren(addResidencePage);
+                                    addResidencePage.LoadDialog();
+                                });
+                            }
                         }
                     }
-                }
-                ///绛夊緟鑾峰彇浣忓畢淇℃伅
-                Application.RunOnMainThread(() =>
-                {
-                    waitPage.Hide();
-                    BaseView.RemoveAll();
-                    BasePageView = new PageLayout();
-                    BasePageView.ScrollEnabled = false;
-                    BasePageView.IsShowPoint = false;
-                    BasePageView.PageChange = (sender, e) =>
+                    ///绛夊緟鑾峰彇浣忓畢淇℃伅
+                    Application.RunOnMainThread(() =>
                     {
-                        if (e < BasePageView.ChildrenCount - 1)
-                        {
-                            MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-                        }
-
-                        while (e < BasePageView.ChildrenCount - 1)
-                        {
-                            BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
-                        }
-                    };
-                    BasePageView.MouseDownEventHandler += (sender, e) =>
-                    {
-                        BasePageView.ScrollEnabled = true;
-                    };
-                    BasePageView.MouseUpEventHandler += (sender, e) =>
-                    {
+                        waitPage.Hide();
+                        BaseView.RemoveAll();
+                        BasePageView = new PageLayout();
                         BasePageView.ScrollEnabled = false;
-                    };
-                    BaseView.AddChidren(BasePageView);
+                        BasePageView.IsShowPoint = false;
+                        BasePageView.PageChange = (sender, e) =>
+                        {
+                            if (e < BasePageView.ChildrenCount - 1)
+                            {
+                                MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+                            }
+
+                            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;
-                });
+                        BasePageView.AddChidren(userPage);
+                        userPage.LoadPage();
+                        BasePageView.PageIndex = 0;
+                    });
+                }catch(Exception ex)
+                {
+                    MainPage.Log($"GoUserPage : {ex.Message}");
+                }
             }).Start();
         }
 

--
Gitblit v1.8.0