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 |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5730447..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.0828";
+        public static string VersionString = "1.2.0926";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -106,20 +106,33 @@
             SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
             SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
             SPK.AcIr,SPK.AcStandard,
-            SPK.FloorHeatStandard,
-            SPK.AirFreshStandard,
-
+            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,
-            SPK.AirSwitch,
-            SPK.ElectricEnergy,
-        };
+            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;
+            }
+        }
 
 
 

--
Gitblit v1.8.0