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/RoomEditPageBLL.cs | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index 27ccb17..96edb72 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -29,7 +29,7 @@
{
if (btnOption.TextID == StringId.Save)
{
- if (string.IsNullOrEmpty(room.name))
+ if (string.IsNullOrEmpty(room.roomName))
{
new Tip()
{
@@ -49,15 +49,15 @@
}.Show(bodyView);
return;
}
- foreach (var tempRoom in DB_ResidenceData.rooms)
+ foreach (var tempRoom in DB_ResidenceData.Rooms)
{
- if (room.name == tempRoom.name)
+ if (room.roomName == tempRoom.roomName)
{
new PublicAssmebly().TipMsg(StringId.Tip, StringId.AddingFailed_RoomAlreadyExists);
return;
}
}
- DB_ResidenceData.rooms.Add(room);
+ DB_ResidenceData.residenceData.AddRoom(room);
room.SaveRoomData();
backAction();
this.RemoveFromParent();
@@ -68,13 +68,16 @@
{
foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
{
- if (f.roomIdList.Contains(room.sid))
+ if (f.roomIds.Contains(room.uid))
{
- f.roomIdList.Remove(room.sid);
+ f.roomIds.Remove(room.uid);
}
}
- DB_ResidenceData.DelRoom(room);
- backAction();
+ DB_ResidenceData.residenceData.DelRoom(room);
+ // backAction();
+ // DB_ResidenceData.DelRoom(room);
+ //鍒犻櫎浜嬩欢鍥炶皟
+ this.deleteAction?.Invoke();
this.RemoveFromParent();
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
@@ -112,7 +115,7 @@
return;
}
btnRoomName.Text = str;
- room.name = str;
+ room.roomName = str;
if (pageTitleId == StringId.EditRoomInfo)
{
room.SaveRoomData();
@@ -121,17 +124,17 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> roomNameList = new List<string>();
- foreach (var rroom in DB_ResidenceData.rooms)
+ foreach (var rroom in DB_ResidenceData.Rooms)
{
- roomNameList.Add(rroom.name);
+ roomNameList.Add(rroom.roomName);
}
if (pageTitleId == StringId.AddRoom)
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
}
else
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
}
};
btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
@@ -242,7 +245,7 @@
//}, pid.ToString(), 16, 9);
//var imageName = Guid.NewGuid().ToString();
- var imageName = room.sid;
+ var imageName = room.uid;
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath, imageName);
@@ -273,7 +276,7 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
//var imageName = Guid.NewGuid().ToString();
- var imageName = room.sid;
+ var imageName = room.uid;
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath, imageName);
--
Gitblit v1.8.0