From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制

---
 HDL_ON/UI/MainPage.cs |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 095d6f1..51f1f50 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -109,16 +109,12 @@
                         {
                             var pm = new DAL.Server.HttpServerRequest();
                             pm.RefreshToken();//鍒锋柊Token
-                        pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                        pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
-                    })
+                            pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+                            pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+                        })
                         { IsBackground = true }.Start();
 
                         GoUserPage(true);
-
-
-                        ///鍒濆鍖朼pp鏁版嵁
-                        InitializationData();
                     }
                 }
             }
@@ -168,7 +164,7 @@
                         while (UserInfo.Current.regionList.Count == 0)
                         {
                             pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
-                            System.Threading.Thread.Sleep(3000);
+                            System.Threading.Thread.Sleep(2000);
                             if (loadPage)
                             {
                                 loadPage = false;
@@ -177,10 +173,15 @@
                                     waitPage.Hide();
                                     var addResidencePage = new BindingResidencePage();
                                     BaseView.AddChidren(addResidencePage);
-                                    addResidencePage.LoadDialog();
+                                    addResidencePage.LoadView();
                                 });
                             }
                         }
+                    }
+                    else
+                    {
+                        Entity.FunctionList.List.Clear();
+                        Entity.SpatialInfo.CurrentSpatial.Clear();
                     }
                     ///绛夊緟鑾峰彇浣忓畢淇℃伅
                     Application.RunOnMainThread(() =>
@@ -228,6 +229,10 @@
                 catch (Exception ex)
                 {
                     MainPage.Log($"GoUserPage : {ex.Message}");
+                }finally
+                {
+                    ///鍒濆鍖朼pp鏁版嵁
+                    InitializationData();
                 }
             }).Start();
         }
@@ -241,7 +246,7 @@
             {
                 while (true)
                 {
-                    if (Entity.DB_ResidenceData.residenceData == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+                    if (Entity.DB_ResidenceData.Instance == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
                     {
                         System.Threading.Thread.Sleep(100);
                     }
@@ -250,6 +255,7 @@
                         break;
                     }
                 }
+                //System.Threading.Thread.Sleep(2000);
                 #region 璇诲彇浜戠鏁版嵁--
                 //todo鏁版嵁瑕嗙洊澶勭悊
                 //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�

--
Gitblit v1.8.0