From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/MainPage.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 3d3d5ad..f7c57bd 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.3";
+ public static string VersionString = "1.7.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -141,6 +141,7 @@
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ _RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
@@ -156,7 +157,6 @@
Application.DesignHeight = 667;
//璁剧疆璇█鐜 闃叉string杞� double鍑虹幇閫楀彿锛宼odouble寮傚父绛夐棶棰�
System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");
-
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -211,7 +211,14 @@
/// </summary>
public static void GoLoginPage(UserInfo userInfo = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +233,14 @@
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
#region 鍚庨��浜嬩欢
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
@@ -398,13 +412,14 @@
{
try
{
- Entity.FunctionList.List.Clear();
+ Entity.FunctionList.List.ClearDatas();
Entity.SpatialInfo.CurrentSpatial.Clear();
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread(() =>
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
--
Gitblit v1.8.0