Merge branch 'dev-tzy' into NewFilePath

wxr

2021-01-28 48c07e0a371f67b97abc7c2e61d7f23d060324fc

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