From 3fcb73db484d2bed5ee993702913a7eaea68068c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 八月 2023 18:01:23 +0800
Subject: [PATCH] 2.1.2
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 8443ee9..7ff91dc 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -12,7 +12,7 @@
/// <summary>
/// 褰撳墠绐椾綋
/// </summary>
- static FrameLayout bodyView;
+ public static FunctionPage bodyView;
/// <summary>
/// 妤煎眰閫夋嫨涓嬫媺鍥炬爣
/// </summary>
@@ -35,7 +35,26 @@
bodyView = this;
functionList = new List<Function>();
- throw new ArgumentNullException();
+ }
+
+ /// <summary>
+ /// 閲嶈浇鐣岄潰
+ /// </summary>
+ public void ReLoadPage()
+ {
+ if (bodyView != null)
+ {
+ try
+ {
+ bodyView.RemoveAll();
+ LoadPage(this.titleId);
+ functionList = new List<Function>();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"FunctionPage ReloadPage error :\r\n {ex.Message}");
+ }
+ }
}
public void LoadPage(int titleId_out)
@@ -145,12 +164,12 @@
if (titleId == StringId.Lights)
{
- functionList.AddRange(FunctionList.List.groupControls);
+ //functionList.AddRange(FunctionList.List.groupControls);
functionList.AddRange(FunctionList.List.GetLightList());
-
-
-
-
+ }
+ else if(titleId == StringId.HorseRaceLamp)
+ {
+ functionList.AddRange(FunctionList.List.GetSeries());
}
else if (titleId == StringId.AC)
{
@@ -180,13 +199,17 @@
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
}
- else if(titleId == StringId.MechanicalArm)
+ else if (titleId == StringId.MechanicalArm)
{
functionList.AddRange(FunctionList.List.GetMechanicalArmList());
}
- else if(titleId == StringId.SecurityMonitoring)
+ else if (titleId == StringId.SecurityMonitoring)
{
functionList.AddRange(FunctionList.List.GetIpCamImouList());
+ }
+ else if(titleId == StringId.EnergyMonitoring)
+ {
+ functionList.AddRange(FunctionList.List.GetEnergyList());
}
functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
@@ -252,7 +275,7 @@
{
continue;
}
- if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function,null)
{
--
Gitblit v1.8.0