From e29de9af8f507d288a61d9459fb3d1f72976876f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 10:40:08 +0800
Subject: [PATCH] 2020-05-18-1
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 54ba6df..668f718 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>
@@ -63,11 +62,10 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = UserConfig.Instance.CurFoor,
+ Text = OnAppConfig.Instance.CurFoor,
};
roomFloorChangeView.AddChidren(btnFoor);
#endregion
-
functionListView = new VerticalScrolViewLayout()
{
@@ -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.functionType != FunctionType.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