From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
index 11bd8e0..5768fcd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
@@ -27,13 +27,15 @@
skipAddRoomAction = (type, floor) =>
{
Room newRoom = new Room() {
- sid = Guid.NewGuid().ToString(),
+ uid = Guid.NewGuid().ToString(),
};
editBackAction = () => {
LoadRoomRow(newRoom);
};
- var skipPage = new RoomEditPage(newRoom, StringId.AddRoom,editBackAction);
+
+
+ var skipPage = new RoomEditPage(newRoom, StringId.AddRoom, editBackAction, null);
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -43,15 +45,15 @@
/// <summary>
/// 璺宠浆鍒扮紪杈戞埧闂寸殑鐣岄潰
/// </summary>
- void LoadEvent_SkipEditRoomPage(Room r, Button btnRoomName, ImageView btnBg)
+ void LoadEvent_SkipEditRoomPage(Room r, Button btnRoomName, ImageView btnBg, FrameLayout roomRow)
{
editBackAction = () =>
{
- if (string.IsNullOrEmpty(r.sid))
+ if (string.IsNullOrEmpty(r.uid))
{
for (int i = 0; i < roomsListView.ChildrenCount; )
{
- if (roomsListView.GetChildren(i).Tag.ToString() == r.name + "line" || roomsListView.GetChildren(i).Tag.ToString() == r.name + "row")
+ if (roomsListView.GetChildren(i).Tag.ToString() == r.roomName + "line" || roomsListView.GetChildren(i).Tag.ToString() == r.roomName + "row")
{
roomsListView.GetChildren(i).RemoveFromParent();
}
@@ -63,11 +65,16 @@
}
else
{
- btnRoomName.Text = r.floorName + r.name;
+ btnRoomName.Text = r.floorName + r.roomName;
btnBg.ImagePath = r.backgroundImage;
}
};
- var skipPage = new RoomEditPage(r, StringId.EditRoomInfo,editBackAction);
+
+ Action deleteAction = () => {
+ roomRow.RemoveFromParent();
+ };
+
+ var skipPage = new RoomEditPage(r, StringId.EditRoomInfo, editBackAction, deleteAction);
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0