From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 54ba6df..6a220fa 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()
{
@@ -76,32 +74,58 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in DB_ResidenceData.residenceData.functionList.functions)
+ foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
{
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(titleId == StringId.FloorHeating)
+ {
+ if(function.functionType != FunctionType.FloorHeating )
+ {
+ continue;
+ }
+ }
+ if(titleId == StringId.Electric)
+ {
+ if(function.functionType != FunctionType.Socket &&
+ function.functionType != FunctionType.TV &&
+ function.functionType != FunctionType.Fan)
+ {
+ continue;
+ }
+ }
+ if (titleId == StringId.EnvironmentalScience)
+ {
- if (function.functionType == "RGB" || function.functionType == "Dimmer")
+ if (function.functionType != FunctionType.PM25 ||
+ function.functionType != FunctionType.CO2 ||
+ function.functionType != FunctionType.Temp ||
+ function.functionType != FunctionType.TVOC ||
+ function.functionType != FunctionType.Humidity)
+ {
+ continue;
+ }
+ }
+ if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
{
var functionDiv = new FunctionControlZone(function)
{
@@ -112,7 +136,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
@@ -128,11 +152,12 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
}
}
--
Gitblit v1.8.0