From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 54ba6df..b110079 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -28,7 +28,6 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
-
/// <summary>
/// 鎴块棿鍐呭鏄剧ず鍖哄煙
/// </summary>
@@ -68,7 +67,6 @@
roomFloorChangeView.AddChidren(btnFoor);
#endregion
-
functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64 + 52),
@@ -80,28 +78,28 @@
{
if (titleId == StringId.Lights)
{
- if (function.functionCategory != FunctionType.Light)
+ if (function.functionCategory != FunctionCategory.Light)
{
continue;
}
}
if (titleId == StringId.AC)
{
- if (function.functionCategory != FunctionType.AC)
+ if (function.functionCategory != FunctionCategory.AC)
{
continue;
}
}
if (titleId == StringId.Curtain)
{
- if (function.functionCategory != FunctionType.Curtain)
+ if (function.functionCategory != FunctionCategory.Curtain)
{
continue;
}
}
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- if (function.functionType == "RGB" || function.functionType == "Dimmer")
+ if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
{
var functionDiv = new FunctionControlZone(function)
{
--
Gitblit v1.8.0