From a56a485926a8927f904d7f4795c371c25b35753a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 18:18:15 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Entity/FunctionList.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f532c89..aaacb3c 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -91,10 +91,18 @@
/// </summary>
public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
+ public List<Scene> scenes = new List<Scene>();
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
- public List<Scene> scenes = new List<Scene>();
+ //public List<Scene> Scenes
+ //{
+ // get
+ // {
+ // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
+ // return List.scenes;
+ // }
+ //}
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
@@ -207,7 +215,7 @@
}
try
{
- deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
}
catch (Exception ex)
{
@@ -601,6 +609,7 @@
{
DriverLayer.Control.Ins.SendApiReadCommand(page);
page.Clear();
+ count = 0;
}
}
DriverLayer.Control.Ins.SendApiReadCommand(page);
--
Gitblit v1.8.0