From a251442d9fc088b3d8cf74d20b959f0f6103b095 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 九月 2020 17:42:10 +0800
Subject: [PATCH] 20200914
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index e0d86f7..b8f664b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -177,7 +177,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = OnAppConfig.Instance.CurFoor,
+ Text = DB_ResidenceData.residenceData.CurFoor,
};
roomFloorChangeView.AddChidren(btnFloor);
/// <summary>
@@ -388,12 +388,8 @@
Y = Application.GetRealHeight(16),
Height = Application.GetRealHeight(667 - 64 - 49 + 20),
};
-
- if (DB_ResidenceData.residenceData.functionTypeList.Count > 4)
- {
- functionContentView.Height += Application.GetRealHeight((220 * (DB_ResidenceData.residenceData.functionTypeList.Count - 4 - 2) / 2) + 20);
- }
functionsPageView.AddChidren(functionContentView);
+
int index = 0;
List<int> specialList = new List<int>() { 1, 2, 5, 6, 9, 10, 13, 14, 17, 18, 21, 22 };
@@ -415,9 +411,10 @@
var lastY1 = Application.GetRealWidth(16);
var lastY2 = Application.GetRealWidth(16);
+ var functionCategoryCount = 0;
+
foreach (var item in DB_ResidenceData.residenceData.functionTypeList)
{
-
int functionCount = 0;
int functionOnCount = 0;
switch (item)
@@ -482,6 +479,7 @@
{
continue;
}
+ functionCategoryCount++;
FrameLayout functionView = new FrameLayout()
{
@@ -778,6 +776,12 @@
}
index++;
}
+
+ if (functionCategoryCount> 4)
+ {
+ functionContentView.Height += Application.GetRealHeight((220 * (functionCategoryCount - 4 - 2) / 2) + 20);
+ }
+
#endregion
}
--
Gitblit v1.8.0