From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/UI/MainPage.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 058fd9d..1315ac8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0422";
+ public static string VersionString = "1.2.0428";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -371,7 +371,10 @@
{
if (view != null)
{
- view.RemoveFromParent();
+ if(view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }
}
}
}
--
Gitblit v1.8.0