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/FloorsManagementPageBLL.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index fe66aaa..37685e1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -10,7 +10,7 @@
/// <summary>
/// 妤煎眰鎸夐挳淇敼鍚嶇О鐐瑰嚮浜嬩欢
/// </summary>
- void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,Floor floor)
+ void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,SpatialInfo floor)
{
btn.MouseUpEventHandler = (sender, e) =>
{
@@ -27,23 +27,23 @@
}.Show(bodyView);
return;
}
- if (DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newName) != null)
+ if (SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newName) != null)
{
return;
}
else
{
- floor.name = newName;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ floor.roomName = newName;
+ floor.UpdateFloor();
btn.Text = newName;
btnDel.Tag = newName;
row.Tag = newName;
}
};
var floors = new List<string>();
- foreach (var f in DB_ResidenceData.residenceData.floors)
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
- floors.Add(f.name);
+ floors.Add(f.roomName);
}
new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, btn.Text, editCallBack,StringId.FloorNameCannotBeEmpty,
StringId.EditFloorFailed_FloorAlreadyExist,floors);
@@ -98,8 +98,8 @@
{
return;
}
- room.floorId = lastButton.Tag.ToString();
- room.floorId = lastButton.Tag.ToString();
+ room.parentId = lastButton.Tag.ToString();
+ room.parentId = lastButton.Tag.ToString();
backAction?.Invoke();
bodyView.RemoveFromParent();
DB_ResidenceData.residenceData.SaveResidenceData();
--
Gitblit v1.8.0