From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0110158..cac5d2c 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -69,7 +69,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.CurFoor,
+ Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
roomFloorChangeView.AddChidren(btnFloor);
#endregion
@@ -83,27 +83,27 @@
if (titleId == StringId.Lights)
{
- functionList.AddRange(DB_ResidenceData.functionList.lights);
+ functionList.AddRange(FunctionList.List.lights);
}
else if (titleId == StringId.AC)
{
- functionList.AddRange(DB_ResidenceData.functionList.aCs);
+ functionList.AddRange(FunctionList.List.aCs);
}
else if (titleId == StringId.Curtain)
{
- functionList.AddRange(DB_ResidenceData.functionList.curtains);
+ functionList.AddRange(FunctionList.List.curtains);
}
else if (titleId == StringId.FloorHeating)
{
- functionList.AddRange(DB_ResidenceData.functionList.floorHeatings);
+ functionList.AddRange(FunctionList.List.floorHeatings);
}
else if (titleId == StringId.Electric)
{
- functionList.AddRange(DB_ResidenceData.functionList.electricals);
+ functionList.AddRange(FunctionList.List.electricals);
}
else if (titleId == StringId.EnvironmentalScience)
{
- functionList.AddRange(DB_ResidenceData.functionList.sensorsEnvironmentalScience);
+ functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
}
functionList.OrderByDescending(o => o.usageCount).ToList();
--
Gitblit v1.8.0