Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 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();