From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index 9fbc8f9..d4c108f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
@@ -39,7 +39,7 @@
}.Show(bodyView);
return;
}
- if(string.IsNullOrEmpty( room.floor))
+ if(string.IsNullOrEmpty( room.floorName))
{
new Tip()
{
@@ -49,7 +49,7 @@
}.Show(bodyView);
return;
}
- foreach (var tempRoom in DB_ResidenceData.residenceData.rooms)
+ foreach (var tempRoom in DB_ResidenceData.rooms)
{
if (room.name == tempRoom.name)
{
@@ -58,8 +58,7 @@
}
}
- DB_ResidenceData.residenceData.rooms.Add(room);
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.DelRoom(room);
backAction();
this.RemoveFromParent();
}
@@ -67,7 +66,7 @@
{
Action action = () =>
{
- foreach (var f in DB_ResidenceData.residenceData.functionList.functions)
+ foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
{
if (f.roomIdList.Contains(room.sid))
{
@@ -75,8 +74,7 @@
}
}
room.sid = "";
- DB_ResidenceData.residenceData.rooms.Remove(room);
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.DelRoom(room);
backAction();
this.RemoveFromParent();
};
@@ -118,13 +116,13 @@
room.name = str;
if (pageTitleId == StringId.EditRoomInfo)
{
- DB_ResidenceData.residenceData.SaveResidenceData();
+ room.SaveRoomData();
}
};
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> roomNameList = new List<string>();
- foreach(var rroom in DB_ResidenceData.residenceData.rooms)
+ foreach(var rroom in DB_ResidenceData.rooms)
{
roomNameList.Add(rroom.name);
}
@@ -151,7 +149,7 @@
{
Action floorsCallBackAction = () =>
{
- btnFloorInfo.Text = room.floor;
+ btnFloorInfo.Text = room.floorName;
};
var residentialManagePage = new FloorsManagementPage(floorsCallBackAction);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -188,14 +186,14 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
List<ShareData> sds = new List<ShareData>();
- foreach (var f in room.functions)
+ foreach (var f in room.GetRoomFunctions(false))
{
var sd = new ShareData();
sd.ShareName = f.sid;
sd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
sd.ShareDataBytes = DAL.CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
- //ssdd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
- sds.Add(sd);
+ //sd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
+ sds.Add(sd);
}
var mmp = new MemberFunctionPermissionPage(room, sds);
MainPage.BasePageView.AddChidren(mmp);
@@ -210,16 +208,20 @@
/// <summary>
/// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
/// </summary>
- void LoadEvent_PictureOptionViewEventList()
+ void LoadEvent_PictureOptionViewEventList(FrameLayout baseView)
{
pictureOptionView.MouseUpEventHandler = (sender, e) =>
{
- pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
+ baseView.MouseUpEventHandler = (sender, e) =>
+ {
+ baseView.RemoveFromParent();
+ };
btnCancel.MouseUpEventHandler = (sender, e) =>
{
- pictureOptionView.RemoveFromParent();
+ baseView.RemoveFromParent();
};
btnTakePicture.MouseDownEventHandler = (sender, e) => {
btnTakePicture.IsSelected = true;
@@ -239,7 +241,7 @@
}, pid.ToString(), 16, 9);
if (pageTitleId == StringId.EditRoomInfo)
{
- DB_ResidenceData.residenceData.SaveResidenceData();
+ room.SaveRoomData();
}
pictureOptionView.RemoveFromParent();
};
@@ -258,14 +260,11 @@
btnRoomBg.ImagePath = imagePath.ToString();
room.backgroundImage = btnRoomBg.ImagePath;
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
-#if DEBUG
- new Tip() { CloseTime = 5, Text = imagePath }.Show(MainPage.BasePageView);
-#endif
}
}, pid.ToString(), 16, 9);
if (pageTitleId == StringId.EditRoomInfo)
{
- DB_ResidenceData.residenceData.SaveResidenceData();
+ room.SaveRoomData();
}
pictureOptionView.RemoveFromParent();
};
--
Gitblit v1.8.0