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 | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0704042..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();
@@ -193,10 +193,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.Rooms.Count < 2)
+ if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
{
}
- else if (DB_ResidenceData.Rooms.Count < 3)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -211,7 +211,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.Rooms.Count < 4)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -245,8 +245,8 @@
List<Room> roomList = new List<Room>();
- roomList.Add(new Room() { uid = "", roomName = Language.StringByID(StringId.All) });
- roomList.AddRange(DB_ResidenceData.Rooms);
+ roomList.Add(new Room() { roomName = Language.StringByID(StringId.All) });
+ roomList.AddRange(SpatialInfo.CurrentSpatial.RoomList);
foreach (var tempRoom in roomList)
{
var roomName = tempRoom.roomName;
@@ -288,7 +288,7 @@
var showList = new List<Function>();
foreach (var sf in functionList)
{
- if(sf.roomIds.Contains(tempRoom.uid))
+ if(sf.roomIds.Contains(tempRoom.roomId))
{
showList.Add(sf);
}
--
Gitblit v1.8.0