From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313
---
HDL_ON/Entity/DB_ResidenceData.cs | 118 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 31c3fb4..c04d3d1 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -31,13 +31,7 @@
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- //[Newtonsoft.Json.JsonIgnore]
- public FunctionList functions = new FunctionList();
-
- /// <summary>
- /// 鍦烘櫙鍒楄〃
- /// </summary>
- public List<Scene> scenes = new List<Scene>();
+ public FunctionList functionList = new FunctionList();
static DB_ResidenceData instance;
public static DB_ResidenceData residenceData
@@ -65,16 +59,50 @@
}
new System.Threading.Thread(() =>
{
+
+#if DEBUG
+ if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
+ {
+ var s1 = new Scene()
+ {
+ name = "鍦烘櫙",
+ scene_id = "0001",
+ sceneType = SceneType.OrdinaryScenes,
+ roomIdList = new List<string>() { "0001" },
+ };
+ DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
+ var s2 = new Scene()
+ {
+ name = "鐢靛奖鍦烘櫙",
+ scene_id = "0002",
+ sceneType = SceneType.MovieScene,
+ roomIdList = new List<string>() { "0001" },
+ };
+ DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
+
+ }
+ if (DB_ResidenceData.residenceData.functionList.scenes.Count == 2)
+ {
+ var s3 = new Scene()
+ {
+ name = "鐢靛奖鍦烘櫙2",
+ scene_id = "0003",
+ sceneType = SceneType.MovieScene,
+ roomIdList = new List<string>() { "0001" },
+ };
+ DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
+ }
+#endif
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functions.GetAllFunction();
+ instance.functionList.GetAllFunction();
//鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
foreach (var r in instance.rooms)
{
- foreach (var func in instance.functions.functions)
+ foreach (var func in instance.functionList.functions)
{
if (func.roomIdList.Contains(r.sid))
{
- r.functions.Add(func);
+ r.functionData.Add(func);
}
}
}
@@ -92,7 +120,7 @@
//--------------------
var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 1, backgroundImage = "Classification/Room/Roombg.png" };
instance.rooms.Add(r111);
- instance.functions.aCs.Add(new AC()
+ instance.functionList.aCs.Add(new AC()
{
sid = "12341212345678901234560600000001",
name = "绌鸿皟",
@@ -106,7 +134,7 @@
LoopID = 1,
},
});
- instance.functions.lights.Add(new Light()
+ instance.functionList.lights.Add(new Light()
{
sid = "12341212345678901234560400000002",
name = "瀹㈠巺鐏�",
@@ -121,12 +149,13 @@
},
});
- instance.functions.curtains.Add(new Curtain()
+ instance.functionList.curtains.Add(new Curtain()
{
sid = "12341212345678901234560500000003",
- name = "绐楀笜",
+ name = "绐楀笜妯″潡",
roomIdList = new List<string>() { "0001" },
- lastState = "20%",
+ trait = "curtain",
+ lastState = "寮�",
bus_Data = new BusData
{
SubnetID = 42,
@@ -134,14 +163,42 @@
LoopID = 1,
},
});
- instance.functions.floorHeatings.Add(new FloorHeating()
+ instance.functionList.curtains.Add(new Curtain()
+ {
+ sid = "12341212345678901234560500000011",
+ name = "寮�鍚堝笜",
+ roomIdList = new List<string>() { "0001" },
+ trait = "curtaintype",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 11,
+ },
+ });
+ instance.functionList.curtains.Add(new Curtain()
+ {
+ sid = "12341212345678901234560500000012",
+ name = "鍗峰笜",
+ roomIdList = new List<string>() { "0001" },
+ trait = "rollingshutter",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 12,
+ },
+ });
+ instance.functionList.floorHeatings.Add(new FloorHeating()
{
sid = "12341212345678901234560700000004",
name = "鍦扮儹",
roomIdList = new List<string>() { "0001" },
lastState = ""
});
- instance.functions.lights.Add(new Light()
+ instance.functionList.lights.Add(new Light()
{
sid = "12341212345678901234560400000005",
name = "瀹㈠巺澶х伅",
@@ -154,7 +211,7 @@
LoopID = 1,
},
});
- instance.functions.lights.Add(new Light()
+ instance.functionList.lights.Add(new Light()
{
sid = "12341212345678901234560400000006",
name = "瀹㈠巺RGB鐏�",
@@ -167,9 +224,7 @@
LoopID = 1,
},
});
-
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.InitRoomFunction();
+ instance.SaveResidenceData();
}
#endif
}
@@ -186,18 +241,16 @@
/// </summary>
public void SaveResidenceData()
{
+ if (hasChange)
+ return;
hasChange = true;
new System.Threading.Thread(() =>
{
- while (hasChange)
- {
- hasChange = false;
- System.Threading.Thread.Sleep(5000);
- }
-
+ 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();
}
@@ -209,10 +262,10 @@
{
new System.Threading.Thread(() =>
{
- foreach (var function in functions.functions)
+ foreach (var function in functionList.functions)
{
System.Threading.Thread.Sleep(100);
- if (function.bus_Data!= null)
+ if (function.bus_Data != null)
{
if (function.functionCategory == FunctionType.Light)
{
@@ -236,21 +289,20 @@
new System.Threading.Thread(() =>
{
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functions.GetAllFunction();
+ instance.functionList.GetAllFunction();
//鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
foreach (var r in instance.rooms)
{
- foreach (var func in instance.functions.functions)
+ foreach (var func in instance.functionList.functions)
{
if (func.roomIdList.Contains(r.sid))
{
- r.functions.Add(func);
+ r.functionData.Add(func);
}
}
}
})
{ IsBackground = true }.Start();
-
}
}
}
--
Gitblit v1.8.0