From d60b92c58ac09197642eb6dac9b905f0898dacb8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 十二月 2020 15:42:13 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index 27e7002..1f422ee 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,21 +27,21 @@
}.Show(bodyView);
return;
}
- if (Floor.InsFloor.Floors.Find((obj) => obj.roomName == newName) != null)
+ if (SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newName) != null)
{
return;
}
else
{
floor.roomName = newName;
- floor.SaveFloorData();
+ floor.UpdateFloor();
btn.Text = newName;
btnDel.Tag = newName;
row.Tag = newName;
}
};
var floors = new List<string>();
- foreach (var f in Floor.InsFloor.Floors)
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
floors.Add(f.roomName);
}
@@ -98,11 +98,11 @@
{
return;
}
- room.parentId = lastButton.Tag.ToString();
+ //room.parentId = lastButton.Tag.ToString();
room.parentId = lastButton.Tag.ToString();
backAction?.Invoke();
bodyView.RemoveFromParent();
- DB_ResidenceData.residenceData.SaveResidenceData();
+ //DB_ResidenceData.residenceData.SaveResidenceData();
};
}
--
Gitblit v1.8.0