From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/Entity/DB_ResidenceData.cs | 847 ++++++++++++++++++-------------------------------------- 1 files changed, 277 insertions(+), 570 deletions(-) diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs index 489d7d3..896cb34 100644 --- a/HDL_ON/Entity/DB_ResidenceData.cs +++ b/HDL_ON/Entity/DB_ResidenceData.cs @@ -1,69 +1,102 @@ -锘縰sing System; +using System; using System.Collections.Generic; +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() { } + /// <summary> /// 涓讳汉token /// </summary> public string MasterToken; - /// <summary> - /// 0:bus缃戝叧 - /// 1:A鍗忚缃戝叧 - /// </summary> - public int GatewayType = 1; + + //RegionInfoRes _residecenInfo; + RegionInfoRes _residecenInfo = new RegionInfoRes(); /// <summary> /// 浣忓畢鍩虹淇℃伅 /// </summary> - public RegionInfoRes residecenInfo + public RegionInfoRes CurrentRegion { get { if (MainPage.NoLoginMode) { - return new RegionInfoRes() { Name = "鏈湴妯″紡" }; + return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"}; } else { - var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID); - //if (curRegion == null) - //{ - // CurReginID = UserInfo.Current.regionList[0].RegionID; - // return UserInfo.Current.regionList[0]; - //} - return curRegion; + 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> + [Newtonsoft.Json.JsonIgnore] public List<ShowFunction> functionTypeList = new List<ShowFunction>(); static DB_ResidenceData instance; - public static DB_ResidenceData residenceData + public static DB_ResidenceData Instance { get { if (instance == null) { + if(MainPage.NoLoginMode) + { + instance = new DB_ResidenceData(); + instance.functionTypeList.AddRange(new List<ShowFunction> { + ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain, + ShowFunction.FloorHeating,ShowFunction.Music, + ShowFunction.Electric,ShowFunction.Environmental, + ShowFunction.EnergyMonitoring, + ShowFunction.FreshAir,ShowFunction.DoorLock, + ShowFunction.Panel,ShowFunction.SecurityMonitoring, + ShowFunction.Sensor,ShowFunction.VideoIntercom, + ShowFunction.SecurityCenter + }); + instance.SaveResidenceData(); + instance.residenceImage = "Classification/Room/Roombg.png"; + instance.HomeGateway = new HomeGatewayInfo() + { + homeId = "1396717478877241345", + gatewayId = "1396997079658602498", + mac = "123457890123456", + }; + //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹� + SpatialInfo.CurrentSpatial.InitRoomListFunctions(); + return instance; + } + try { - var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData"); + var residenceDataBytes = ReadResidenceInfo(); var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes); DB_ResidenceData temp = null; @@ -79,318 +112,27 @@ { instance = temp; } - if (instance.functionTypeList.Count == 0) - { - instance.functionTypeList.AddRange(new List<ShowFunction> { + 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.FloorHeating,ShowFunction.Music, + ShowFunction.Electric,ShowFunction.Environmental, + ShowFunction.EnergyMonitoring, + ShowFunction.FreshAir,ShowFunction.DoorLock, ShowFunction.Panel,ShowFunction.SecurityMonitoring, - ShowFunction.Sensor,ShowFunction.VideoIntercom + ShowFunction.Sensor,ShowFunction.VideoIntercom, + ShowFunction.SecurityCenter }); - instance.SaveResidenceData(); - } - - new Light() - { - sid = "030101123456780202010005ABCD", - name = "鐏厜1", - function = new List<Trait>() { - new Trait { name="on_off", max=100,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(); - - - - -#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 - - - - + instance.SaveResidenceData(); } catch (Exception ex) { MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}"); + instance = new DB_ResidenceData { }; + return instance; } instance.residenceImage = "Classification/Room/Roombg.png"; //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹� - InitRoomFunction(); + SpatialInfo.CurrentSpatial.InitRoomListFunctions(); } return instance; @@ -402,13 +144,112 @@ public void EixtAccount() { instance = null; - ins_Room = null; ins_OidList = null; - ins_Function = null; - if (MainPage.IsRemote) + HomeGateway = null; + //閲嶇疆缃戝叧鐘舵�� + DriverLayer.Control.Ins.GatewayOnline_Cloud = false; + DriverLayer.Control.Ins.GatewayOnline_Local = false; + SpatialInfo.CurrentSpatial.Clear(); + FunctionList.List.Clear(); + + ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛� + HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear(); + DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�"); + } + + /// <summary> + /// 缃戝叧璇︾粏淇℃伅 + /// </summary> + public HomeGatewayInfo HomeGateway; + + /// <summary> + /// 0:bus缃戝叧 + /// 1:A鍗忚缃戝叧 + /// </summary> + public int GatewayType + { + get { - DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�"); + //#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> @@ -418,276 +259,143 @@ /// <summary> /// 褰撳墠浣忓畢鐨勭綉鍏矼AC /// </summary> - public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E"; + //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 = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)); - FileUtils.WriteFileByBytes("DB_ResidenceData", ssd); - MainPage.Log("Save DB_ResidenceData"); + WirteResidenceInfo(ssd); } - /// <summary> /// 褰撳墠閫夋嫨鐨勬ゼ灞� /// </summary> public string CurFoor = Language.StringByID(StringId.All); - #region 鎴块棿鏁版嵁鐩稿叧 /// <summary> - /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁 + /// 褰撳墠閫夋嫨鐨勬ゼ灞� /// </summary> - public static void InitRoomFunction() + [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(() => + 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 { try { - //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹� - foreach (var r in rooms) + if (fs != null) { - r.GetRoomFunctions(true); + 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 + { + if (fs != null) + { + 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 = 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) + 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); } - } - #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 = 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}"); - } - - } - return ins_Function; - } - } - /// <summary> - /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夊姛鑳芥暟鎹� - /// </summary> - public static void DelAllFunctionData() - { - var filePathList = FileUtils.ReadFiles(); - foreach (var filePath in filePathList) - { - 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); - } + return path + "/"; } - /// <summary> - /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬� - /// </summary> - public void RefreshResidenceFunctionStatus() - { - new System.Threading.Thread(() => - { - try - { - foreach (var function in functionList.GetAllDeviceFunctionList()) - { - System.Threading.Thread.Sleep(100); - switch (function.functionCategory) - { - case FunctionCategory.Light: - case FunctionCategory.Electrical: - case FunctionCategory.SwitchDevice: - case FunctionCategory.Curtain: - case FunctionCategory.Thermostat: - if (DB_ResidenceData.residenceData.GatewayType == 0) - { - DriverLayer.Control.Ins.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 { @@ -695,7 +403,7 @@ { if (ins_OidList == null) { - var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid"); + var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName); if (bytes == null || bytes.Length == 0) { ins_OidList = new List<FunctionOid>(); @@ -727,14 +435,13 @@ /// <summary> /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩� /// </summary> - public static void SaveFunctionOidJsonDataList(string oidJsonString) + public static void SaveOidList(string oidJsonString) { - oidJsonString = oidJsonString.Replace("add", "get_list_response"); var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString); - FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes); + Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes); } #endregion } -} \ No newline at end of file +} -- Gitblit v1.8.0