From 3a3941a163583b527cbfafe7e09811eb1432a7c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 19:38:16 +0800
Subject: [PATCH] 2021-8-28-5
---
HDL_ON/UI/MainPage.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 223ecbc..5730447 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.0721";
+ public static string VersionString = "1.2.0828";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -107,6 +107,7 @@
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
SPK.AcIr,SPK.AcStandard,
SPK.FloorHeatStandard,
+ SPK.AirFreshStandard,
};
/// <summary>
@@ -116,6 +117,8 @@
{
SPK.EnergyStandard,
SPK.MusicStandard,
+ SPK.AirSwitch,
+ SPK.ElectricEnergy,
};
@@ -328,8 +331,11 @@
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread( () =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
//璺宠浆椤甸潰----
UserBasePage = new UserPage();
@@ -401,7 +407,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