Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs

@@ -45,9 +45,9 @@


            //头像

            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

            btnUserIcon.Width = Application.GetMinRealAverage(207);

            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;

            btnUserIcon.Height = this.GetPictrueRealSize(207);

            btnUserIcon.Width = this.GetPictrueRealSize(207);

            btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;

            if (memberResult.HeadImage != null)

            {

                btnUserIcon.ImageBytes = memberResult.HeadImage;