From f49856cb0e1e9d95fe11bb64054a407f69943d16 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:34:35 +0800
Subject: [PATCH] 2020-11-30-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 3a0bfcb..17ebb5e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -16,7 +16,7 @@
/// </summary>
public const string target_if = "鐩爣";
/// <summary>
- /// 绉婚櫎鎵�鏈夌晫闈�
+ /// 绉婚櫎鎵�鏈�"Logic"鐣岄潰
/// </summary>
public static void RemoveAllView()
{
@@ -93,7 +93,7 @@
/// 鑾峰彇缃戝叧鎴块棿鍒楄〃
/// </summary>
/// <returns></returns>
- public static List<HDL_ON.Entity.Room> GetGatewayRoomListG()
+ public static List<HDL_ON.Entity.Room> GetGatewayRoomList()
{
return HDL_ON.Entity.DB_ResidenceData.rooms;
}
@@ -109,7 +109,7 @@
room1.name = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
room1.sid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿
roomList.Add(room1);//榛樿娣诲姞鍒版埧闂村垪琛ㄩ噷
- var roomLists = GetGatewayRoomListG();
+ var roomLists = GetGatewayRoomList();
foreach (var room in roomLists)
{
roomList.Add(room);
@@ -125,6 +125,14 @@
{
return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+ }
+ /// <summary>
+ /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<HDL_ON.Entity.Scene> GetSceneList()
+ {
+ return HDL_ON.Entity.DB_ResidenceData.functionList.scenes;
}
/// <summary>
/// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
@@ -169,6 +177,26 @@
}
return device;
}
+
+ /// <summary>
+ /// 鑾峰彇褰撲釜鍦烘櫙
+ /// </summary>
+ /// <param name="sid">鍦烘櫙鍞竴鏍囪瘑</param>
+ /// <returns></returns>
+ public static HDL_ON.Entity.Scene GetSecne(string sid)
+ {
+ HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" };
+ List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
+ foreach (var sce in sceneLists)
+ {
+ if (sce.sid == sid)
+ {
+ scene = sce;
+ break;
+ }
+ }
+ return scene;
+ }
/// <summary>
/// 鑾峰彇鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
/// </summary>
@@ -177,7 +205,7 @@
public static string GetGetRoomName(HDL_ON.Entity.Function device)
{
string roomName = "";
- List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomListG();
+ List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomList();
foreach (var dev in device.roomIdList)
{
--
Gitblit v1.8.0