Merge branch 'CJL' into NewFilePath

wxr

2020-12-18 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -31,10 +31,10 @@
                //btnConfirm.IsSelected = false;
                if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
                {
                    if (titleId == StringId.ModifyMemberNickname)
                    {
                        return;
                    }
                    //if (titleId == StringId.ModifyMemberNickname)
                    //{
                    //    return;
                    //}
                    string tipMsgString = "";
                    if (string.IsNullOrEmpty(editText.Text.Trim()))
                    {