Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone

JLChen

2021-10-15 df3906c03db154e8622b7caeaa3bf93b67c6d40a

 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs

@@ -191,7 +191,7 @@
            {
                LoadPictureOptionView();
            };

            //抹掉数据
            btnEraseData = new Button()
            {
                Y = Application.GetRealHeight(481),
@@ -547,7 +547,7 @@
                    try
                    {
                        string base64string = Convert.ToBase64String(imageBytes);
                        Utlis.WriteLine("上传图片Length:" + imageBytes.Length + " base64：" + base64string);
                        //Utlis.WriteLine("上传图片Length:" + imageBytes.Length + " base64：" + base64string);
                        var pack = new HttpServerRequest().FaceSetting(base64string);
                        if (pack != null)
                        {