From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/Entity/DB_ResidenceData.cs | 393 -------------------------------------------------------
1 files changed, 4 insertions(+), 389 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 66cebb0..7b0c7cb 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -40,7 +40,6 @@
/// </summary>
public string CurReginID = "";
-
/// <summary>
/// 妤煎眰鍒楄〃
/// </summary>
@@ -54,6 +53,10 @@
/// 鍔熻兘鍒楄〃
/// </summary>
public FunctionList functionList = new FunctionList();
+ /// <summary>
+ /// 鍔熻兘oid鍒楄〃
+ /// </summary>
+ public List<FunctionOid> functionOidList = new List<FunctionOid>();
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
@@ -97,385 +100,6 @@
});
}
-#if DEBUG
- if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
- {
- var s0 = new Scene()
- {
- sid = "030101123456780A0A010001ABCD",
- name = "鍏ㄥ叧鍦烘櫙",
- sceneType = SceneType.OrdinaryScenes,
- roomIdList = new List<string>() { "0001" },
- bus_SceneData = new Dictionary<string, byte[]>(),
- };
- 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 = "030101123456780A0A00010002ABCD",
- name = "鍏ㄥ紑鍦烘櫙",
- sceneType = SceneType.OrdinaryScenes,
- roomIdList = new List<string>() { "0001" },
- bus_SceneData = new Dictionary<string, byte[]>(),
- };
- 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 = "030101123456780A0A010004ABCD",
- name = "鐢靛奖鍦烘櫙",
- sceneType = SceneType.MovieScene,
- roomIdList = new List<string>() { "0001" },
- };
- DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
- var s3 = new Scene()
- {
- sid = "030101123456780A0A010005ABCD",
- name = "鐢靛奖鍦烘櫙2",
- sceneType = SceneType.MovieScene,
- roomIdList = new List<string>() { "0001" },
- };
- DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
- }
- if (instance.rooms.Count == 0)
- {
- //--------------------
- 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 = "030101123456780604010001ABCD",
- name = "绌鸿皟",
- 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
- {
- SubnetID = 42,
- DeviceID = 8,
- LoopID = 1,
- },
- });
- instance.functionList.lights.Add(new Light()
- {
- sid = "030101123456780202010002ABCD",
- name = "璋冨厜鐏�",
- 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 = 42,
- DeviceID = 9,
- LoopID = 1,
- },
-
- });
- instance.functionList.curtains.Add(new Curtain()
- {
- sid = "030101123456780303010003ABCD",
- name = "绐楀笜妯″潡",
- roomIdList = new List<string>() { "0001" },
- 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
- {
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 1,
- },
- });
- instance.functionList.curtains.Add(new Curtain()
- {
- sid = "030101123456780303030011ABCD",
- name = "寮�鍚堝笜",
- roomIdList = new List<string>() { "0001" },
- 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
- {
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 11,
- },
- });
- instance.functionList.curtains.Add(new Curtain()
- {
- sid = "030101123456780503040012ABCD",
- name = "鍗峰笜",
- roomIdList = new List<string>() { "0001" },
- 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 = 17,
- LoopID = 1,
- },
- });
- instance.functionList.floorHeatings.Add(new FloorHeating()
- {
- sid = "030101123456780404020004ABCD",
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- 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 = "030101123456780202020005ABCD",
- 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
- {
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
- },
- });
- instance.functionList.lights.Add(new Light()
- {
- sid = "030101123456780202040006ABCD",
- name = "RGB鐏�",
- 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
- {
- SubnetID = 42,
- DeviceID = 4,
- LoopID = 1,
- },
- });
-
-
- instance.functionList.fans.Add(new Fan()
- {
- sid = "030101123456781010020006ABCD",
- 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 = "030101123456781010030006ABCD",
- 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 = "030101123456780101020006ABCD",
- 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 = "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 = "03010112345678100B060006ABCD",
- 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 = "03010112345678100B030006ABCD",
- // 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 = "03010112345678100B040006ABCD",
- // 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 = "03010112345678100B070006ABCD",
- 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 = "03010112345678100B020006ABCD",
- 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 = "03010112345678100B050006ABCD",
- 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 = "03010112345678100B030006ABCD",
- 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();
- }
-
-#endif
- //})
- //{ IsBackground = true }.Start();
-
}
catch (Exception ex)
{
@@ -514,20 +138,11 @@
/// </summary>
public void SaveResidenceData()
{
- //if (hasChange)
- // return;
- //hasChange = true;
- //new System.Threading.Thread(() =>
- //{
- // System.Threading.Thread.Sleep(5000);
if (this == null|| this.residecenInfo==null)
return;
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>
--
Gitblit v1.8.0