From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/MainPage.cs | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 67babbc..a5240ca 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -53,6 +53,10 @@
/// 0:鏃犵綉缁�
/// </summary>
public static int InternetStatus = 2;
+ /// <summary>
+ /// 鏄惁杩涘叆鍚庡彴
+ /// </summary>
+ public static bool IsEnterBackground = false;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -147,42 +151,30 @@
/// 杩涘叆涓婚〉
/// </summary>
/// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
- public static void GoUserPage(bool isFirstOpen = false)
+ /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
+ public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
BaseView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ //褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
+ if (UserInfo.Current.regionList.Count == 0)
+ {
+ waitPage.Hide();
+ var addResidencePage = new BindingResidencePage();
+ BaseView.AddChidren(addResidencePage);
+ addResidencePage.LoadView();
+ return;
+ }
+
new System.Threading.Thread(() =>
{
try
{
- if (UserInfo.Current.regionList.Count == 0)
- {
- bool loadPage = true;
- var pm = new DAL.Server.HttpServerRequest();
- while (UserInfo.Current.regionList.Count == 0)
- {
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- System.Threading.Thread.Sleep(3000);
- if (loadPage)
- {
- loadPage = false;
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- var addResidencePage = new BindingResidencePage();
- BaseView.AddChidren(addResidencePage);
- addResidencePage.LoadDialog();
- });
- }
- }
- }
- else
- {
- Entity.FunctionList.List.Clear();
- Entity.SpatialInfo.CurrentSpatial.Clear();
- }
+ Entity.FunctionList.List.Clear();
+ Entity.SpatialInfo.CurrentSpatial.Clear();
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread(() =>
{
@@ -224,6 +216,9 @@
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage(isFirstOpen);
}
+ //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+ pageShowEvent?.Invoke();
+ pageShowEvent = null;
});
}
catch (Exception ex)
@@ -264,6 +259,8 @@
Entity.FunctionList.List.DownloadFunctionList();
//璇诲彇浜戠鍦烘櫙鏁版嵁
Entity.FunctionList.List.DownloadSceneList();
+ //璇诲彇閫昏緫鍒楄〃
+ UI.UI2.Intelligence.Automation.MainView.GetLogicList();
#endregion
})
--
Gitblit v1.8.0