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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -114,11 +114,11 @@
            bodyFrameLayout.AddChidren(frame);



            //用户图标

            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");

            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfo.DistributedMark + ".png");

            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 (System.IO.File.Exists(iconPath) == true)

            {

                btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);

@@ -430,7 +430,7 @@
                if (infoResult.HeadImage != null)

                {

                    //写入头像内容

                    string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");

                    string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfo.DistributedMark + ".png");

                    Shared.IO.FileUtils.WriteFileByBytes(iconPath, infoResult.HeadImage);

                    HdlThreadLogic.Current.RunMain(() =>

                    {