From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
index 3823a72..42678d6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
@@ -80,6 +80,7 @@
/// </summary>
void LoadEvent_ShowChangeRoomDialog()
{
+
btnChoosedRoom.MouseUpEventHandler = (sender, e) =>
{
LoadPage_LoadChooseRoomDialog();
@@ -95,20 +96,28 @@
/// 鏍规嵁閫変腑鐨勬埧闂存敼鍙樻樉绀虹殑鍔熻兘鍒楄〃
/// </summary>
/// <param name="btn"></param>
- void LoadEvent_ChangeShowedFunctionList(Button btn,Dialog dialog,string chooseRoomName)
- {
- btn.MouseUpEventHandler = (sender, e) => {
- if (lastButton != null)
- {
- lastButton.IsSelected = false;
- }
- btn.IsSelected = true;
- showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
- LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
- btnChoosedRoom.Text = chooseRoomName;
- dialog.Close();
- };
- }
+ //void LoadEvent_ChangeShowedFunctionList(Button btn,Dialog dialog,string chooseRoomName)
+ //{
+ // btn.MouseUpEventHandler = (sender, e) => {
+ // if (lastButton != null)
+ // {
+ // lastButton.IsSelected = false;
+ // }
+ // btn.IsSelected = true;
+ // //showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
+ // showedFunctionRoomId = btn.Tag.ToString();
+ // if (showedFunctionRoomId == "0")
+ // {
+ // LoadFunctionListRow(allocatedList);
+ // }
+ // else
+ // {
+ // LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
+ // }
+ // btnChoosedRoom.Text = chooseRoomName;
+ // dialog.Close();
+ // };
+ //}
/// <summary>
/// 淇濆瓨鎴块棿淇敼鐨勬暟鎹�
@@ -133,7 +142,7 @@
{
f.roomIds.Add(room.roomId);
}
- f.SaveFunctionData(true);
+ f.UpdataRoomIds();
}
room.GetRoomFunctions(true);
bodyView.RemoveFromParent();
--
Gitblit v1.8.0