From d18004970b3040ea27beb567694b496a56bedd5b Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 30 七月 2020 10:42:36 +0800
Subject: [PATCH] 2020-07-30-1
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
index 01377dc..9b3fe94 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPage.cs
@@ -39,6 +39,10 @@
/// 鍚庨��鍥炶皟浜嬩欢
/// </summary>
Action backAction;
+ /// <summary>
+ /// 鏈�鍚庝竴娆＄偣鍑荤殑鎸夐挳
+ /// </summary>
+ Button lastButton;
public FloorsManagementPage()
{
@@ -61,8 +65,8 @@
{
bodyView.RemoveAll();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- refreshFloorList = (type,floor) => {
- RefreshFloorsListView(type, floor);
+ refreshFloorList = (type,floorName) => {
+ RefreshFloorsListView(type, floorName);
};
new TopViewDiv(bodyView, Language.StringByID(StringId.FloorsManagement)).LoadTopView("floors",refreshFloorList,backAction);
@@ -121,7 +125,7 @@
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
- Tag = floor,
+ Tag = floor.name,
LineColor = CSS_Color.DividingLineColor,
};
floorsListView.AddChidren(row);
@@ -134,18 +138,18 @@
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.MainColor,
Text = floor.name,
+ Tag = floor.sid,
};
row.AddChidren(btnFloor);
if (room == null)
{
-
var btnDel = new Button()
{
TextID = StringId.Del,
BackgroundColor = CSS_Color.WarningColor,
TextColor = CSS_Color.MainBackgroundColor,
- Tag = floor
+ Tag = floor.name
};
row.AddRightView(btnDel);
LoadEvent_DelFloor(btnDel);
@@ -153,6 +157,11 @@
}
else {
LoadEvent_FloorChoose(btnFloor);
+ if (room.floorId == floor.sid)
+ {
+ lastButton = btnFloor;
+ btnFloor.IsSelected = true;
+ }
}
}
@@ -191,16 +200,16 @@
}
break;
case "del":
+ //璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
+ foreach (var r in DB_ResidenceData.residenceData.rooms)
+ {
+ if (r.floorId == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == floorName).sid)
+ {
+ r.floorId = "";
+ }
+ }
for (int i = 0; i < floorsListView.ChildrenCount; i++)
{
- //璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
- foreach (var r in DB_ResidenceData.residenceData.rooms)
- {
- if (r.floorId == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == floorName).sid)
- {
- r.floorId = "";
- }
- }
if (floorsListView.GetChildren(i).GetType() == typeof(Button))
{
Button btn = floorsListView.GetChildren(i) as Button;
--
Gitblit v1.8.0