From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/MainPage.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index f1271bf..1850d6b 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.0119";
+ public static string VersionString = "1.1.0310";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -53,6 +53,14 @@
/// 鏄惁杩涘叆鍚庡彴
/// </summary>
public static bool IsEnterBackground = false;
+ /// <summary>
+ /// 褰撳墠鍒嗛〉绱㈠紩
+ /// 0:鏀惰棌
+ /// 1:鍒嗙被
+ /// 2:鏅鸿兘
+ /// 3:涓汉
+ /// </summary>
+ public static int CurPageIndex = 9999;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -171,7 +179,6 @@
addResidencePage.LoadView();
return;
}
-
new System.Threading.Thread(() =>
{
try
@@ -209,11 +216,14 @@
};
BaseView.AddChidren(BasePageView);
+
//璺宠浆椤甸潰----
var UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
+
+
if (isFirstOpen)
{
@@ -232,11 +242,16 @@
{
Application.RunOnMainThread(() =>
{
+
+
if (downloadData)
{
///鍒濆鍖朼pp鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
};
+
+
+
});
}
}).Start();
--
Gitblit v1.8.0