From b71dfb3ca100340005d56e1298292807da82322d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 六月 2020 15:04:21 +0800
Subject: [PATCH] 20200608
---
HDL_ON/Entity/DB_ResidenceData.cs | 147 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 138 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index e94bcc2..61d1e8a 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -92,8 +92,8 @@
// roomIdList = new List<string>() { "0001" },
// bus_SceneData = new Dictionary<string, byte[]>(),
// };
- // s0.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 0, 0, 0 });
- // s0.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 0, 0, 0 });
+ // s0.bus_SceneData.Add("12341212345678901234560202010002ABCD", new byte[] { 1, 0, 0, 0 });
+ // s0.bus_SceneData.Add("12341212345678901234560202020005ABCD", new byte[] { 1, 0, 0, 0 });
// s0.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
// s0.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
// s0.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 2 });
@@ -106,8 +106,8 @@
// roomIdList = new List<string>() { "0001" },
// bus_SceneData = new Dictionary<string, byte[]>(),
// };
- // s1.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 100, 0, 0 });
- // s1.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 100, 0, 0 });
+ // s1.bus_SceneData.Add("12341212345678901234560202010002ABCD", new byte[] { 1, 100, 0, 0 });
+ // s1.bus_SceneData.Add("12341212345678901234560202020005ABCD", new byte[] { 1, 100, 0, 0 });
// s1.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
// s1.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
// s1.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 1 });
@@ -156,7 +156,7 @@
// });
// instance.functionList.lights.Add(new Light()
// {
- // sid = "12341212345678901234560202020002ABCD",
+ // sid = "12341212345678901234560202010002ABCD",
// name = "璋冨厜鐏�",
// propertList = new List<Trait>() {
// new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
@@ -241,7 +241,7 @@
// });
// instance.functionList.lights.Add(new Light()
// {
- // sid = "12341212345678901234560202010005ABCD",
+ // sid = "12341212345678901234560202020005ABCD",
// name = "鍚婄伅",
// propertList = new List<Trait>() {
// new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
@@ -276,7 +276,7 @@
{
sid = "12341212345678901234561010020006ABCD",
name = "椋庢墖",
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
new Trait { attri="openLevel", max=7,min = 0, value= new List<string> { "percent" } },
},//"brightness,color",
@@ -294,7 +294,7 @@
{
sid = "12341212345678901234561010030006ABCD",
name = "鐢佃",
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = new List<string>() { "0001" },
@@ -311,7 +311,7 @@
{
sid = "12341212345678901234560101020006ABCD",
name = "鎻掑骇",
- propertList = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
},//"brightness,color",
roomIdList = new List<string>() { "0001" },
@@ -323,6 +323,135 @@
},
});
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B010006ABCD",
+ name = "PM1.0",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "135"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });;
+
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B020006ABCD",
+ name = "PM2.5",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "22"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+ //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ //{
+ // sid = "1234121234567890123456100B030006ABCD",
+ // name = "鍣煶",
+ // roomIdList = new List<string>() { "0001" },
+ // propertList = new List<Trait>() {
+ // new Trait { attri="values", max=1,min = 0, value= new List<string> { "120"} },
+ // },
+ // bus_Data = new BusData
+ // {
+ // SubnetID = 142,
+ // DeviceID = 4,
+ // LoopID = 111,
+ // },
+ //});
+ //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ //{
+ // sid = "1234121234567890123456100B040006ABCD",
+ // name = "椋庡姏",
+ // roomIdList = new List<string>() { "0001" },
+ // propertList = new List<Trait>() {
+ // new Trait { attri="values", max=1,min = 0, value= new List<string> { "1.8"} },
+ // },
+ // bus_Data = new BusData
+ // {
+ // SubnetID = 142,
+ // DeviceID = 4,
+ // LoopID = 111,
+ // },
+ //});
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B050006ABCD",
+ name = "CO2",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "1352"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B060006ABCD",
+ name = "娓╁害",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "28"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B070006ABCD",
+ name = "TVOC",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "0.3"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B080006ABCD",
+ name = "婀垮害",
+ roomIdList = new List<string>() { "0001" },
+ function = new List<Trait>() {
+ new Trait { attri="values", max=1,min = 0, value= new List<string> { "15"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+
+
+
+
+
+
+
+
instance.SaveResidenceData();
}
--
Gitblit v1.8.0