From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/FunctionList.cs | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index c2fafac..cce8348 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -7,11 +7,6 @@
{
public class FunctionList
{
- public FunctionList()
- {
-
- }
-
/// <summary>
/// 绌鸿皟鍒楄〃
/// </summary>
@@ -93,7 +88,6 @@
{
var fs = new List<Function>();
fs.AddRange(GetAllDeviceFunctionList());
- fs.AddRange(scenes);
return fs;
}
@@ -102,7 +96,7 @@
/// </summary>
public List<Function> GetAllDeviceFunctionList()
{
- if (deviceFunctionList == null)
+ //if (deviceFunctionList == null || deviceFunctionList.Count == 0)
{
deviceFunctionList = new List<Function>();
deviceFunctionList.AddRange(aCs);
@@ -168,6 +162,8 @@
sidObj2.SaveFunctionData();
break;
case FunctionType.Curtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
DB_ResidenceData.functionList.curtains.Add(sidObj3 );
sidObj3.SaveFunctionData();
--
Gitblit v1.8.0