From a46cd0adb5af29e8a9cf47c219475acaedfcf839 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/Entity/DB_ResidenceData.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 148d6bd..fccfe8f 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -131,15 +131,14 @@
{
sid = "030101123456780202010005ABCD",
name = "鐏厜1",
- function = new List<FunctionAttributes>() {
+ attributes = new List<FunctionAttributes>() {
new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
- roomIdList = new List<string>() { "0001" },
+ roomIds = new List<string>() { "0001" },
bus_Data = new BusData
{
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
+ addresses = "2A06",
+ loopId = 1,
},
}.SaveFunctionData();
@@ -535,6 +534,7 @@
foreach (var r in rooms)
{
r.GetRoomFunctions(true);
+ r.GetRoomScenes(true);
}
}
catch (Exception ex)
--
Gitblit v1.8.0