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

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs

@@ -103,8 +103,16 @@
                    lastButton.IsSelected = false;
                }
                btn.IsSelected = true;
                showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
                LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
                //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();
            };