From 37c33341f75841dc39c535eb62a3603f596516a1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 二月 2020 17:11:53 +0800
Subject: [PATCH] 20200227
---
HDL_ON/Entity/DB_ResidenceData.cs | 317 +++++++++++++++++++++++++++-------------------------
1 files changed, 166 insertions(+), 151 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7142a14..d7ba290 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -21,10 +21,13 @@
/// 鎴块棿鍒楄〃
/// </summary>
public List<Room> rooms = new List<Room>();
+
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- public List<Function> functions = new List<Function>();
+ //[Newtonsoft.Json.JsonIgnore]
+ public FunctionList functions = new FunctionList();
+
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
@@ -54,182 +57,194 @@
{
instance = temp;
}
+ new System.Threading.Thread(() =>
+ {
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ instance.functions.GetAllFunction();
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in instance.rooms)
+ {
+ foreach (var func in instance.functions.functions)
+ {
+ if (func.roomIdList.Contains(r.sid))
+ {
+ r.functions.Add(func);
+ }
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+
}
catch { }
-#if DEBUG
instance.residenceName = "濡効鐨勫";
instance.residenceImage = "Classification/Room/Roombg.png";
- var r = new Room() { sid = "0001", name = "Room-1", floor = "1F", backgroundImage = "Classification/Room/Roombg.png" };
- /*
- r.functions.Add(new Function()
- {
- sid = "000000000000000000000000000000000001",
- funcType = FunctionType.AC,
- name = "绌鸿皟",
- roomIdList = new List<string>() { "0001" },
- lastState = "鍒跺喎 涓 18掳C",
- bus_Data = "{" +
- "\"SubnetID\":42" + "," +
- "\"DeviceID\":8" + "," +
- "\"LoopID\":1" +
- "}",
- });
- r.functions.Add(new Dimmer()
- {
- sid = "0001002019101209000025670400010002",
- funcType = FunctionType.Light,
- name = "瀹㈠巺鐏�",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = "{" +
- "\"SubnetID\":111" + "," +
- "\"DeviceID\":2" + "," +
- "\"LoopID\":1" +
- "}",
- });
- r.functions.Add(new Light()
- {
- sid = "000000000000000000000000000000000003",
- funcType = FunctionType.Curtain,
- name = "绐楀笜",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = "{" +
- "\"SubnetID\":42" + "," +
- "\"DeviceID\":7" + "," +
- "\"LoopID\":1" +
- "}",
- });
- r.functions.Add(new Function()
- {
- sid = "000000000000000000000000000000000004",
- funcType = FunctionType.FloorHeating,
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- lastState = ""
- });
- r.functions.Add(new Light()
- {
- sid = "0001002019101209000025670400010005",
- funcType = FunctionType.Light,
- name = "瀹㈠巺澶х伅",
- roomIdList = new List<string>() { "0001" },
- bus_Data = "{" +
- "\"SubnetID\":111" + "," +
- "\"DeviceID\":6" + "," +
- "\"LoopID\":1" +
- "}",
- });
- */
- //--------------------
- instance.functions.Add(new Function()
- {
- sid = "000000000000000000000000000000000001",
- funcType = FunctionType.AC,
- name = "绌鸿皟",
- roomIdList = new List<string>() { "0001" },
- collection = true,
- lastState = "鍒跺喎 涓 18掳C",
- bus_Data = "{" +
- "\"SubnetID\":42" + "," +
- "\"DeviceID\":8" + "," +
- "\"LoopID\":1" +
- "}",
- });
- instance.functions.Add(new Dimmer()
- {
- sid = "0001002019101209000025670400010002",
- funcType = FunctionType.Light,
- name = "瀹㈠巺鐏�",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = "{" +
- "\"SubnetID\":111" + "," +
- "\"DeviceID\":2" + "," +
- "\"LoopID\":1" +
- "}",
- });
- instance.functions.Add(new Light()
- {
- sid = "0001002019101209000025670400010005",
- funcType = FunctionType.Light,
- name = "瀹㈠巺澶х伅",
- roomIdList = new List<string>() { "0001" },
- collection = true,
- bus_Data = "{" +
- "\"SubnetID\":111" + "," +
- "\"DeviceID\":6" + "," +
- "\"LoopID\":1" +
- "}",
- });
- instance.functions.Add(new Function()
- {
- sid = "000000000000000000000000000000000003",
- funcType = FunctionType.Curtain,
- name = "绐楀笜",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%"
- });
- instance.functions.Add(new Function()
- {
- sid = "000000000000000000000000000000000004",
- funcType = FunctionType.FloorHeating,
- collection = true,
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- lastState = ""
- });
- instance.rooms.Add(r);
+#if DEBUG
+ if (instance.rooms.Count == 0)
+ {
+ //--------------------
+ var r111 = new Room() { sid = "0001", name = "Room-1", floor = "1F", 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;
}
}
+ /// <summary>
+ /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
+ /// </summary>
+ bool hasChange = false;
+ /// <summary>
+ /// 淇濆瓨浣忓畢鏁版嵁
+ /// </summary>
public void SaveResidenceData()
{
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ hasChange = true;
+ new System.Threading.Thread(() =>
+ {
+ while (hasChange)
+ {
+ hasChange = false;
+ 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");
+ })
+ { IsBackground = true }.Start();
}
-
-
-
- //public List<Function> busDeviceList = new List<Function>();
- //public void InitBusDeivces()
- //{
- // foreach(var room in rooms)
- // {
- // foreach(var function in room.functions)
- // {
- // if (!string.IsNullOrEmpty(function.bus_Data))
- // {
- // busDeviceList.Add(function);
- // }
- // }
- // }
- //}
/// <summary>
/// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
/// </summary>
public void RefreshResidenceFunctionStatus()
{
- foreach (var function in functions)
+ new System.Threading.Thread(() =>
{
- if (!string.IsNullOrEmpty(function.bus_Data))
+ foreach (var function in functions.functions)
{
- if(function.funcType == FunctionType.Light)
+ System.Threading.Thread.Sleep(100);
+ if (function.bus_Data!= null)
{
- Control.Send("read", function, 3);
+ if (function.functionCategory == FunctionType.Light)
+ {
+ Control.Send("read", function, 3);
+ }
+ }
+ else
+ {
+
}
}
- else
- {
-
- }
- }
+ })
+ { IsBackground = true }.Start();
}
+ /// <summary>
+ /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// </summary>
+ public void InitRoomFunction()
+ {
+ new System.Threading.Thread(() =>
+ {
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ instance.functions.GetAllFunction();
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in instance.rooms)
+ {
+ foreach (var func in instance.functions.functions)
+ {
+ if (func.roomIdList.Contains(r.sid))
+ {
+ r.functions.Add(func);
+ }
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+
+ }
}
}
--
Gitblit v1.8.0