From dbc23459fdf4e8b74a5f955fbb9fc631b4babc70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 11:56:16 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL_ON/UI/MainPage.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 3a8d23e..227e21f 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.0303";
+ 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>
///// 鍏徃浠ｇ爜
@@ -184,7 +192,7 @@
waitPage.RemoveFromParent();
BaseView.RemoveAll();
BasePageView = new PageLayout();
- BasePageView.ScrollEnabled = false;
+ BasePageView.ScrollEnabled = true;
BasePageView.IsShowPoint = false;
BasePageView.PageChange = (sender, e) =>
{
--
Gitblit v1.8.0