From 8983da138cb92e35b0bbeaece1cf1c454a5a79d4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 01 十二月 2020 16:31:28 +0800
Subject: [PATCH] 20201201
---
HDL_ON/Entity/DB_ResidenceData.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 32c04e4..b5def69 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -32,11 +32,6 @@
else
{
var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
- //if (curRegion == null)
- //{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
- //}
return curRegion;
}
}
@@ -97,15 +92,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();
@@ -450,6 +444,7 @@
foreach (var r in rooms)
{
r.GetRoomFunctions(true);
+ r.GetRoomScenes(true);
}
}
catch (Exception ex)
--
Gitblit v1.8.0