From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 3399cbd..3144977 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -127,7 +127,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Room> GetGatewayRoomList()
{
- return HDL_ON.Entity.DB_ResidenceData.residenceData.Rooms;
+ return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;
}
/// <summary>
/// 鑾峰彇缃戝叧鎴块棿鍒楄〃
@@ -155,7 +155,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
{
- return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+ return Entity.FunctionList.List.GetDeviceFunctionList();
}
/// <summary>
/// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
@@ -163,7 +163,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Scene> GetSceneList()
{
- return HDL_ON.Entity.DB_ResidenceData.functionList.scenes;
+ return HDL_ON.Entity.FunctionList.List.scenes;
}
/// <summary>
/// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
--
Gitblit v1.8.0