From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index d29fe3f..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),
@@ -615,7 +634,7 @@
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
//Tag = item + "_AllControl",
- IsSelected = false
+ IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnClose);
@@ -628,7 +647,7 @@
Height = Application.GetRealWidth(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
- IsSelected = true,
+ IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
};
functionView.AddChidren(btnOpen);
LoadEvent_CurtainSwitch(btnClose, btnOpen);
@@ -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