From 67ab9b89a19b117800424c253427b0dd961b2574 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:51:00 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index f23e855..dcff62d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -182,11 +182,34 @@
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
}
- functionList.OrderByDescending(o => o.controlCounter).ToList();
+ else if(titleId == StringId.MechanicalArm)
+ {
+ functionList.AddRange(FunctionList.List.GetMechanicalArmList());
+ }
+ 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>
--
Gitblit v1.8.0