From 67aaf808b729ad31f63efd77bf74c05f01ca33bd Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 三月 2021 16:18:24 +0800
Subject: [PATCH] 2021-03-10 1.移除DS_Store
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 86a1eba..91c286b 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -105,6 +105,10 @@
{
functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
}
+ else if (titleId == StringId.Sensor)
+ {
+ functionList.AddRange(FunctionList.List.sensorsArm);
+ }
functionList.OrderByDescending(o => o.controlCounter).ToList();
ShowFunctionRow(functionList);
@@ -121,7 +125,7 @@
foreach (var function in showList)
{
- if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
+ if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
{
--
Gitblit v1.8.0