From ee928471920ea75b731e91a72bb1bbd00e778dc9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 09 十二月 2022 10:12:36 +0800
Subject: [PATCH] 1.6.3
---
HDL_ON/Entity/DB_ResidenceData.cs | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index b28ec2a..5030525 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -54,29 +54,31 @@
}
}
- private List<ShowFunction> showFunctions;
+ private List<ShowFunction> dddd;
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
- public List<ShowFunction> functionTypeList
+ [Newtonsoft.Json.JsonIgnore]
+ public List<ShowFunction> ShowFunctionTypeList
{
get
{
- if (showFunctions == null)
+ if (dddd == null)
{
- showFunctions = new List<ShowFunction> {
+ dddd = new List<ShowFunction>(){
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
ShowFunction.FloorHeating,ShowFunction.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
+ ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
- ShowFunction.MechanicalArm };
+ ShowFunction.MechanicalArm ,
+ ShowFunction.SecurityMonitoring,};
}
- return showFunctions;
+ return dddd;
}
}
@@ -121,17 +123,6 @@
{
instance = temp;
}
- 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,
- ShowFunction.MechanicalArm
- });
instance.SupportFacePass = false;
instance.SaveResidenceData();
}
--
Gitblit v1.8.0