From a16dbea60b9fd0550dcdefd34c94ff6711af2cbc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 十一月 2022 09:13:29 +0800
Subject: [PATCH] 功能完成备份
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0af5488..87341e4 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -182,11 +182,38 @@
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
}
- functionList.OrderByDescending(o => o.controlCounter).ToList();
+ else if(titleId == StringId.MechanicalArm)
+ {
+ functionList.AddRange(FunctionList.List.GetMechanicalArmList());
+ }
+ else if(titleId == StringId.SecurityMonitoring)
+ {
+ functionList.AddRange(FunctionList.List.GetIpCamImouList());
+ }
+ functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
ShowFunctionRow(functionList);
LoadDialog_ChangeFloor();
+
+
+ #region 鍔犺浇缁勫悎璋冨厜鍦烘櫙
+ if (titleId == StringId.Lights)
+ {
+ foreach (var lightScene in FunctionList.List.scenes)
+ {
+ if (lightScene.sceneType == SceneType.LightScene)
+ if (lightScene != null)
+ {
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ var sceneRow = new SceneControlZone(lightScene);
+ functionListView.AddChidren(sceneRow);
+ sceneRow.LoadView();
+ }
+ }
+ }
+ #endregion
+
}
/// <summary>
@@ -201,7 +228,7 @@
{
continue;
}
- if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
{
@@ -217,6 +244,23 @@
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
+ else if(function.spk == SPK.IpCam_Imou)
+ {
+ var functionDiv = new FunctionControlZone(function)
+ {
+ 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
{
var functionDiv = new FunctionControlZone(function)
--
Gitblit v1.8.0