From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/MainPage.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 59b607b..1a51f05 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0702";
+ public static string VersionString = "1.2.0820";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -115,6 +115,7 @@
public static List<string> RoomNotSupportFunctionList = new List<string>
{
SPK.EnergyStandard,
+ SPK.MusicStandard,
};
@@ -400,7 +401,16 @@
{
if (view != null)
{
- if(view.Tag.ToString() != "unlockpage")
+ if(view.Tag!=null )
+ {
+ if (view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }else
+ {
+ result = 2;
+ }
+ }else
{
view.RemoveFromParent();
}
--
Gitblit v1.8.0