From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/Entity/DB_ResidenceData.cs | 185 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 83 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 09efd12..66cebb0 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -11,24 +11,40 @@
}
/// <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];
+ if (MainPage.LocalMode)
+ {
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ }
+ else
+ {
+ 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>
/// 鎴块棿鍒楄〃
@@ -86,35 +102,35 @@
{
var s0 = new Scene()
{
- sid = "12341212345678901234560A0A010001ABCD",
+ sid = "030101123456780A0A010001ABCD",
name = "鍏ㄥ叧鍦烘櫙",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- 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 });
+ s0.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 0, 0, 0 });
+ s0.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 0, 0, 0 });
+ s0.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
+ s0.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
+ s0.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 2 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
var s1 = new Scene()
{
- sid = "12341212345678901234560A0A00010002ABCD",
+ sid = "030101123456780A0A00010002ABCD",
name = "鍏ㄥ紑鍦烘櫙",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- 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 });
+ s1.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 100, 0, 0 });
+ s1.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 100, 0, 0 });
+ s1.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
+ s1.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
+ s1.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 1 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
var s2 = new Scene()
{
- sid = "12341212345678901234560A0A010004ABCD",
+ sid = "030101123456780A0A010004ABCD",
name = "鐢靛奖鍦烘櫙",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
@@ -122,7 +138,7 @@
DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
var s3 = new Scene()
{
- sid = "12341212345678901234560A0A010005ABCD",
+ sid = "030101123456780A0A010005ABCD",
name = "鐢靛奖鍦烘櫙2",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
@@ -132,12 +148,12 @@
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",
+ sid = "030101123456780604010001ABCD",
name = "绌鸿皟",
function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -156,7 +172,7 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560202010002ABCD",
+ sid = "030101123456780202010002ABCD",
name = "璋冨厜鐏�",
function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
@@ -165,15 +181,15 @@
lastState = "20%",
bus_Data = new BusData
{
- SubnetID = 111,
- DeviceID = 2,
+ SubnetID = 42,
+ DeviceID = 9,
LoopID = 1,
},
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560303010003ABCD",
+ sid = "030101123456780303010003ABCD",
name = "绐楀笜妯″潡",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -189,7 +205,7 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560303030011ABCD",
+ sid = "030101123456780303030011ABCD",
name = "寮�鍚堝笜",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -205,7 +221,7 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560503040012ABCD",
+ sid = "030101123456780503040012ABCD",
name = "鍗峰笜",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -217,13 +233,13 @@
bus_Data = new BusData
{
SubnetID = 42,
- DeviceID = 7,
- LoopID = 12,
+ DeviceID = 17,
+ LoopID = 1,
},
});
instance.functionList.floorHeatings.Add(new FloorHeating()
{
- sid = "12341212345678901234560404020004ABCD",
+ sid = "030101123456780404020004ABCD",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -241,7 +257,7 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560202020005ABCD",
+ sid = "030101123456780202020005ABCD",
name = "鍚婄伅",
function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
@@ -256,7 +272,7 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560202040006ABCD",
+ sid = "030101123456780202040006ABCD",
name = "RGB鐏�",
function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
@@ -274,7 +290,7 @@
instance.functionList.fans.Add(new Fan()
{
- sid = "12341212345678901234561010020006ABCD",
+ sid = "030101123456781010020006ABCD",
name = "椋庢墖",
function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -292,7 +308,7 @@
instance.functionList.tVs.Add(new TV()
{
- sid = "12341212345678901234561010030006ABCD",
+ sid = "030101123456781010030006ABCD",
name = "鐢佃",
function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -309,7 +325,7 @@
instance.functionList.switchSockets.Add(new SwitchSocket()
{
- sid = "12341212345678901234560101020006ABCD",
+ sid = "030101123456780101020006ABCD",
name = "鎻掑骇",
function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -323,25 +339,25 @@
},
});
- 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 = "03010112345678100B010006ABCD",
+ // 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 = 111,
+ // DeviceID = 15,
+ // LoopID = 1,
+ // },
+ //});;
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B020006ABCD",
+ sid = "03010112345678100B060006ABCD",
name = "PM2.5",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -349,14 +365,14 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
//instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
//{
- // sid = "1234121234567890123456100B030006ABCD",
+ // sid = "03010112345678100B030006ABCD",
// name = "鍣煶",
// roomIdList = new List<string>() { "0001" },
// propertList = new List<Trait>() {
@@ -371,7 +387,7 @@
//});
//instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
//{
- // sid = "1234121234567890123456100B040006ABCD",
+ // sid = "03010112345678100B040006ABCD",
// name = "椋庡姏",
// roomIdList = new List<string>() { "0001" },
// propertList = new List<Trait>() {
@@ -386,7 +402,7 @@
//});
instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
{
- sid = "1234121234567890123456100B050006ABCD",
+ sid = "03010112345678100B070006ABCD",
name = "CO2",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -394,14 +410,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 = "03010112345678100B020006ABCD",
name = "娓╁害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -409,14 +425,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 = "03010112345678100B050006ABCD",
name = "TVOC",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -424,14 +440,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 = "03010112345678100B030006ABCD",
name = "婀垮害",
roomIdList = new List<string>() { "0001" },
function = new List<Trait>() {
@@ -439,9 +455,9 @@
},
bus_Data = new BusData
{
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
},
});
@@ -473,8 +489,13 @@
return instance;
}
}
-
-
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
+ }
/// <summary>
/// 浣忓畢鍥剧墖
@@ -484,6 +505,10 @@
/// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
/// </summary>
bool hasChange = false;
+ /// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC = "4E47323347591243";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
@@ -517,7 +542,7 @@
foreach (var function in functionList.functions)
{
System.Threading.Thread.Sleep(100);
- if (function.bus_Data != null)
+ //if (function.bus_Data != null)
{
switch (function.functionCategory)
{
@@ -526,15 +551,9 @@
case FunctionCategory.SwitchDevice:
case FunctionCategory.Curtain:
case FunctionCategory.Thermostat:
- Control.Send(CommandType_A.read, function);
+ Control.SendReadCommand(function);
break;
-
-
}
- }
- else
- {
-
}
}
}
--
Gitblit v1.8.0