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 | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 09efd12..9f4dfd5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -11,24 +11,33 @@
}
/// <summary>
- /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ /// 0:A鍗忚缃戝叧
+ /// 1:bus缃戝叧
+ /// 2:knx缃戝叧
/// </summary>
- public int CurReginIndex = 0;
+ public int GatewayType = 0;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
- public RegionInfoRes residecenInfo {
+ public RegionInfoRes residecenInfo
+ {
get
{
- return MainPage.LoginUser.regionList[CurReginIndex];
+ return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
}
}
/// <summary>
+ /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ /// </summary>
+ public string CurReginID = "";
+
+
+ /// <summary>
/// 妤煎眰鍒楄〃
/// </summary>
- public List<string> floors = new List<string>();
+ public List<Floor> floors = new List<Floor>();
/// <summary>
/// 鎴块棿鍒楄〃
@@ -132,9 +141,9 @@
if (instance.rooms.Count == 0)
{
//--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 0, backgroundImage = "Classification/Room/Roombg.png" };
+ var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
instance.rooms.Add(r111);
- instance.floors.Add("1 F");
+ instance.floors.Add(new Floor() { sid = "", name = "1 F" });
instance.functionList.aCs.Add(new AC()
{
sid = "12341212345678901234560604010001ABCD",
@@ -217,8 +226,8 @@
bus_Data = new BusData
{
SubnetID = 42,
- DeviceID = 7,
- LoopID = 12,
+ DeviceID = 17,
+ LoopID = 1,
},
});
instance.functionList.floorHeatings.Add(new FloorHeating()
@@ -333,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>() {
@@ -349,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()
@@ -386,7 +395,7 @@
//});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B050006ABCD",
+ sid = "1234121234567890123456100B070006ABCD",
name = "CO2",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -394,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>() {
@@ -409,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>() {
@@ -424,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>() {
@@ -439,9 +448,9 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
@@ -465,7 +474,8 @@
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
- instance.residenceImage = "Classification/Room/Roombg.png";
+ if (instance!=null) {
+ instance.residenceImage = "Classification/Room/Roombg.png";}
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
InitRoomFunction();
@@ -473,8 +483,13 @@
return instance;
}
}
-
-
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
+ }
/// <summary>
/// 浣忓畢鍥剧墖
--
Gitblit v1.8.0