From ad51f05f31440bcc64e0ef248ab32fd12997e565 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 六月 2023 13:25:02 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 4f2d2b4..0c52ed6 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -455,7 +455,8 @@
};
btnPm25Values.Width = btnPm25Values.GetTextWidth();
environmentalView.AddChidren(btnPm25Values);
-#endregion
+ #endregion
+
btnSecurityStatus = new Button()
{
@@ -604,9 +605,9 @@
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
-#endregion
+ #endregion
-#region ContextView
+ #region ContextView
contentView = new PageLayout()
{
//Y = changeView.Bottom,
@@ -619,7 +620,7 @@
LoadContentView();
-#endregion
+ #endregion
}
catch (Exception ex)
{
@@ -633,6 +634,7 @@
/// </summary>
void LoadContentView()
{
+
if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
--
Gitblit v1.8.0