From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
old mode 100644
new mode 100755
index b723f7a..f1c6834
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -5,7 +5,10 @@
namespace HDL_ON.UI
{
- public class ChooseRoomPage : FrameLayout
+ /// <summary>
+ /// 鍔熻兘鍒嗛厤鎴块棿鐣岄潰
+ /// </summary>
+ public partial class ChooseRoomPage : FrameLayout
{
#region 鎺т欢鍒楄〃
FrameLayout bodyView;
@@ -13,21 +16,34 @@
/// 鍐呭鍔犺浇鍖哄煙
/// </summary>
VerticalScrolViewLayout contentView;
+
+ Button btnChooseAll;
+
#endregion
#region 灞�閮ㄥ彉閲�
+
+ Function function;
+ /// <summary>
+ /// 鍥炶皟浜嬩欢
+ /// </summary>
+ Action backAction;
#endregion
- public ChooseRoomPage()
+ public ChooseRoomPage(Function func,Action action)
{
bodyView = this;
+ function = func;
+ backAction = action;
}
-
+ /// <summary>
+ /// 鍔犺浇椤甸潰
+ /// </summary>
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.LocationManagement));
+ new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(backAction);
contentView = new VerticalScrolViewLayout()
{
@@ -54,7 +70,7 @@
};
allRoomView.AddChidren(btnAllRoomText);
- Button btnChooseAll = new Button()
+ btnChooseAll = new Button()
{
X = Application.GetRealWidth(331),
Gravity = Gravity.CenterVertical,
@@ -62,15 +78,17 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
+ IsSelected = true
};
allRoomView.AddChidren(btnChooseAll);
- foreach(var room in DB_ResidenceData.residenceData.rooms)
+ foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
{
var roomView = new FrameLayout()
{
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = "row"
};
contentView.AddChidren(roomView);
@@ -90,7 +108,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = room.floor + " " + room.name,
+ Text = room.floorName + room.roomName,
};
roomView.AddChidren(btnRoomText);
@@ -102,10 +120,23 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
+ IsSelected = function.roomIds.Contains(room.roomId),
+ Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
+ btnChoose.MouseUpEventHandler = (sender, e) => {
+ btnChoose.IsSelected = !btnChoose.IsSelected;
+ LoadEvent_RoomSelected(room, btnChoose.IsSelected);
+ };
+
+ if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
+ {
+ btnChooseAll.IsSelected = false;
+ }
}
+
+ LoadEventLoad();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0