From 673a93f4ed742a10a879a67b616e6646b03ef0fb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 九月 2020 17:14:27 +0800
Subject: [PATCH] 202009151
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index 80caa4f..1ff956e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -17,7 +17,7 @@
LoadEvent_SkinBindFloor();
LoadEvent_SkipEditFunctionList();
LoadEvent_Option();
- LoadEvent_SkipSharedRoomFunctionPage();
+ //LoadEvent_SkipSharedRoomFunctionPage();
}
/// <summary>
@@ -121,18 +121,18 @@
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);
}
if (pageTitleId == StringId.AddRoom)
- //{
+ {
new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
- //}
- //else
- //{
- // new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
- //}
+ }
+ else
+ {
+ new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
+ }
};
btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
roomNameRow.MouseUpEventHandler = eventHandler;
@@ -152,7 +152,7 @@
};
var residentialManagePage = new FloorsManagementPage(floorsCallBackAction);
MainPage.BasePageView.AddChidren(residentialManagePage);
- residentialManagePage.LoadPage(room);
+ residentialManagePage.LoadPage(room, StringId.FloorAssignment);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnFloorInfo.MouseUpEventHandler = eventHandler;
@@ -175,35 +175,35 @@
functionManagemantView.MouseUpEventHandler = eventHandler;
}
- /// <summary>
- /// 璺宠浆鍒板姛鑳藉垎浜晫闈�
- /// </summary>
- void LoadEvent_SkipSharedRoomFunctionPage()
- {
- if (pageTitleId != StringId.AddRoom)
- {
- EventHandler<MouseEventArgs> eHandler = (sender, e) =>
- {
- List<ShareData> sds = new List<ShareData>();
- 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));
- //sd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
- sds.Add(sd);
- }
- var mmp = new MemberFunctionPermissionPage(room, sds);
- MainPage.BasePageView.AddChidren(mmp);
- mmp.LoadPage(StringId.ChooseSharedFunction);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- btnSharedRight.MouseUpEventHandler = eHandler;
- sharedView.MouseUpEventHandler = eHandler;
- btnSharedTitle.MouseUpEventHandler = eHandler;
- }
- }
+ ///// <summary>
+ ///// 璺宠浆鍒板姛鑳藉垎浜晫闈�
+ ///// </summary>
+ //void LoadEvent_SkipSharedRoomFunctionPage()
+ //{
+ // if (pageTitleId != StringId.AddRoom)
+ // {
+ // EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ // {
+ // List<ShareData> sds = new List<ShareData>();
+ // 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));
+ // //sd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
+ // sds.Add(sd);
+ // }
+ // var mmp = new MemberFunctionPermissionPage(room, sds);
+ // MainPage.BasePageView.AddChidren(mmp);
+ // mmp.LoadPage(StringId.ChooseSharedFunction);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // };
+ // btnSharedRight.MouseUpEventHandler = eHandler;
+ // sharedView.MouseUpEventHandler = eHandler;
+ // btnSharedTitle.MouseUpEventHandler = eHandler;
+ // }
+ //}
/// <summary>
/// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
/// </summary>
--
Gitblit v1.8.0