From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 390 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 320 insertions(+), 70 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 93583a6..926fe3a 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -9,15 +9,42 @@
public DB_ResidenceData()
{
}
+
/// <summary>
- /// 浣忓畢鍚嶇О
+ /// 0:A鍗忚缃戝叧
+ /// 1:bus缃戝叧
+ /// 2:knx缃戝叧
/// </summary>
- public string residenceName;
+ public int GatewayType = 0;
+
+ /// <summary>
+ /// 浣忓畢鍩虹淇℃伅
+ /// </summary>
+ public RegionInfoRes residecenInfo
+ {
+ get
+ {
+ 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>
/// 鎴块棿鍒楄〃
@@ -31,7 +58,7 @@
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
- public List<FunctionCategory> functionTypeList = new List<FunctionCategory>();
+ public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
public static DB_ResidenceData residenceData
@@ -59,65 +86,60 @@
}
if (instance.functionTypeList.Count == 0)
{
- instance.functionTypeList.AddRange(new List<FunctionCategory> {
- FunctionCategory.Light,FunctionCategory.AC,FunctionCategory.Curtain,
- FunctionCategory.FloorHeating,FunctionCategory.DoorLock,
- FunctionCategory.Electric,FunctionCategory.EnergyMonitoring,
- FunctionCategory.Environmental,
- FunctionCategory.FreshAir,FunctionCategory.Music,
- FunctionCategory.Panel,FunctionCategory.SecurityMonitoring,
- FunctionCategory.Sensor,FunctionCategory.VideoIntercom
+ instance.functionTypeList.AddRange(new List<ShowFunction> {
+ ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
+ ShowFunction.FloorHeating,ShowFunction.DoorLock,
+ ShowFunction.Electric,ShowFunction.EnergyMonitoring,
+ ShowFunction.Environmental,
+ ShowFunction.FreshAir,ShowFunction.Music,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom
});
}
- //new System.Threading.Thread(() =>
- //{
#if DEBUG
if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
{
var s0 = new Scene()
{
- sid = "12341212345678901234560100010001",
+ sid = "12341212345678901234560A0A010001ABCD",
name = "鍏ㄥ叧鍦烘櫙",
- scene_id = "0001",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- s0.bus_SceneData.Add("12341212345678901234560401020002", new byte[] { 1, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560401010005", new byte[] { 1, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560401030006", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- s0.bus_SceneData.Add("12341212345678901234560603010001", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
- s0.bus_SceneData.Add("12341212345678901234560502010003", new byte[] { 1, 2 });
+ 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 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
var s1 = new Scene()
{
- sid = "12341212345678901234560100010002",
+ sid = "12341212345678901234560A0A00010002ABCD",
name = "鍏ㄥ紑鍦烘櫙",
- scene_id = "0002",
sceneType = SceneType.OrdinaryScenes,
roomIdList = new List<string>() { "0001" },
bus_SceneData = new Dictionary<string, byte[]>(),
};
- s1.bus_SceneData.Add("12341212345678901234560401020002", new byte[] { 1, 100, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560401010005", new byte[] { 1, 100, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560401030006", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- s1.bus_SceneData.Add("12341212345678901234560603010001", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
- s1.bus_SceneData.Add("12341212345678901234560502010003", new byte[] { 1, 1 });
+ 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 });
DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
var s2 = new Scene()
{
- sid = "12341212345678901234560100010004",
+ sid = "12341212345678901234560A0A010004ABCD",
name = "鐢靛奖鍦烘櫙",
- scene_id = "0004",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
};
DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
var s3 = new Scene()
{
+ sid = "12341212345678901234560A0A010005ABCD",
name = "鐢靛奖鍦烘櫙2",
- scene_id = "0003",
sceneType = SceneType.MovieScene,
roomIdList = new List<string>() { "0001" },
};
@@ -126,13 +148,19 @@
if (instance.rooms.Count == 0)
{
//--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 1, 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(new Floor() { sid = "", name = "1 F" });
instance.functionList.aCs.Add(new AC()
{
- sid = "12341212345678901234560603010001",
+ sid = "12341212345678901234560604010001ABCD",
name = "绌鸿皟",
- trait = "on_off,mode,fan,temperature",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
+ new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "medium", "high" ,"auto"} },
+ new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
+ },
roomIdList = new List<string>() { "0001" },
lastState = "鍒跺喎 涓 18掳C",
bus_Data = new BusData
@@ -144,25 +172,29 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401020002",
+ sid = "12341212345678901234560202010002ABCD",
name = "璋冨厜鐏�",
- trait = "brightness",
+ function = new List<Trait>() {
+ new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
+ },//"brightness",
roomIdList = new List<string>() { "0001" },
lastState = "20%",
bus_Data = new BusData
{
- SubnetID = 111,
- DeviceID = 2,
+ SubnetID = 42,
+ DeviceID = 9,
LoopID = 1,
},
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502010003",
+ sid = "12341212345678901234560303010003ABCD",
name = "绐楀笜妯″潡",
roomIdList = new List<string>() { "0001" },
- trait = "curtain",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
+ },// "curtain",
lastState = "寮�",
bus_Data = new BusData
{
@@ -173,10 +205,12 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502020011",
+ sid = "12341212345678901234560303030011ABCD",
name = "寮�鍚堝笜",
roomIdList = new List<string>() { "0001" },
- trait = "curtaintype",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
+ },//"curtaintype",
lastState = "20%",
bus_Data = new BusData
{
@@ -187,30 +221,47 @@
});
instance.functionList.curtains.Add(new Curtain()
{
- sid = "12341212345678901234560502030012",
+ sid = "12341212345678901234560503040012ABCD",
name = "鍗峰笜",
roomIdList = new List<string>() { "0001" },
- trait = "rollingshutter",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
+ new Trait { attri="openLevel", max=100,min = 0, value= new List<string> { "percent" } },
+
+ },// "rollingshutter",
lastState = "20%",
bus_Data = new BusData
{
SubnetID = 42,
- DeviceID = 7,
- LoopID = 12,
+ DeviceID = 17,
+ LoopID = 1,
},
});
instance.functionList.floorHeatings.Add(new FloorHeating()
{
- sid = "12341212345678901234560704010004",
+ sid = "12341212345678901234560404020004ABCD",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
- lastState = ""
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "ordinary", "day", "night","timer","away" } },
+ new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
+ },//
+ lastState = "鑷姩 25掳C",
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 12,
+ LoopID = 1
+ }
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401010005",
- name = "澶у悐鐏�",
- trait = "on_off",
+ sid = "12341212345678901234560202020005ABCD",
+ name = "鍚婄伅",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
+ },//"on_off",
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
{
@@ -221,9 +272,12 @@
});
instance.functionList.lights.Add(new Light()
{
- sid = "12341212345678901234560401030006",
+ sid = "12341212345678901234560202040006ABCD",
name = "RGB鐏�",
- trait = "brightness,color",
+ function = new List<Trait>() {
+ new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
+ new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
+ },//"brightness,color",
roomIdList = new List<string>() { "0001" },
bus_Data = new BusData
{
@@ -232,6 +286,189 @@
LoopID = 1,
},
});
+
+
+ instance.functionList.fans.Add(new Fan()
+ {
+ sid = "12341212345678901234561010020006ABCD",
+ name = "椋庢墖",
+ 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",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 11,
+ },
+ });
+
+
+ instance.functionList.tVs.Add(new TV()
+ {
+ sid = "12341212345678901234561010030006ABCD",
+ name = "鐢佃",
+ function = new List<Trait>() {
+ new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
+ },
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ });
+
+
+ instance.functionList.switchSockets.Add(new SwitchSocket()
+ {
+ sid = "12341212345678901234560101020006ABCD",
+ name = "鎻掑骇",
+ 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" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ });
+
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });;
+
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B060006ABCD",
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });
+ //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 = "1234121234567890123456100B070006ABCD",
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B020006ABCD",
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B050006ABCD",
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });
+ instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
+ {
+ sid = "1234121234567890123456100B030006ABCD",
+ 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 = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ });
+
+
+
+
+
+
+
+
+
instance.SaveResidenceData();
}
@@ -244,7 +481,6 @@
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
- instance.residenceName = "濡効鐨勫";
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
InitRoomFunction();
@@ -252,6 +488,13 @@
}
return instance;
}
+ }
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
}
/// <summary>
@@ -263,22 +506,28 @@
/// </summary>
bool hasChange = false;
/// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC = "4E47323347591243";
+ /// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- if (hasChange)
+ //if (hasChange)
+ // return;
+ //hasChange = true;
+ //new System.Threading.Thread(() =>
+ //{
+ // System.Threading.Thread.Sleep(5000);
+ if (this == null|| this.residecenInfo==null)
return;
- hasChange = true;
- new System.Threading.Thread(() =>
- {
- System.Threading.Thread.Sleep(5000);
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
- MainPage.Log("Save DB_ResidenceData");
- hasChange = false;
- })
- { IsBackground = true }.Start();
+ var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ MainPage.Log("Save DB_ResidenceData");
+ // hasChange = false;
+ //})
+ //{ IsBackground = true }.Start();
}
/// <summary>
@@ -298,14 +547,14 @@
switch (function.functionCategory)
{
case FunctionCategory.Light:
- Control.Send(CommandType_A.read, function);
- break;
+ case FunctionCategory.Electrical:
+ case FunctionCategory.SwitchDevice:
case FunctionCategory.Curtain:
+ case FunctionCategory.Thermostat:
Control.Send(CommandType_A.read, function);
break;
- case FunctionCategory.AC:
- Control.Send(CommandType_A.read, function);
- break;
+
+
}
}
else
@@ -336,6 +585,7 @@
//鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
foreach (var r in instance.rooms)
{
+ r.functions.Clear();
foreach (var func in instance.functionList.functions)
{
MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
--
Gitblit v1.8.0