From 673a93f4ed742a10a879a67b616e6646b03ef0fb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 九月 2020 17:14:27 +0800
Subject: [PATCH] 202009151
---
HDL_ON/Entity/FunctionList.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 0e910dc..55e8a52 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);
@@ -113,7 +113,15 @@
deviceFunctionList.AddRange(sensorsEnvironmentalScience);
deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
}
- return deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ try
+ {
+ deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"璁惧鍔熻兘鎺掑簭寮傚父锛歿ex.Message}");
+ }
+ return deviceFunctionList;
}
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
@@ -160,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