From dcf60777c9346ff058f06298d03173f0c53d1902 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 20:42:15 +0800
Subject: [PATCH] 20201216-4
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 8a15cdd..855b89c 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 = DB_ResidenceData.Instance.CurFoor,
+ Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
roomFloorChangeView.AddChidren(btnFloor);
/// <summary>
@@ -615,7 +615,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 +628,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 +747,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 +761,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,
@@ -871,17 +871,18 @@
}
- List<string> chooseList = new List<string>();
- chooseList.Add(Language.StringByID(StringId.All));
+ List<SpatialInfo> chooseList = new List<SpatialInfo>();
+ chooseList.Add(new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) });
foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
- chooseList.Add(f.roomName);
+ chooseList.Add(f);
}
foreach (var floor in chooseList)
{
- if (floor != Language.StringByID(StringId.All))
+ if (!string.IsNullOrEmpty( floor.roomId))// != Language.StringByID(StringId.All))
{
+ //---鍒嗗壊绾�
contentView.AddChidren(new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -898,20 +899,20 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- Text = floor,
+ Text = floor.roomName,
TextSize = CSS_FontSize.SubheadingFontSize,
- IsSelected = btnFloor.Text == floor,
+ IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
IsMoreLines = true,
- Tag = floor
};
contentView.AddChidren(btnHomeName);
btnHomeName.MouseUpEventHandler += (senderH, en) =>
{
dialog.Close();
- btnFloor.Text = floor;
+ btnFloor.Text = floor.roomName;
+ DB_ResidenceData.Instance.ClassificationChooseFloor = floor;
roomsShowed.Clear();
- if (floor == Language.StringByID(StringId.All))
+ if (string.IsNullOrEmpty(floor.roomId))
{
roomsShowed.AddRange(SpatialInfo.CurrentSpatial.RoomList);
}
@@ -919,7 +920,7 @@
{
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
- if (room.floorName == floor)
+ if (room.parentId == floor.roomId)
{
roomsShowed.Add(room);
}
--
Gitblit v1.8.0