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 | 291 +++++++++++++++++++--------------------------------------
1 files changed, 97 insertions(+), 194 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 924313e..7b0c7cb 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -9,33 +9,59 @@
public DB_ResidenceData()
{
}
+
/// <summary>
- /// 浣忓畢鍚嶇О
+ /// 0:A鍗忚缃戝叧
+ /// 1:bus缃戝叧
+ /// 2:knx缃戝叧
/// </summary>
- public string residenceName;
+ public int GatewayType = 0;
+
/// <summary>
- /// 浣忓畢鍥剧墖
+ /// 浣忓畢鍩虹淇℃伅
/// </summary>
- public string residenceImage;
+ public RegionInfoRes residecenInfo
+ {
+ get
+ {
+ if (MainPage.LocalMode)
+ {
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ }
+ else
+ {
+ return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ /// </summary>
+ public string CurReginID = "";
/// <summary>
/// 妤煎眰鍒楄〃
/// </summary>
- public List<string> floors = new List<string>();
+ public List<Floor> floors = new List<Floor>();
/// <summary>
/// 鎴块棿鍒楄〃
/// </summary>
public List<Room> rooms = new List<Room>();
-
- /// <summary>
- /// 鍔熻兘绫诲瀷鍒楄〃
- /// </summary>
- public List<string> functionTypeList = new List<string>();
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
public FunctionList functionList = new FunctionList();
+ /// <summary>
+ /// 鍔熻兘oid鍒楄〃
+ /// </summary>
+ public List<FunctionOid> functionOidList = new List<FunctionOid>();
+
+ /// <summary>
+ /// 鍔熻兘绫诲瀷鍒楄〃
+ /// </summary>
+ public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
public static DB_ResidenceData residenceData
@@ -63,170 +89,22 @@
}
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"
+ instance.functionTypeList.AddRange(new List<ShowFunction> {
+ ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
+ ShowFunction.FloorHeating,ShowFunction.DoorLock,
+ ShowFunction.Electric,ShowFunction.EnergyMonitoring,
+ ShowFunction.Environmental,
+ ShowFunction.FreshAir,ShowFunction.Music,
+ ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Sensor,ShowFunction.VideoIntercom
});
}
-
- //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);
-
- var s3 = new Scene()
- {
- name = "鐢靛奖鍦烘櫙2",
- scene_id = "0003",
- 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", 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 (Exception ex)
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
- instance.residenceName = "濡効鐨勫";
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
InitRoomFunction();
@@ -235,28 +113,36 @@
return instance;
}
}
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
+ {
+ instance = null;
+ }
+ /// <summary>
+ /// 浣忓畢鍥剧墖
+ /// </summary>
+ public string residenceImage;
/// <summary>
/// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
/// </summary>
bool hasChange = false;
/// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC = "4E47323347591243";
+ /// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- if (hasChange)
+ if (this == null|| this.residecenInfo==null)
return;
- hasChange = true;
- new System.Threading.Thread(() =>
- {
- 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();
+ var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ MainPage.Log("Save DB_ResidenceData");
}
/// <summary>
@@ -266,20 +152,29 @@
{
new System.Threading.Thread(() =>
{
- foreach (var function in functionList.functions)
+ try
{
- System.Threading.Thread.Sleep(100);
- if (function.bus_Data != null)
+ foreach (var function in functionList.functions)
{
- if (function.functionCategory == FunctionType.Light)
+ System.Threading.Thread.Sleep(100);
+ //if (function.bus_Data != null)
{
- Control.Send("read", function);
+ switch (function.functionCategory)
+ {
+ case FunctionCategory.Light:
+ case FunctionCategory.Electrical:
+ case FunctionCategory.SwitchDevice:
+ case FunctionCategory.Curtain:
+ case FunctionCategory.Thermostat:
+ Control.SendReadCommand(function);
+ break;
+ }
}
}
- else
- {
-
- }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
}
})
{ IsBackground = true }.Start();
@@ -292,21 +187,29 @@
{
new System.Threading.Thread(() =>
{
- //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- instance.functionList.GetAllFunction();
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in instance.rooms)
+ try
{
- foreach (var func in instance.functionList.functions)
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ instance.functionList.GetAllFunction();
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in instance.rooms)
{
- if (func.roomIdList.Contains(r.sid))
+ r.functions.Clear();
+ foreach (var func in instance.functionList.functions)
{
- r.functionData.Add(func);
+ MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
+ if (func.roomIdList.Contains(r.sid))
+ {
+ r.functions.Add(func);
+ }
}
}
+ }catch(Exception ex)
+ {
+ MainPage.Log($"Init room function error : {ex.Message}");
}
})
{ IsBackground = true }.Start();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0