From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0704042..27feb96 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -193,10 +193,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.Rooms.Count < 2)
+ if (DB_ResidenceData.residenceData.Rooms.Count < 2)
{
}
- else if (DB_ResidenceData.Rooms.Count < 3)
+ else if (DB_ResidenceData.residenceData.Rooms.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 (DB_ResidenceData.residenceData.Rooms.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(DB_ResidenceData.residenceData.Rooms);
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