From 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 15 十二月 2020 09:08:59 +0800
Subject: [PATCH] 20201215-1
---
HDL_ON/Entity/Function/Scene.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index a74b46a..67d0c57 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -27,9 +27,9 @@
public Scene()
{
sid = NewSid();
- if (!string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ if (!DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
{
- gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId;
}
}
/// <summary>
@@ -210,7 +210,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -333,7 +333,7 @@
/// <returns></returns>
Function ConvertFunctionObject()
{
- var localFunction = DB_ResidenceData.functionList.GetAllDeviceFunctionList().Find((obj) => obj.sid == sid);
+ var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
foreach (var s in status)
{
localFunction.attributes.Add(new FunctionAttributes() { key = s.key, curValue = s.value, value = new List<string>() { s.value } });
--
Gitblit v1.8.0