From dd3fecc3a8b92b377febfcf92d32ec22a07724f6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 26 九月 2021 15:21:57 +0800
Subject: [PATCH] 主从网关属性，防挤下线账号删除
---
HDL_ON/UI/MainPage.cs | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 223ecbc..2d25815 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.0926";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -106,17 +106,33 @@
SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
SPK.AcIr,SPK.AcStandard,
- SPK.FloorHeatStandard,
-
+ SPK.FloorHeatStandard,SPK.HvacFloorHeat,
+ SPK.AirFreshStandard,SPK.HvacAirFresh,
+ SPK.AirSwitch,
};
+
+
+ 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;
+ }
+ }
@@ -328,8 +344,11 @@
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread( () =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
//璺宠浆椤甸潰----
UserBasePage = new UserPage();
@@ -401,7 +420,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