From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"
---
HDL_ON/Entity/FunctionList.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index c2fafac..862f3b9 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -102,7 +102,7 @@
/// </summary>
public List<Function> GetAllDeviceFunctionList()
{
- if (deviceFunctionList == null)
+ //if (deviceFunctionList == null || deviceFunctionList.Count == 0)
{
deviceFunctionList = new List<Function>();
deviceFunctionList.AddRange(aCs);
@@ -168,6 +168,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