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 | 270 +++++++++++++++++++++++++++--------------------------
1 files changed, 137 insertions(+), 133 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index c04d3d1..924313e 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -29,6 +29,10 @@
public List<Room> rooms = new List<Room>();
/// <summary>
+ /// 鍔熻兘绫诲瀷鍒楄〃
+ /// </summary>
+ public List<string> functionTypeList = new List<string>();
+ /// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
public FunctionList functionList = new FunctionList();
@@ -45,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);
}
@@ -57,9 +61,21 @@
{
instance = temp;
}
- new System.Threading.Thread(() =>
+ if (instance.functionTypeList.Count == 0)
{
+ 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)
{
@@ -80,9 +96,6 @@
};
DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
- }
- if (DB_ResidenceData.residenceData.functionList.scenes.Count == 2)
- {
var s3 = new Scene()
{
name = "鐢靛奖鍦烘櫙2",
@@ -92,141 +105,132 @@
};
DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
}
-#endif
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ if (instance.rooms.Count == 0)
{
- foreach (var func in instance.functionList.functions)
+ //--------------------
+ 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()
{
- if (func.roomIdList.Contains(r.sid))
+ sid = "12341212345678901234560600000001",
+ name = "绌鸿皟",
+ trait = "on_off,mode,fan,temperature",
+ roomIdList = new List<string>() { "0001" },
+ lastState = "鍒跺喎 涓 18掳C",
+ bus_Data = new BusData
{
- r.functionData.Add(func);
- }
- }
+ 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();
}
- })
- { IsBackground = true }.Start();
+
+#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.functionList.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.functionList.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.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 = "switch",
- 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 = 214,
- DeviceID = 8,
- LoopID = 1,
- },
- });
- instance.SaveResidenceData();
- }
-#endif
}
return instance;
}
@@ -269,7 +273,7 @@
{
if (function.functionCategory == FunctionType.Light)
{
- Control.Send("read", function, 3);
+ Control.Send("read", function);
}
}
else
@@ -284,7 +288,7 @@
/// <summary>
/// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
/// </summary>
- public void InitRoomFunction()
+ public static void InitRoomFunction()
{
new System.Threading.Thread(() =>
{
--
Gitblit v1.8.0