From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index c45cc6d..9f4dfd5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -342,15 +342,15 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});;
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B020006ABCD",
+ sid = "1234121234567890123456100B060006ABCD",
name = "PM2.5",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -358,9 +358,9 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
//instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
@@ -395,7 +395,7 @@
//});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B050006ABCD",
+ sid = "1234121234567890123456100B070006ABCD",
name = "CO2",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -403,14 +403,14 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B060006ABCD",
+ sid = "1234121234567890123456100B020006ABCD",
name = "娓╁害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -418,14 +418,14 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B070006ABCD",
+ sid = "1234121234567890123456100B050006ABCD",
name = "TVOC",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -433,14 +433,14 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B080006ABCD",
+ sid = "1234121234567890123456100B030006ABCD",
name = "婀垮害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -448,9 +448,9 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
@@ -474,7 +474,8 @@
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
- instance.residenceImage = "Classification/Room/Roombg.png";
+ if (instance!=null) {
+ instance.residenceImage = "Classification/Room/Roombg.png";}
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
InitRoomFunction();
--
Gitblit v1.8.0