Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

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

@@ -107,6 +107,10 @@
                IsBold = true
            };
            showdFunctionTypeRow.AddChidren(btnUnallocated);
            if(Language.CurrentLanguage != "Chinese")
            {
                btnUnallocated.Width = Application.GetRealWidth(130);
            }

            btnAllocated = new Button()
            {