From 4addd1dc37f167e2000c31c7b623ba45b01d77ec Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 17:11:20 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/MainPage.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 223ecbc..fe49208 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -10,6 +10,7 @@
{
public static class MainPage
{
+
/// <summary>
/// BaseView
/// </summary>
@@ -25,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0721";
+ public static string VersionString = "1.3.1119";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -105,20 +106,35 @@
public static List<string> SceneSupportFunctionList = new List<string> {
SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
- SPK.AcIr,SPK.AcStandard,
- SPK.FloorHeatStandard,
-
+ SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
+ SPK.FloorHeatStandard,SPK.HvacFloorHeat,
+ SPK.AirFreshStandard,SPK.HvacAirFresh,
+ SPK.AirSwitch,
+ SPK.PanelSocket,SPK.ElectricSocket,
};
+
+
+ static List<string> _RoomNotSupportFunctionList = null;
/// <summary>
/// 鎴块棿鍔熻兘鍒楄〃涓嶅姞杞界殑鍔熻兘鍒楄〃
/// </summary>
- public static List<string> RoomNotSupportFunctionList = new List<string>
+ public static List<string> RoomNotSupportFunctionList
{
- SPK.EnergyStandard,
- SPK.MusicStandard,
- };
-
-
+ get {
+ if(_RoomNotSupportFunctionList == null)
+ {
+ _RoomNotSupportFunctionList = new List<string>();
+ _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
+ _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
+ _RoomNotSupportFunctionList.Add(SPK.AvMusic);
+ _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
+ _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
+ _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
+ _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
+ }
+ return _RoomNotSupportFunctionList;
+ }
+ }
public static void Show()
{
@@ -129,7 +145,8 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
-
+ ///鐩戝惉缁忕含搴�
+ HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent();
//#region 娴嬭瘯
//var ddd = new UI.test.TestDialog();
@@ -328,8 +345,11 @@
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread( () =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
//璺宠浆椤甸潰----
UserBasePage = new UserPage();
@@ -363,6 +383,7 @@
});
}
}).Start();
+
}
/// <summary>
@@ -401,7 +422,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