From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 1e9ab60..f333a9b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -494,6 +494,25 @@
}
functionCategoryCount++;
+ //FunctionType ft = FunctionType.A31Music
+ //switch (item)
+ //{
+ // case FunctionType.FloorHeating:
+ // break;
+ // case FunctionType.AC:
+ // break;
+ // case FunctionType.MotorCurtain:
+ // case FunctionType.Curtain:
+ // case FunctionType.RollingShutter:
+ // break;
+ // case FunctionType.Relay:
+ // case FunctionType.Dimmer:
+ // case FunctionType.RGB:
+ // case FunctionType.ColorTemperature:
+ // break;
+ // case FunctionType.Socket:
+ // break;
+ //}
FrameLayout functionView = new FrameLayout()
{
Height = Application.GetRealWidth(161),
@@ -747,7 +766,7 @@
{
Button btnFunctionCount = new Button()
{
- X = Application.GetRealWidth(16) + Application.GetRealWidth(7 * functionCount.ToString().Length),
+ X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(24),
@@ -761,7 +780,7 @@
{
X = Application.GetRealWidth(16),
Y = btnName.Bottom,
- Width = Application.GetRealWidth(12 * functionCount.ToString().Length),
+ Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
Height = Application.GetRealHeight(24),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -920,7 +939,7 @@
{
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
- if (room.parentId == floor.roomId)
+ if (room.parentId == floor.uid)
{
roomsShowed.Add(room);
}
--
Gitblit v1.8.0