From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
index 85ea56e..5768fcd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
@@ -27,7 +27,7 @@
skipAddRoomAction = (type, floor) =>
{
Room newRoom = new Room() {
- sid = Guid.NewGuid().ToString(),
+ uid = Guid.NewGuid().ToString(),
};
editBackAction = () => {
LoadRoomRow(newRoom);
@@ -49,11 +49,11 @@
{
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();
}
@@ -65,7 +65,7 @@
}
else
{
- btnRoomName.Text = r.floorName + r.name;
+ btnRoomName.Text = r.floorName + r.roomName;
btnBg.ImagePath = r.backgroundImage;
}
};
--
Gitblit v1.8.0