From aef11d254b82551172996951447c5063be491f36 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 07 十二月 2020 20:43:15 +0800
Subject: [PATCH] 2020-12-07 1.错误码对接。2.发送验证码增加Loading等待优化。3.忘记密码修改成功提示UI。4.封装统一自动登录方法。
---
HDL_ON/Entity/FunctionList.cs | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 391 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 7e2029b..a48047a 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -1,11 +1,33 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using HDL_ON.DAL;
+using HDL_ON.DAL.Server;
namespace HDL_ON.Entity
{
- public class FunctionList
+ public class FunctionList
{
+ static FunctionList _FunctionList;
+ public static FunctionList List
+ {
+ get
+ {
+ if(_FunctionList == null)
+ {
+ _FunctionList = new FunctionList();
+ #region 鎭㈠鏁版嵁
+ var filePathList = FileUtils.ReadFiles();
+ foreach (var filePath in filePathList)
+ {
+ _FunctionList.IniFunctionList(filePath);
+ }
+ #endregion
+ }
+ return _FunctionList;
+ }
+ }
+
/// <summary>
/// 绌鸿皟鍒楄〃
/// </summary>
@@ -22,6 +44,7 @@
/// 鍦扮儹鍒楄〃
/// </summary>
public List<FloorHeating> floorHeatings = new List<FloorHeating>();
+ #region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
@@ -29,6 +52,18 @@
{
get
{
+ if(fans == null)
+ {
+ fans = new List<Fan>();
+ }
+ if(switchSockets == null)
+ {
+ switchSockets = new List<SwitchSocket>();
+ }
+ if(tVs == null)
+ {
+ tVs = new List<TV>();
+ }
var list = new List<Function>();
list.AddRange(fans);
list.AddRange(switchSockets);
@@ -48,6 +83,7 @@
/// 瀹剁數鍒楄〃
/// </summary>
public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
+ #endregion
/// <summary>
/// 鐜浼犳劅鍣ㄥ垪琛�
/// </summary>
@@ -57,19 +93,101 @@
/// 鍦烘櫙鍒楄〃
/// </summary>
public List<Scene> scenes = new List<Scene>();
+ /// <summary>
+ /// 鍔熻兘鍒楄〃
+ /// </summary>
+ List<Function> deviceFunctionList;
- [Newtonsoft.Json.JsonIgnore]
- public List<Function> functions = new List<Function>();
+ /// <summary>
+ /// 鍔犺浇鍔熻兘鍒楄〃
+ /// todo 闇�瑕佷紭鍖栵紝鍚庢湡涓嶈兘淇濊瘉鑳戒娇鐢╯id瑙ｆ瀽鍑烘槸浠�涔堢被鍨嬬殑璁惧
+ /// </summary>
+ /// <param name="filePath"></param>
+ public void IniFunctionList(string filePath)
+ {
+ if (filePath.StartsWith("FunctionData_"))
+ {
+ var functionDataBytes = FileUtils.ReadFile(filePath);
+ var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
+ var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
+ if (tempFunction.DeleteSign)
+ {
+ //todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
+ }
+ else
+ {
+ switch (tempFunction.spk)
+ {
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ case SPK.LightCCT:
+ _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
+ break;
+ case SPK.CurtainRoller:
+ case SPK.CurtainShades:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
+ break;
+ case SPK.AcStandard:
+ _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
+ break;
+ case SPK.FloorHeatStandard:
+ //鎭㈠鍦扮儹鏁版嵁
+ _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
+ break;
+ case SPK.SensorPm25:
+ case SPK.SensorCO2:
+ case SPK.SensorTVOC:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ //鎭㈠鐜鏁版嵁
+ _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
+ break;
+ case SPK.ElectricSocket:
+ //鎭㈠鎻掑骇鏁版嵁
+ _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
+ break;
+ case SPK.ElectricTV:
+ //鎭㈠鐢佃鏁版嵁
+ _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
+ break;
+ case SPK.ElectricFan:
+ //鎭㈠椋庢墖鏁版嵁
+ _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
+ break;
+ }
+ }
+ }
+ if (filePath.StartsWith("SceneData_"))
+ {
+ var sceneDataBytes = FileUtils.ReadFile(filePath);
+ var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
+ var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
+ if (tempScene.DeleteSign)
+ {
+ var pm = new HttpServerRequest();
+ pm.DeleteScene(tempScene.userSceneId);
+ }
+ else
+ {
+ List.scenes.Add(tempScene);
+ }
+ }
+ }
+
/// <summary>
/// 鑾峰彇鎵�鏈夊姛鑳藉垪琛�
/// </summary>
- public void GetAllFunction()
+ public List<Function> GetAllFunction()
{
- functions.Clear();
- functions.AddRange(GetAllDeviceFunctionList());
- functions.AddRange(scenes);
+ var fs = new List<Function>();
+ fs.AddRange(GetAllDeviceFunctionList());
+ return fs;
}
/// <summary>
@@ -77,51 +195,143 @@
/// </summary>
public List<Function> GetAllDeviceFunctionList()
{
- var deviceFunctionList = new List<Function>();
- deviceFunctionList.AddRange(aCs);
- deviceFunctionList.AddRange(lights);
- deviceFunctionList.AddRange(curtains);
- deviceFunctionList.AddRange(floorHeatings);
- deviceFunctionList.AddRange(electricals);
- deviceFunctionList.AddRange(sensorsEnvironmentalScience);
-
- return deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ if (deviceFunctionList == null)
+ {
+ deviceFunctionList = new List<Function>();
+ deviceFunctionList.AddRange(aCs);
+ deviceFunctionList.AddRange(lights);
+ deviceFunctionList.AddRange(curtains);
+ deviceFunctionList.AddRange(floorHeatings);
+ deviceFunctionList.AddRange(electricals);
+ deviceFunctionList.AddRange(sensorsEnvironmentalScience);
+ deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
+ }
+ try
+ {
+ deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"璁惧鍔熻兘鎺掑簭寮傚父锛歿ex.Message}");
+ }
+ return deviceFunctionList;
+ }
+ /// <summary>
+ /// 娓呯┖璁惧鍔熻兘鍒楄〃
+ /// </summary>
+ public void ClearAllDeviceFunctionList()
+ {
+ aCs = new List<AC>();
+ lights = new List<Light>();
+ curtains = new List<Curtain>();
+ floorHeatings = new List<FloorHeating>();
+ tVs = new List<TV>();
+ switchSockets = new List<SwitchSocket>();
+ fans = new List<Fan>();
+ sensorsEnvironmentalScience = new List<Sensor>();
+ scenes = new List<Scene>();
+ deviceFunctionList = null;
}
+ /// <summary>
+ /// 鎺ユ敹bus杞欢涓婁紶鐨勫姛鑳�
+ /// tcp鏂瑰紡
+ /// </summary>
+ /// <param name="sidObj"></param>
+ public void AddDeviceFunction(Function sidObj0)
+ {
+ switch (sidObj0.functionType)
+ {
+ case FunctionType.AC:
+ var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.aCs.Add(sidObj);
+ sidObj.SaveFunctionData();
+ break;
+ case FunctionType.FloorHeating:
+ var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);
+ sidObj1.SaveFunctionData();
+ break;
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
+ case FunctionType.Relay:
+ var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.lights.Add(sidObj2);
+ sidObj2.SaveFunctionData();
+ break;
+ case FunctionType.Curtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
+ var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.curtains.Add(sidObj3 );
+ sidObj3.SaveFunctionData();
+ break;
+ case FunctionType.TV:
+ var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.tVs.Add(sidObj4);
+ sidObj4.SaveFunctionData();
+ break;
+ case FunctionType.Socket:
+ var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.switchSockets.Add(sidObj5);
+ sidObj5.SaveFunctionData();
+ break;
+ case FunctionType.Fan:
+ var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.fans.Add(sidObj6);
+ sidObj6.SaveFunctionData();
+ break;
+ case FunctionType.CO2:
+ case FunctionType.TVOC:
+ case FunctionType.PM25:
+ case FunctionType.Temp:
+ case FunctionType.Humidity:
+ var sidObj7 = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
+ DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
+ sidObj7.SaveFunctionData();
+ break;
+ }
+ }
+ /// <summary>
+ /// 鎺ユ敹bus杞欢涓婁紶鐨勫姛鑳�
+ /// http udp
+ /// </summary>
+ /// <param name="obj"></param>
public void AddFunction(object obj)
{
var f = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(obj.ToString());
-
+ if (f == null)
+ return;
switch (f.functionCategory)
{
case FunctionCategory.Thermostat:
switch (f.functionType)
{
case FunctionType.AC:
- aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
+ _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
break;
case FunctionType.FloorHeating:
- floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
+ _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
break;
}
break;
case FunctionCategory.Light:
- lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
+ _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
break;
case FunctionCategory.Curtain:
- curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
+ _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
break;
case FunctionCategory.Electrical:
switch(f.functionType)
{
case FunctionType.TV:
- electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
+ _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
break;
- case FunctionType.WindPower:
- electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
+ case FunctionType.Socket:
+ _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
break;
case FunctionType.Fan:
- electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
+ _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
break;
}
break;
@@ -132,14 +342,167 @@
case FunctionType.CO2:
case FunctionType.PM25:
case FunctionType.Humidity:
- //case FunctionType.Noise:
- sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
+ case FunctionType.Temp:
+ _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
break;
}
break;
}
}
+ /// <summary>
+ /// 涓嬫潵浜戠璁惧鏁版嵁
+ /// </summary>
+ public void DownloadFunctionList()
+ {
+ new System.Threading.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)
+ {
+ foreach(var localFunction in List.GetAllDeviceFunctionList())
+ {
+ var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
+ if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ {
+ List.DeleteFunction(localFunction);
+ }
+ else
+ {
+ if (localFunction.modifyTime != newFunction.modifyTime)
+ {
+ localFunction.name = newFunction.name;
+ localFunction.collect = newFunction.collect;
+ localFunction.modifyTime = newFunction.modifyTime;
+ localFunction.createTime = newFunction.createTime;
+ localFunction.roomIds = newFunction.roomIds;
+ localFunction.bus_Data = newFunction.bus_Data;
+ new System.Threading.Thread(() =>
+ {
+ localFunction.SaveFunctionData();
+ })
+ { IsBackground = true }.Start();
+ }
+ deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ }
+ }
+ //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
+ foreach (var newFunction in deviceList.list)
+ {
+ new System.Threading.Thread(() =>
+ {
+ newFunction.SaveFunctionData();
+ List.IniFunctionList(newFunction.savePath);
+ })
+ { IsBackground = true }.Start();
+ }
+ }
+ 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 System.Threading.Thread(() =>
+ {
+ var pm = new HttpServerRequest();
+ var pack = pm.GetSceneList();
+ if(pack.Code == StateCode.SUCCESS)
+ {
+
+ MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁:\r\n{pack.Data.ToString()}");
+ }
+ else
+ {
+
+ MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁澶辫触:\r\nCode:{pack.Code}; Msg:{pack.message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夌紦瀛樺姛鑳芥暟鎹�
+ /// </summary>
+ public void DelAllFunctionData()
+ {
+ var filePathList = FileUtils.ReadFiles();
+ foreach (var filePath in filePathList)
+ {
+ if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
+ {
+ FileUtils.DeleteFile(filePath);
+ }
+ }
+ _FunctionList = new FunctionList();
+ }
+ /// <summary>
+ /// 鍒犻櫎鍦烘櫙
+ /// </summary>
+ public void DeleteScene(Scene scene)
+ {
+ scene.DeleteSign = true;
+ List.scenes.Remove(scene);
+ }
+ /// <summary>
+ /// 鍒犻櫎鏈湴鍔熻兘鏂囦欢
+ /// </summary>
+ public void DeleteFunction(Function delTemp)
+ {
+ switch (delTemp.spk)
+ {
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ case SPK.LightCCT:
+ _FunctionList.lights.Remove(_FunctionList.lights.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.CurtainRoller:
+ case SPK.CurtainShades:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ _FunctionList.curtains.Remove(_FunctionList.curtains.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.AcStandard:
+ _FunctionList.aCs.Remove(_FunctionList.aCs.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.FloorHeatStandard:
+ _FunctionList.floorHeatings.Remove(_FunctionList.floorHeatings.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.SensorPm25:
+ case SPK.SensorCO2:
+ case SPK.SensorTVOC:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ _FunctionList.sensorsEnvironmentalScience.Remove(_FunctionList.sensorsEnvironmentalScience.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricSocket:
+ _FunctionList.switchSockets.Remove(_FunctionList.switchSockets.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricTV:
+ _FunctionList.tVs.Remove(_FunctionList.tVs.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricFan:
+ _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ }
+ FileUtils.DeleteFile(delTemp.savePath);
+ }
+
}
-
+
}
--
Gitblit v1.8.0