From 30b5770f56f99c1f92e933ad31cf7d2af58b033c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 十二月 2020 16:31:48 +0800
Subject: [PATCH] 20201202
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index 8cd2f51..6232997 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,12 +68,12 @@
{
foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
{
- if (f.roomIds.Contains(room.sid))
+ if (f.roomIds.Contains(room.uid))
{
- f.roomIds.Remove(room.sid);
+ f.roomIds.Remove(room.uid);
}
}
- DB_ResidenceData.DelRoom(room);
+ DB_ResidenceData.residenceData.DelRoom(room);
backAction();
this.RemoveFromParent();
};
@@ -112,7 +112,7 @@
return;
}
btnRoomName.Text = str;
- room.name = str;
+ room.roomName = str;
if (pageTitleId == StringId.EditRoomInfo)
{
room.SaveRoomData();
@@ -121,17 +121,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 +242,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 +273,7 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
//var imageName = Guid.NewGuid().ToString();
- var imageName = room.sid;
+ var imageName = room.uid;
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath, imageName);
--
Gitblit v1.8.0