From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/Entity/DB_ResidenceData.cs | 832 ++++++++++++++++++----------------------------------------
1 files changed, 262 insertions(+), 570 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
old mode 100644
new mode 100755
index cf1fb2c..16fb651
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,9 +1,13 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
+using System.IO;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
+ [System.Serializable]
public class DB_ResidenceData
{
public DB_ResidenceData()
@@ -11,43 +15,53 @@
}
/// <summary>
- /// 0:A鍗忚缃戝叧
- /// 1:bus缃戝叧
- /// 2:knx缃戝叧
+ /// 涓讳汉token
/// </summary>
- public int GatewayType = 0;
+ public string MasterToken;
+
+ //RegionInfoRes _residecenInfo;
+ RegionInfoRes _residecenInfo = new RegionInfoRes();
/// <summary>
/// 浣忓畢鍩虹淇℃伅
/// </summary>
- public RegionInfoRes residecenInfo
+ public RegionInfoRes CurrentRegion
{
get
{
- if (MainPage.LocalMode)
+ if (MainPage.NoLoginMode)
{
return new RegionInfoRes() { Name = "鏈湴妯″紡" };
}
else
{
- return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+ if (_residecenInfo == null)
+ {
+ if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+ {
+ _residecenInfo = UserInfo.Current.regionList[0];
+ }
+ else
+ {
+ _residecenInfo = new RegionInfoRes();
+ HDLCommon.Current.Logout();
+ }
+ }
+ return _residecenInfo;
}
}
+ set
+ {
+ _residecenInfo = value;
+ }
}
- /// <summary>
- /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
- /// </summary>
- public string CurReginID = "";
- /// <summary>
- /// 妤煎眰鍒楄〃
- /// </summary>
- public List<Floor> floors = new List<Floor>();
+
/// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
static DB_ResidenceData instance;
- public static DB_ResidenceData residenceData
+ public static DB_ResidenceData Instance
{
get
{
@@ -55,11 +69,11 @@
{
try
{
- var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
- var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+ var residenceDataBytes = ReadResidenceInfo();
+ var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
- if (!string.IsNullOrEmpty(userConfigString))
+ if (!string.IsNullOrEmpty(userConfigString))
{
temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
}
@@ -75,340 +89,25 @@
{
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
+ ShowFunction.FloorHeating,ShowFunction.Music,
+ ShowFunction.Electric,ShowFunction.Environmental,
+ //ShowFunction.EnergyMonitoring,
+ //ShowFunction.FreshAir,ShowFunction.DoorLock,
+ //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ //ShowFunction.Sensor,ShowFunction.VideoIntercom
});
- }
-
-
-
-
- #if DEBUG
- //if (DB_ResidenceData.functionList.scenes.Count == 0)
- //{
- // var s0 = new Scene()
- // {
- // sid = "030101123456780A0A010001ABCD",
- // name = "鍏ㄥ叧鍦烘櫙",
- // sceneType = SceneType.OrdinaryScenes,
- // roomIdList = new List<string>() { "0001" },
- // bus_SceneData = new Dictionary<string, byte[]>(),
- // };
- // s0.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 0, 0, 0 });
- // s0.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 0, 0, 0 });
- // s0.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- // s0.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
- // s0.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 2 });
- // DB_ResidenceData.functionList.scenes.Add(s0);
- // var s1 = new Scene()
- // {
- // sid = "030101123456780A0A00010002ABCD",
- // name = "鍏ㄥ紑鍦烘櫙",
- // sceneType = SceneType.OrdinaryScenes,
- // roomIdList = new List<string>() { "0001" },
- // bus_SceneData = new Dictionary<string, byte[]>(),
- // };
- // s1.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 100, 0, 0 });
- // s1.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 100, 0, 0 });
- // s1.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
- // s1.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
- // s1.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 1 });
- // DB_ResidenceData.functionList.scenes.Add(s1);
- // var s2 = new Scene()
- // {
- // sid = "030101123456780A0A010004ABCD",
- // name = "鐢靛奖鍦烘櫙",
- // sceneType = SceneType.MovieScene,
- // roomIdList = new List<string>() { "0001" },
- // };
- // DB_ResidenceData.functionList.scenes.Add(s2);
- // var s3 = new Scene()
- // {
- // sid = "030101123456780A0A010005ABCD",
- // name = "鐢靛奖鍦烘櫙2",
- // sceneType = SceneType.MovieScene,
- // roomIdList = new List<string>() { "0001" },
- // };
- // DB_ResidenceData.functionList.scenes.Add(s3);
- //}
-
- if (rooms.Count == 0)
- {
- //--------------------
- var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
- rooms.Add(r111);
- instance.floors.Add(new Floor() { sid = "000022222", name = "1 F" });
- 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"} },
- },//"brightness,color",
- 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
}
catch (Exception ex)
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ instance = new DB_ResidenceData { };
+ return instance;
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
}
return instance;
@@ -420,6 +119,111 @@
public void EixtAccount()
{
instance = null;
+ ins_OidList = null;
+ HomeGateway = null;
+ SpatialInfo.CurrentSpatial.Clear();
+ FunctionList.List.Clear();
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ 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>
+ public bool GlobalCurtainStatus = false;
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// gatewayId 鍒ょ┖
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIdIsNull()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ /// <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>
@@ -429,254 +233,145 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "4E47323347591243";
+ //public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
public void SaveResidenceData()
{
- if (this == null|| this.residecenInfo==null)
+ if (this == null || this.CurrentRegion == null)
return;
- var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
- MainPage.Log("Save DB_ResidenceData");
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ WirteResidenceInfo(ssd);
}
-
- #region 鎴块棿鏁版嵁鐩稿叧
/// <summary>
- /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
/// </summary>
- public static void InitRoomFunction()
+ public string CurFoor = Language.StringByID(StringId.All);
+
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public SpatialInfo CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All)};
+ /// <summary>
+ /// 鍒嗙被鐣岄潰鏄剧ず鐨勬ゼ灞�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public SpatialInfo ClassificationChooseFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) };
+
+ /// <summary>
+ /// 鏍圭洰褰�
+ /// </summary>
+ static string RootPath = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/";
+ /// <summary>
+ /// 璇诲彇ResidenceInfo鏂囦欢
+ /// </summary>
+ /// <returns></returns>
+ static byte[] ReadResidenceInfo()
{
- new System.Threading.Thread(() =>
+ MainPage.Log("get file Instance ");
+ var fileName = "DB_ResidenceData";
+ FileStream fs = null;
+ try
+ {
+ var temp = CreateUserFloder(OnAppConfig.Instance.LastLoginUserId);
+ if (File.Exists(Path.Combine(temp, fileName)))
+ {
+ fs = new FileStream(Path.Combine(temp, fileName), FileMode.Open, FileAccess.Read);
+ }
+ else if (File.Exists(fileName))
+ {
+ fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+ }
+ else
+ {
+ return new byte[0];
+ }
+ byte[] bytes = new byte[fs.Length];
+ fs.Read(bytes, 0, bytes.Length);
+ return bytes;
+ }
+ catch
+ {
+ return new byte[0];
+ }
+ finally
+ {
+ MainPage.Log("get file ");
+ try
+ {
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ }
+ catch
+ {
+
+ }
+ }
+
+ }
+ /// <summary>
+ /// 淇濆瓨ResidenceInfo
+ /// </summary>
+ /// <param name="bytes"></param>
+ /// <returns></returns>
+ static bool WirteResidenceInfo(byte[] bytes)
+ {
+ var fileName = "DB_ResidenceData";
+ FileStream fs = null;
+
+ try
+ {
+ var temp = CreateUserFloder(OnAppConfig.Instance.LastLoginUserId);
+ fs = new FileStream(Path.Combine(temp, fileName), FileMode.Create, FileAccess.Write);
+ fs.Write(bytes, 0, bytes.Length);
+ fs.Flush();
+ MainPage.Log("SaveFile:" + fileName);
+ return true;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("FileUtiles Code 113:" + ex.ToString());
+ return false;
+ }
+ finally
{
try
{
- //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
- foreach (var r in rooms)
+ if (fs != null)
{
- r.GetRoomFunctions(true);
+ fs.Close();
}
}
catch (Exception ex)
{
- MainPage.Log($"Init room function error : {ex.Message}");
+ MainPage.Log("FileUtils Code 121 :" + ex.ToString());
}
- })
- { 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 = CommonPage.MyEncodingUTF8.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)
+ static string CreateUserFloder(string userId)
{
- var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
- if (tRoom!=null)
+ var path = Path.Combine(RootPath, userId);
+ if (!Directory.Exists(path))
{
- FileUtils.DeleteFile(delRoom.roomSavePath);
- rooms.Remove(tRoom);
+ Directory.CreateDirectory(path);
}
+ return path + "/";
}
- #endregion
-
-
- #region 鍔熻兘鏁版嵁
- static FunctionList ins_Function;
- public static FunctionList functionList
- {
- get
- {
- if (ins_Function == 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 = CommonPage.MyEncodingUTF8.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 = CommonPage.MyEncodingUTF8.GetString(lightsDataBytes);
- ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
- break;
- case FunctionType.Curtain:
- case FunctionType.MotorCurtain:
- //鎭㈠绐楀笜鏁版嵁
- var curtainsDataBytes = FileUtils.ReadFile(filePath);
- var curtainsString = CommonPage.MyEncodingUTF8.GetString(curtainsDataBytes);
- ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
- break;
- case FunctionType.FloorHeating:
- //鎭㈠鍦扮儹鏁版嵁
- var fhDataBytes = FileUtils.ReadFile(filePath);
- var fhString = CommonPage.MyEncodingUTF8.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 = CommonPage.MyEncodingUTF8.GetString(sesDataBytes);
- ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
- break;
- case FunctionType.Socket:
- //鎭㈠鎻掑骇鏁版嵁
- var eleDataBytes = FileUtils.ReadFile(filePath);
- var eleString = CommonPage.MyEncodingUTF8.GetString(eleDataBytes);
- ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
- break;
- case FunctionType.TV:
- //鎭㈠鐢佃鏁版嵁
- var eleDataBytes1 = FileUtils.ReadFile(filePath);
- var eleString1 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes1);
- ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
- break;
- case FunctionType.Fan:
- //鎭㈠椋庢墖鏁版嵁
- var eleDataBytes2 = FileUtils.ReadFile(filePath);
- var eleString2 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes2);
- ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
- break;
- case FunctionType.Scene:
- //鎭㈠鍦烘櫙鏁版嵁
- var scenesDataBytes = FileUtils.ReadFile(filePath);
- var scenesString = CommonPage.MyEncodingUTF8.GetString(scenesDataBytes);
- ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
- break;
-
- }
- }
- }
- #endregion
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
- }
-
- }
- return ins_Function;
- }
- }
- /// <summary>
- /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夊姛鑳芥暟鎹�
- /// </summary>
- public static void DelAllFunctionData()
- {
- var filePathList = FileUtils.ReadFiles();
-
- List<Function> fs = new List<Function>();
-
- foreach (var filePath in filePathList)
- {
- if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 24)
- {
- FileUtils.DeleteFile(filePath);
- }
- }
- ins_Function = new FunctionList();
- }
-
- /// <summary>
- /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
- /// </summary>
- public void RefreshResidenceFunctionStatus()
- {
- new System.Threading.Thread(() =>
- {
- try
- {
- foreach (var function in functionList.GetAllDeviceFunctionList())
- {
- 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;
- }
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
- }
- })
- { IsBackground = true }.Start();
- }
-
-
- #endregion
#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+ /// <summary>
+ /// oid鏁版嵁淇濆瓨鐨勬枃浠跺悕
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public static string OidSavePathName = "AProtocolData_FunctionOid";
static List<FunctionOid> ins_OidList;
public static List<FunctionOid> functionOidList
{
@@ -684,7 +379,7 @@
{
if (ins_OidList == null)
{
- var bytes = FileUtils.ReadFile("FunctionOidData_AProtocol");
+ var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName);
if (bytes == null || bytes.Length == 0)
{
ins_OidList = new List<FunctionOid>();
@@ -714,16 +409,13 @@
}
}
/// <summary>
- /// 淇濆瓨oid鍒楄〃锛屾瘡娆′繚瀛橀兘浼氳鐩�
+ /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
/// </summary>
- /// <param name="functionOids"></param>
- public static void SaveFunctionOidList(List<FunctionOid> functionOids)
+ public static void SaveOidList(string oidJsonString)
{
- ins_OidList = new List<FunctionOid>();
- ins_OidList = functionOids;
+ var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(ins_OidList));
- FileUtils.WriteFileByBytes("FunctionOidData_AProtocol",ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
#endregion
--
Gitblit v1.8.0