From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:54:15 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/DB_ResidenceData.cs | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index cd346ad..d3df31b 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -54,11 +54,33 @@
}
}
+ [Newtonsoft.Json.JsonIgnore]
+ private List<ShowFunction> showFunctions;
+
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public List<ShowFunction> functionTypeList = new List<ShowFunction>();
+ public List<ShowFunction> functionTypeList
+ {
+ get
+ {
+ if (showFunctions == null)
+ {
+ showFunctions = new List<ShowFunction> {
+ ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ ShowFunction.EnergyMonitoring,
+ ShowFunction.FreshAir,ShowFunction.DoorLock,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom,
+ ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.MechanicalArm };
+ }
+ return showFunctions;
+ }
+ }
static DB_ResidenceData instance;
public static DB_ResidenceData Instance
@@ -70,16 +92,6 @@
if(MainPage.NoLoginMode)
{
instance = new DB_ResidenceData();
- instance.functionTypeList.AddRange(new List<ShowFunction> {
- ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
- ShowFunction.FloorHeating,ShowFunction.Music,
- ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
- ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
- ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter,ShowFunction.Acst,
- });
instance.SaveResidenceData();
instance.residenceImage = "Classification/Room/Roombg.png";
instance.HomeGateway = new HomeGatewayInfo()
@@ -120,6 +132,7 @@
ShowFunction.Panel,ShowFunction.SecurityMonitoring,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.MechanicalArm
});
instance.SupportFacePass = false;
instance.SaveResidenceData();
--
Gitblit v1.8.0