From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319
---
HDL_ON/Entity/DB_ResidenceData.cs | 300 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 178 insertions(+), 122 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 31c3fb4..924313e 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -29,15 +29,13 @@
public List<Room> rooms = new List<Room>();
/// <summary>
+ /// 鍔熻兘绫诲瀷鍒楄〃
+ /// </summary>
+ public List<string> functionTypeList = new List<string>();
+ /// <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
@@ -51,7 +49,7 @@
var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
- if (userConfigString != null)
+ if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
}
@@ -63,115 +61,176 @@
{
instance = temp;
}
- new System.Threading.Thread(() =>
+ if (instance.functionTypeList.Count == 0)
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functions.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ instance.functionTypeList.AddRange(new List<string> {
+ "Light","AC","Curtain"
+ ,"FloorHeating","DoorLock"
+ ,"Electric","EnergyMonitoring",
+ "Environmental",
+ "FreshAir","Music",
+ "Panel","SecurityMonitoring",
+ "Sensor","VideoIntercom"
+ });
+ }
+
+ //new System.Threading.Thread(() =>
+ //{
+#if DEBUG
+ if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
{
- foreach (var func in instance.functions.functions)
+ var s1 = new Scene()
{
- if (func.roomIdList.Contains(r.sid))
- {
- r.functions.Add(func);
- }
- }
+ 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);
+
+ var s3 = new Scene()
+ {
+ name = "鐢靛奖鍦烘櫙2",
+ scene_id = "0003",
+ sceneType = SceneType.MovieScene,
+ roomIdList = new List<string>() { "0001" },
+ };
+ DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
}
- })
- { IsBackground = true }.Start();
+ if (instance.rooms.Count == 0)
+ {
+ //--------------------
+ var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 1, backgroundImage = "Classification/Room/Roombg.png" };
+ instance.rooms.Add(r111);
+ instance.functionList.aCs.Add(new AC()
+ {
+ sid = "12341212345678901234560600000001",
+ name = "绌鸿皟",
+ trait = "on_off,mode,fan,temperature",
+ roomIdList = new List<string>() { "0001" },
+ lastState = "鍒跺喎 涓 18掳C",
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 9,
+ LoopID = 1,
+ },
+ });
+ instance.functionList.lights.Add(new Light()
+ {
+ sid = "12341212345678901234560400000002",
+ name = "瀹㈠巺鐏�",
+ trait = "brightness",
+ roomIdList = new List<string>() { "0001" },
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 2,
+ LoopID = 1,
+ },
+
+ });
+ instance.functionList.curtains.Add(new Curtain()
+ {
+ sid = "12341212345678901234560500000003",
+ name = "绐楀笜妯″潡",
+ roomIdList = new List<string>() { "0001" },
+ trait = "curtain",
+ lastState = "寮�",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 1,
+ },
+ });
+ 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.functionList.lights.Add(new Light()
+ {
+ sid = "12341212345678901234560400000005",
+ name = "瀹㈠巺澶х伅",
+ trait = "on_off",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ });
+ instance.functionList.lights.Add(new Light()
+ {
+ sid = "12341212345678901234560400000006",
+ name = "瀹㈠巺RGB鐏�",
+ trait = "brightness,color",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 4,
+ LoopID = 1,
+ },
+ });
+ instance.SaveResidenceData();
+ }
+
+#endif
+ //})
+ //{ IsBackground = true }.Start();
}
- catch { }
+ catch (Exception ex)
+ {
+ MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
instance.residenceName = "濡効鐨勫";
instance.residenceImage = "Classification/Room/Roombg.png";
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ InitRoomFunction();
-#if DEBUG
- if (instance.rooms.Count == 0)
- {
- //--------------------
- 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()
- {
- sid = "12341212345678901234560600000001",
- name = "绌鸿皟",
- trait = "Switch,mode,fan,temperature",
- roomIdList = new List<string>() { "0001" },
- lastState = "鍒跺喎 涓 18掳C",
- bus_Data = new BusData
- {
- SubnetID = 4,
- DeviceID = 8,
- LoopID = 1,
- },
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000002",
- name = "瀹㈠巺鐏�",
- trait = "brightness",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = new BusData
- {
- SubnetID = 14,
- DeviceID = 8,
- LoopID = 1,
- },
-
- });
- instance.functions.curtains.Add(new Curtain()
- {
- sid = "12341212345678901234560500000003",
- name = "绐楀笜",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 1,
- },
- });
- instance.functions.floorHeatings.Add(new FloorHeating()
- {
- sid = "12341212345678901234560700000004",
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- lastState = ""
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000005",
- name = "瀹㈠巺澶х伅",
- trait = "switch",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 6,
- LoopID = 1,
- },
- });
- instance.functions.lights.Add(new Light()
- {
- sid = "12341212345678901234560400000006",
- name = "瀹㈠巺RGB鐏�",
- trait = "brightness,color",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 214,
- DeviceID = 8,
- LoopID = 1,
- },
- });
-
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.InitRoomFunction();
- }
-#endif
}
return instance;
}
@@ -186,18 +245,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,14 +266,14 @@
{
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)
{
- Control.Send("read", function, 3);
+ Control.Send("read", function);
}
}
else
@@ -231,26 +288,25 @@
/// <summary>
/// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
/// </summary>
- public void InitRoomFunction()
+ public static void InitRoomFunction()
{
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