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 | 306 +++++++++++++++++++++++---------------------------
1 files changed, 143 insertions(+), 163 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7142a14..7b0c7cb 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -9,14 +9,42 @@
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<Floor> floors = new List<Floor>();
+
/// <summary>
/// 鎴块棿鍒楄〃
/// </summary>
@@ -24,11 +52,16 @@
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- public List<Function> functions = new List<Function>();
+ public FunctionList functionList = new FunctionList();
/// <summary>
- /// 鍦烘櫙鍒楄〃
+ /// 鍔熻兘oid鍒楄〃
/// </summary>
- public List<Scene> scenes = new List<Scene>();
+ 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
@@ -42,7 +75,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);
}
@@ -54,182 +87,129 @@
{
instance = temp;
}
- }
- 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 = ""
- });
+ if (instance.functionTypeList.Count == 0)
+ {
+ 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
+ });
+ }
- instance.rooms.Add(r);
-#endif
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ }
+ instance.residenceImage = "Classification/Room/Roombg.png";
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ InitRoomFunction();
+
}
return instance;
}
}
-
- public void SaveResidenceData()
+ /// <summary>
+ /// 閫�鍑鸿处鍙锋竻绌烘暟鎹�
+ /// </summary>
+ public void EixtAccount()
{
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ instance = null;
}
-
-
- //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 string residenceImage;
+ /// <summary>
+ /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
+ /// </summary>
+ bool hasChange = false;
+ /// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC = "4E47323347591243";
+ /// <summary>
+ /// 淇濆瓨浣忓畢鏁版嵁
+ /// </summary>
+ public void SaveResidenceData()
+ {
+ if (this == null|| this.residecenInfo==null)
+ return;
+ var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ MainPage.Log("Save DB_ResidenceData");
+ }
/// <summary>
/// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
/// </summary>
public void RefreshResidenceFunctionStatus()
{
- foreach (var function in functions)
+ new System.Threading.Thread(() =>
{
- if (!string.IsNullOrEmpty(function.bus_Data))
+ try
{
- if(function.funcType == FunctionType.Light)
+ foreach (var function in functionList.functions)
{
- Control.Send("read", function, 3);
+ System.Threading.Thread.Sleep(100);
+ //if (function.bus_Data != null)
+ {
+ 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();
}
+ /// <summary>
+ /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// </summary>
+ public static void InitRoomFunction()
+ {
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
+ instance.functionList.GetAllFunction();
+ //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+ foreach (var r in instance.rooms)
+ {
+ r.functions.Clear();
+ foreach (var func in instance.functionList.functions)
+ {
+ 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