From 1eb43291d6f565fd8106ee401240d1c7a41da776 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 27 九月 2021 09:31:46 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index cb6b25a..74fe7e8 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -38,17 +38,18 @@
public void LoadPage(int titleId)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- //if (titleId == StringId.Lights)
- //{
- // Action action = () => {
- // var skipView = new AddLightScene(new List<Function>(),new Scene() { sceneType = SceneType.LightScene});
- // MainPage.BasePageView.AddChidren(skipView);
- // skipView.LoadPage();
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- // };
- // new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
- //}
- //else
+ if (titleId == StringId.Lights)
+ {
+ Action action = () =>
+ {
+ var skipView = new AddLightScene(new List<Function>(), new Scene() { sceneType = SceneType.LightScene });
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
+ }
+ else
{
new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
}
@@ -140,7 +141,10 @@
functionListView.RemoveAll();
foreach (var function in showList)
{
-
+ if(function.spk == SPK.SensorDryContact)
+ {
+ continue;
+ }
if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
--
Gitblit v1.8.0