From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/MainPage.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index f0f3cc5..8c2435d 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.1.0114";
+ public static string VersionString = "1.1.0203";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -91,6 +91,12 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
+
+ //#region 娴嬭瘯
+ //var ddd = new UI.test.TestDialog();
+ //ddd.InitView();
+ //return;
+ //#endregion
if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
@@ -165,7 +171,6 @@
addResidencePage.LoadView();
return;
}
-
new System.Threading.Thread(() =>
{
try
@@ -203,11 +208,14 @@
};
BaseView.AddChidren(BasePageView);
+
//璺宠浆椤甸潰----
var UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
+
+
if (isFirstOpen)
{
@@ -226,11 +234,16 @@
{
Application.RunOnMainThread(() =>
{
+
+
if (downloadData)
{
///鍒濆鍖朼pp鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
};
+
+
+
});
}
}).Start();
--
Gitblit v1.8.0