From 6ad070dbf9a88bb95a6eb38ed40e91959ca56115 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 10:18:25 +0800
Subject: [PATCH] 空调控制界面优化
---
HDL_ON/Entity/FunctionList.cs | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index cdd06aa..450ef57 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -13,6 +13,22 @@
public class FunctionList
{
static FunctionList _FunctionList;
+
+ public static void ClearData()
+ {
+ try
+ {
+ _FunctionList._IpCamImou = null;
+ _FunctionList.Clear();
+ _FunctionList = null;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
+ _FunctionList = null;
+ }
+ }
+
public static FunctionList List
{
get
@@ -46,6 +62,29 @@
public List<Function> GetMechanicalArmList()
{
return Functions.FindAll((obj) => obj.spk == SPK.MechanicalArm);
+ }
+
+ List<Function> _IpCamImou;
+ /// <summary>
+ /// 鑾峰彇鎽勫儚澶村垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetIpCamImouList()
+ {
+ if (_IpCamImou == null)
+ {
+ _IpCamImou = Functions.FindAll((obj) => obj.spk == SPK.IpCam_Imou);
+ if (_IpCamImou.Count > 0)
+ {
+#if __IOS__
+#else
+ Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+ Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
+#endif
+ }
+ }
+ return _IpCamImou;
}
/// <summary>
@@ -146,7 +185,7 @@
//}
return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
}
- #region 瀹剁數鍒楄〃 electricals
+#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
@@ -164,7 +203,7 @@
{
return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
}
- #endregion
+#endregion
/// <summary>
/// 闊充箰鍒楄〃
@@ -344,6 +383,9 @@
{
MainPage.Log($"IniFunctionList error : {ex.Message}");
}
+ finally
+ {
+ }
}
/// <summary>
@@ -404,8 +446,18 @@
/// </summary>
public void Clear()
{
- Functions = new List<Function>();
- _FunctionList = null;
+ try
+ {
+ _IpCamImou.Clear();
+ _IpCamImou = null;
+ _FunctionList.Clear();
+ _FunctionList = null;
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
+ _FunctionList = null;
+ }
}
/// <summary>
@@ -428,7 +480,6 @@
/// <summary>
/// 鍒犻櫎鍦烘櫙
- /// todo
/// </summary>
public void DeleteScene(Scene scene,bool upSevser)
{
@@ -582,7 +633,7 @@
{ IsBackground = true }.Start();
}
- #region 鍦烘櫙鐩稿叧
+#region 鍦烘櫙鐩稿叧
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
@@ -614,9 +665,9 @@
}
return revPack.Code;
}
- #endregion
+#endregion
- #region 鏀惰棌鍔熻兘
+#region 鏀惰棌鍔熻兘
/// <summary>
/// 鏀惰棌鍦烘櫙
@@ -642,14 +693,14 @@
return result;
}
- #endregion
+#endregion
- #region
+#region
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0