From 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 八月 2023 14:28:22 +0800
Subject: [PATCH] 备份1
---
OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 52 ++--------------------------------------------------
1 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 7ff91dc..a7d7226 100644
--- a/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/OnPro/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -62,7 +62,7 @@
this.titleId = titleId_out;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+ if (titleId == StringId.Lights)
{
Action action = () =>
{
@@ -167,10 +167,6 @@
//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)
{
functionList.AddRange(FunctionList.List.GetAcList());
@@ -183,33 +179,9 @@
{
functionList.AddRange(FunctionList.List.GetFloorHeatingList());
}
- else if (titleId == StringId.Electric)
- {
- functionList.AddRange(FunctionList.List.GetElectricals());
- }
- else if (titleId == StringId.EnvironmentalScience)
- {
- functionList.AddRange(FunctionList.List.GetEnvirSensorsList());
- }
- else if (titleId == StringId.Sensor)
- {
- functionList.AddRange(FunctionList.List.GetArmSensorList());
- }
else if (titleId == StringId.FreshAir)
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
- }
- else if (titleId == StringId.MechanicalArm)
- {
- functionList.AddRange(FunctionList.List.GetMechanicalArmList());
- }
- 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();
@@ -271,10 +243,7 @@
}
var function = showList[showCount];
- if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
- {
- continue;
- }
+
if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function,null)
@@ -291,23 +260,6 @@
functionDiv.LoadFunctionDiv();
functionDiv.OrderEvent = OrderEvent;
functionListView.AddChidren(functionDiv);
- }
- else if (function.spk == SPK.IpCam_Imou)
- {
- var functionDiv = new FunctionControlZone(function,null)
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(96),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.spk + function.sid
- };
- functionDiv.LoadFunctionDiv();
- functionListView.AddChidren(functionDiv);
-
}
else
{
--
Gitblit v1.8.0