From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 11 一月 2021 14:37:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC --- HDL_ON/Entity/FunctionList.cs | 228 ++++++++++++++------------------------------------------- 1 files changed, 56 insertions(+), 172 deletions(-) diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs index 7adfaaf..3e7152d 100644 --- a/HDL_ON/Entity/FunctionList.cs +++ b/HDL_ON/Entity/FunctionList.cs @@ -191,7 +191,7 @@ } if (filePath.StartsWith("SceneData_")) { - var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath); + var sceneDataBytes = FileUtlis.Files.ReadFile(filePath); var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes); var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString); List.scenes.Add(tempScene); @@ -249,55 +249,55 @@ /// <param name="sidObj"></param> public void AddDeviceFunction(Function sidObj0) { - switch (sidObj0.functionType) + switch (sidObj0.spk) { - case FunctionType.AC: + case SPK.AcStandard: var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.aCs.Add(sidObj); - sidObj.SaveFunctionData(false); + sidObj.SaveFunctionFile(); break; - case FunctionType.FloorHeating: + case SPK.FloorHeatStandard: var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.floorHeatings.Add(sidObj1); - sidObj1.SaveFunctionData(false); + sidObj1.SaveFunctionFile(); break; - case FunctionType.Dimmer: - case FunctionType.RGB: - case FunctionType.Relay: + case SPK.LightDimming: + case SPK.LightRGB: + case SPK.LightSwitch: var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.lights.Add(sidObj2); - sidObj2.SaveFunctionData(false); + sidObj2.SaveFunctionFile(); break; - case FunctionType.Curtain: - case FunctionType.RollingShutter: - case FunctionType.MotorCurtain: + case SPK.CurtainSwitch: + case SPK.CurtainRoller: + case SPK.CurtainTrietex: var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.curtains.Add(sidObj3 ); - sidObj3.SaveFunctionData(false); + sidObj3.SaveFunctionFile(); break; - case FunctionType.TV: + case SPK.ElectricTV: var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.tVs.Add(sidObj4); - sidObj4.SaveFunctionData(false); + sidObj4.SaveFunctionFile(); break; - case FunctionType.Socket: + case SPK.ElectricSocket: var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.switchSockets.Add(sidObj5); - sidObj5.SaveFunctionData(false); + sidObj5.SaveFunctionFile(); break; - case FunctionType.Fan: + case SPK.ElectricFan: var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.fans.Add(sidObj6); - sidObj6.SaveFunctionData(false); + sidObj6.SaveFunctionFile(); break; - case FunctionType.CO2: - case FunctionType.TVOC: - case FunctionType.PM25: - case FunctionType.Temp: - case FunctionType.Humidity: + case SPK.SensorCO2: + case SPK.SensorTVOC: + case SPK.SensorPm25: + case SPK.SensorTemperature: + case SPK.SensorHumidity: var sidObj7 = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0)); List.sensorsEnvironmentalScience.Add(sidObj7); - sidObj7.SaveFunctionData(false); + sidObj7.SaveFunctionFile(); break; } } @@ -311,15 +311,20 @@ var f = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(obj.ToString()); if (f == null) return; - switch (f.functionCategory) + switch (f.Spk_Prefix) { - case FunctionCategory.Thermostat: - switch (f.functionType) + case FunctionCategory.AC: + switch (f.spk) { - case FunctionType.AC: + case SPK.AcStandard: _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString())); break; - case FunctionType.FloorHeating: + } + break; + case FunctionCategory.FloorHeat: + switch (f.spk) + { + case SPK.FloorHeatStandard: _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString())); break; } @@ -330,28 +335,28 @@ case FunctionCategory.Curtain: _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString())); break; - case FunctionCategory.Electrical: - switch(f.functionType) + case FunctionCategory.Electric: + switch(f.spk) { - case FunctionType.TV: + case SPK.ElectricTV: _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString())); break; - case FunctionType.Socket: + case SPK.ElectricSocket: _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString())); break; - case FunctionType.Fan: + case SPK.ElectricFan: _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString())); break; } break; case FunctionCategory.Sensor: - switch(f.functionType) + switch(f.spk) { - case FunctionType.TVOC: - case FunctionType.CO2: - case FunctionType.PM25: - case FunctionType.Humidity: - case FunctionType.Temp: + case SPK.SensorTVOC: + case SPK.SensorCO2: + case SPK.SensorPm25: + case SPK.SensorHumidity: + case SPK.SensorTemperature: _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString())); break; } @@ -378,129 +383,8 @@ } /// <summary> - /// 涓嬫潵浜戠璁惧鏁版嵁 - /// </summary> - public void DownloadFunctionList() - { - new Thread(() => - { - var pm = new HttpServerRequest(); - var pack = pm.GetDeviceList(); - if (pack.Code == StateCode.SUCCESS) - { - var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString()); - if (deviceList != null) - { - if (List.GetDeviceFunctionList().Count > 0) - { - for (int i = 0; i < List.GetDeviceFunctionList().Count;) - { - var localFunction = List.GetDeviceFunctionList()[i]; - if (localFunction.functionCategory == FunctionCategory.Music) - { - i++; - continue; - } - var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId); - if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍 - { - List.DeleteFunction(localFunction); - } - else - { - MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}"); - i++; - if (localFunction.modifyTime != newFunction.modifyTime) - { - localFunction.name = newFunction.name; - localFunction.collect = newFunction.collect; - localFunction.modifyTime = newFunction.modifyTime; - localFunction.roomIds = newFunction.roomIds; - localFunction.bus = newFunction.bus; - localFunction.SaveFunctionData(false); - } - deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘 - } - } - } - //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳� - foreach (var newFunction in deviceList.list) - { - newFunction.SaveFunctionData(false); - List.IniFunctionList(newFunction.savePath); - } - } - //MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁:\r\n{ pack.Data.ToString()}"); - } - else - { - MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁澶辫触:\r\nCode:{pack.Code}; Msg:{pack.message}"); - } - }) - { IsBackground = true }.Start(); - } - - /// <summary> - /// 涓嬭浇浜戠鍦烘櫙鏁版嵁 - /// </summary> - public void DownloadSceneList() - { - new Thread(() => - { - var pm = new HttpServerRequest(); - var pack = pm.GetSceneList(); - if(pack.Code == StateCode.SUCCESS) - { - //MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁:\r\n{pack.Data.ToString()}"); - var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString()); - if (sceneList != null) - { - for (int i=0;i<List.scenes.Count;) - { - var localScene = List.scenes[i]; - if (localScene == null) - { - List.scenes.Remove(localScene); - continue; - } - var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId); - if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍 - { - List.DeleteScene(localScene,false); - } - else - { - i++; - if (localScene.modifyTime != newScene.modifyTime) - { - localScene.name = newScene.name; - localScene.collect = newScene.collect; - localScene.modifyTime = newScene.modifyTime; - localScene.roomIds = newScene.roomIds; - localScene.SaveSceneData(false); - } - sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘 - } - } - //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳� - foreach (var newScene in sceneList) - { - newScene.SaveSceneData(false); - List.scenes.Add(newScene); - } - } - } - else - { - MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁澶辫触:\r\nCode:{pack.Code}; Msg:{pack.message}"); - } - }) - { IsBackground = true }.Start(); - } - - - /// <summary> /// 鍒犻櫎鍦烘櫙 + /// todo /// </summary> public void DeleteScene(Scene scene,bool upSevser) { @@ -510,22 +394,22 @@ var packCode = pm.DeleteScene(scene.userSceneId); if (packCode == StateCode.SUCCESS) { - Common.FileUtlis.Files.DeleteFile(scene.savePath); + FileUtlis.Files.DeleteFile(scene.savePath); List.scenes.Remove(scene); } else { - Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode); + IMessageCommon.Current.ShowErrorInfoAlter(packCode); } } else { - Common.FileUtlis.Files.DeleteFile(scene.savePath); + FileUtlis.Files.DeleteFile(scene.savePath); List.scenes.Remove(scene); } } /// <summary> - /// 鍒犻櫎鏈湴鍔熻兘鏂囦欢 + /// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠� /// </summary> public void DeleteFunction(Function delTemp) { @@ -619,13 +503,13 @@ { foreach (var function in GetDeviceFunctionList()) { - switch (function.functionCategory) + switch (function.Spk_Prefix) { case FunctionCategory.Light: - case FunctionCategory.Electrical: - case FunctionCategory.SwitchDevice: + case FunctionCategory.Electric: case FunctionCategory.Curtain: - case FunctionCategory.Thermostat: + case FunctionCategory.AC: + case FunctionCategory.FloorHeat: DriverLayer.Control.Ins.SendReadCommand(function); break; } -- Gitblit v1.8.0