From 6a4e41c3996f9f01ab0928e0397925242d3b63b4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 09 十二月 2020 15:34:18 +0800
Subject: [PATCH] 2020-12-0-1
---
HDL_ON/Entity/DB_ResidenceData.cs | 635 +++++++++++++--------------------------------------------
1 files changed, 145 insertions(+), 490 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 32c04e4..d9e454b 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,5 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
using Shared;
namespace HDL_ON.Entity
@@ -9,15 +11,11 @@
public DB_ResidenceData()
{
}
+
/// <summary>
/// 涓讳汉token
/// </summary>
public string MasterToken;
- /// <summary>
- /// 0:bus缃戝叧
- /// 1:A鍗忚缃戝叧
- /// </summary>
- public int GatewayType = 1;
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
@@ -31,7 +29,23 @@
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (curRegion == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(CurReginID);
+
+ return UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ return new RegionInfoRes();
+ }
+ }
+
//if (curRegion == null)
//{
// CurReginID = UserInfo.Current.regionList[0].RegionID;
@@ -41,14 +55,41 @@
}
}
}
+
+ ///// <summary>
+ ///// 鑾峰彇缃戝叧鍒楄〃
+ ///// </summary>
+ //void GetHomeGatewayList()
+ //{
+ // new Thread(() =>
+ // {
+ // //鍒囨崲浣忓畢鍚庯紝鏌ヨ涓�娆＄綉鍏冲垪琛�
+ // new HttpServerRequest().GetHomeGatewayList();
+ // })
+ // { IsBackground = true }.Start();
+
+ //}
+
+ //string curReginID;
+ ///// <summary>
+ ///// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ ///// </summary>
+ //public string CurReginID
+ //{
+ // set
+ // {
+ // curReginID = value;
+ // GetHomeGatewayList();
+ // }
+ // get
+ // {
+ // return curReginID;
+ // }
+ //}
/// <summary>
/// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
/// </summary>
public string CurReginID = "";
- /// <summary>
- /// 妤煎眰鍒楄〃
- /// </summary>
- public List<Floor> floors = new List<Floor>();
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
@@ -97,290 +138,20 @@
{
sid = "030101123456780202010005ABCD",
name = "鐏厜1",
- function = new List<FunctionAttributes>() {
+ attributes = new List<FunctionAttributes>() {
new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
- roomIdList = new List<string>() { "0001" },
+ roomIds = new List<string>() { "0001" },
bus_Data = new BusData
{
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
+ addresses = "2A06",
+ loopId = 1,
},
}.SaveFunctionData();
-
-
-#if DEBUG11
- if (rooms.Count == 0 )
- {
- //--------------------
- var r111 = new Room() { sid = "0001", name = "瀹㈠巺", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
- rooms.Add(r111);
- instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
- r111.SaveRoomData();
- new AC()
- {
- sid = "030101123456780604010001ABCD",
- name = "绌鸿皟",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
- new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
- new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
- },
- roomIdList = new List<string>() { "0001" },
- lastState = "鍒跺喎 涓 18掳C",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 8,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Light()
- {
- sid = "030101123456780202020002ABCD",
- name = "璋冨厜鐏�",
- function = new List<Trait>() {
- new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
- },//"brightness",
- roomIdList = new List<string>() { "0001" },
- lastState = "20%",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 9,
- LoopID = 1,
- },
-
- }.SaveFunctionData();
- new Curtain()
- {
- sid = "030101123456780303010003ABCD",
- name = "绐楀笜",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
- },// "curtain",
- lastState = "寮�",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Curtain()
- {
- sid = "030101123456780303030011ABCD",
- name = "寮�鍚堝笜",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
- },//"curtaintype",
- lastState = "20%",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 7,
- LoopID = 11,
- },
- }.SaveFunctionData();
- new Curtain()
- {
- sid = "030101123456780503040012ABCD",
- name = "鍗峰笜",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
- new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
-
- },// "rollingshutter",
- lastState = "20%",
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 17,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new FloorHeating()
- {
- sid = "030101123456780404020004ABCD",
- name = "鍦扮儹",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
- new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
- },//
- lastState = "鑷姩 25掳C",
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 12,
- LoopID = 1
- }
- }.SaveFunctionData();
- new Light()
- {
- sid = "030101123456780202010005ABCD",
- name = "鍚婄伅",
- function = new List<Trait>() {
- new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
- },//"on_off",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Light()
- {
- sid = "030101123456780202040006ABCD",
- name = "RGB鐏�",
- function = new List<Trait>() {
- new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
- },//"brightness,color",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 4,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Fan()
- {
- sid = "030101123456781010020006ABCD",
- name = "椋庢墖",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
- },//"brightness,color",
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 11,
- },
- }.SaveFunctionData();
- new TV()
- {
- sid = "030101123456781010020006ABCD",
- name = "鐢佃",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- },
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 142,
- DeviceID = 4,
- LoopID = 111,
- },
- }.SaveFunctionData();
- new SwitchSocket()
- {
- sid = "030101123456780101020006ABCD",
- name = "鎻掑骇",
- function = new List<Trait>() {
- new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
- },
- roomIdList = new List<string>() { "0001" },
- bus_Data = new BusData
- {
- SubnetID = 42,
- DeviceID = 6,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Sensor()
- {
- sid = "030101123456781005060006ABCD",
- name = "PM2.5",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Sensor()
- {
- sid = "030101123456781005070006ABCD",
- name = "CO2",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Sensor()
- {
- sid = "030101123456781005020006ABCD",
- name = "娓╁害",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Sensor()
- {
- sid = "030101123456781005050006ABCD",
- name = "TVOC",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- }.SaveFunctionData();
- new Sensor()
- {
- sid = "030101123456781005030006ABCD",
- name = "婀垮害",
- roomIdList = new List<string>() { "0001" },
- function = new List<Trait>() {
- new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
- },
- bus_Data = new BusData
- {
- SubnetID = 111,
- DeviceID = 15,
- LoopID = 1,
- },
- }.SaveFunctionData();
- instance.SaveResidenceData();
- }
-#endif
-
-
+
+
}
@@ -390,7 +161,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
}
return instance;
@@ -402,13 +173,87 @@
public void EixtAccount()
{
instance = null;
- ins_Room = null;
+ Rooms = null;
ins_OidList = null;
- ins_Function = null;
+ functionList = null;
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
+ }
+
+ /// <summary>
+ /// 缃戝叧璇︾粏淇℃伅
+ /// </summary>
+ public HomeGatewayInfo HomeGateway;
+
+ /// <summary>
+ /// 0:bus缃戝叧
+ /// 1:A鍗忚缃戝叧
+ /// </summary>
+ public int GatewayType
+ {
+ get
+ {
+ //#if DEBUG
+ //return 0;
+ //#endif
+ if (HomeGateway == null)
+ return -1;
+ if (HomeGateway.gatewayType == "AGATEWAY")
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIsBound()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.mac))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
+ /// </summary>
+ public string residenceGatewayMAC
+ {
+ get
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ return HomeGateway.mac.ToUpper();
+ }
+ else
+ {
+ return "";
+ }
+ }
+ set
+ {
+ if (CheckWhetherGatewayIsBound())
+ {
+ HomeGateway.mac = value;
+ }
+ else
+ {
+ HomeGateway = new HomeGatewayInfo() { mac = value };
+ }
+ }
+
}
/// <summary>
@@ -418,7 +263,7 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
+ //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
@@ -436,216 +281,26 @@
/// </summary>
public string CurFoor = Language.StringByID(StringId.All);
- #region 鎴块棿鏁版嵁鐩稿叧
/// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// 鎴块棿鍒楄〃
/// </summary>
- public static void InitRoomFunction()
- {
- new System.Threading.Thread(() =>
- {
- try
- {
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in rooms)
- {
- r.GetRoomFunctions(true);
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"Init room function error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
- }
-
- static List<Room> ins_Room;
- public static List<Room> rooms
- {
- get
- {
- if (ins_Room == null)
- {
- try
- {
- ins_Room = new List<Room> { };
- var filePathList = FileUtils.ReadFiles();
-
- foreach (var filePath in filePathList)
- {
- if (filePath.StartsWith("RoomData_"))
- {
- var roomDataBytes = FileUtils.ReadFile(filePath);
- var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
- var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
- if (room != null)
- {
- ins_Room.Add(room);
- }
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
- }
- }
- return ins_Room;
- }
- }
- /// <summary>
- /// 鍒犻櫎鎴块棿
- /// </summary>
- /// <param name="delRoom"></param>
- public static void DelRoom(Room delRoom)
- {
- var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
- if (tRoom != null)
- {
- FileUtils.DeleteFile(delRoom.roomSavePath);
- rooms.Remove(tRoom);
- }
- }
- #endregion
+ public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
#region 鍔熻兘鏁版嵁
- static FunctionList ins_Function;
+ static FunctionList _functionList;
public static FunctionList functionList
{
get
{
- if (ins_Function == null)
+ if (_functionList == null)
{
- try
- {
- ins_Function = new FunctionList { };
- #region 鎭㈠鏁版嵁
- var filePathList = FileUtils.ReadFiles();
-
- List<Function> fs = new List<Function>();
-
- foreach (var filePath in filePathList)
- {
- if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
- {
- //var filePath = fp.Remove(0, 13);
- var _functionTypeString = filePath.Substring(16 + 13, 4);
- var ft = (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
-
- switch (ft)
- {
- case FunctionType.AC:
- //鎭㈠绌鸿皟鏁版嵁
- var acDataBytes = FileUtils.ReadFile(filePath);
- var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
- ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
- break;
- case FunctionType.Relay:
- case FunctionType.Dimmer:
- case FunctionType.RGB:
- //鎭㈠鐏厜鏁版嵁
- var lightsDataBytes = FileUtils.ReadFile(filePath);
- var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);
- ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
- break;
- case FunctionType.Curtain:
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- //鎭㈠绐楀笜鏁版嵁
- var curtainsDataBytes = FileUtils.ReadFile(filePath);
- var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);
- ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
- break;
- case FunctionType.FloorHeating:
- //鎭㈠鍦扮儹鏁版嵁
- var fhDataBytes = FileUtils.ReadFile(filePath);
- var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
- ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
- break;
- case FunctionType.PM25:
- case FunctionType.CO2:
- case FunctionType.TVOC:
- case FunctionType.Temp:
- case FunctionType.Humidity:
- //鎭㈠鐜鏁版嵁
- var sesDataBytes = FileUtils.ReadFile(filePath);
- var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);
- ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
- break;
- case FunctionType.Socket:
- //鎭㈠鎻掑骇鏁版嵁
- var eleDataBytes = FileUtils.ReadFile(filePath);
- var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);
- ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
- break;
- case FunctionType.TV:
- //鎭㈠鐢佃鏁版嵁
- var eleDataBytes1 = FileUtils.ReadFile(filePath);
- var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);
- ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
- break;
- case FunctionType.Fan:
- //鎭㈠椋庢墖鏁版嵁
- var eleDataBytes2 = FileUtils.ReadFile(filePath);
- var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);
- ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
- break;
- case FunctionType.Scene:
- //鎭㈠鍦烘櫙鏁版嵁
- var scenesDataBytes = FileUtils.ReadFile(filePath);
- var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);
- ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
- break;
-
- }
- }
- }
- #endregion
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
- }
-
+ _functionList = FunctionList.List;
}
- return ins_Function;
+ return _functionList;
}
- }
- /// <summary>
- /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夊姛鑳芥暟鎹�
- /// </summary>
- public static void DelAllFunctionData()
- {
- var filePathList = FileUtils.ReadFiles();
- foreach (var filePath in filePathList)
+ set
{
- if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
- {
- FileUtils.DeleteFile(filePath);
- }
- }
- ins_Function = new FunctionList();
- ins_Function.aCs = new List<AC>();
- ins_Function.lights = new List<Light>();
- ins_Function.curtains = new List<Curtain>();
- ins_Function.floorHeatings = new List<FloorHeating>();
- ins_Function.sensorsEnvironmentalScience = new List<Sensor>();
- ins_Function.switchSockets = new List<SwitchSocket>();
- ins_Function.tVs = new List<TV>();
- ins_Function.fans = new List<Fan>();
- ins_Function.scenes = new List<Scene>();
- }
- /// <summary>
- /// 鍒犻櫎鍔熻兘
- /// </summary>
- public static void DelSceneFunction(string fSid)
- {
- var f = functionList.scenes.Find((obj) => obj.sid == fSid);
- if (f != null)
- {
- FileUtils.DeleteFile(f.savePath);
- functionList.scenes.Remove(f);
+ _functionList = value;
}
}
@@ -654,13 +309,13 @@
/// </summary>
public void RefreshResidenceFunctionStatus()
{
- new System.Threading.Thread(() =>
+ new Thread(() =>
{
try
{
foreach (var function in functionList.GetAllDeviceFunctionList())
{
- System.Threading.Thread.Sleep(100);
+ Thread.Sleep(100);
switch (function.functionCategory)
{
case FunctionCategory.Light:
--
Gitblit v1.8.0