From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
index ebaf638..5cfabb9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
@@ -69,19 +69,19 @@
             btnIcon.Radius = (uint)this.GetRealSizeEx(294) / 2;
             btnIcon.Y = frameDetail.Y - this.GetRealSizeEx(294) / 2;
             btnIcon.Gravity = Gravity.CenterHorizontal;
-            btnIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(HdlFileNameResourse.UserHeadIconFile);
+            btnIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
             frameBack.AddChidren(btnIcon);
             //鐢ㄦ埛鍚�
             var btnUser = new NormalViewControl(frameBack.Width, this.GetRealHeight(50), false);
             btnUser.IsBold = true;
             btnUser.Y = btnIcon.Bottom + this.GetRealSizeEx(23);
-            btnUser.Text = HdlUserCenterResourse.UserInfo.NickName;
+            btnUser.Text = UserCenterResourse.UserInfo.UserName;
             btnUser.TextAlignment = TextAlignment.Center;
             btnUser.TextColor = UserCenterColor.Current.TextGrayColor2;
             frameBack.AddChidren(btnUser);
             //浜岀淮鐮�
             var btnQrCode = new PicViewControl(this.GetRealSizeEx(236), this.GetRealSizeEx(236), false);
-            btnQrCode.ImageBytes = QRCode.BytesFromText(HdlUserCenterResourse.UserInfo.Account, this.GetPictrueRealSize(236), this.GetPictrueRealSize(236));
+            btnQrCode.ImageBytes = QRCode.BytesFromText(UserCenterResourse.UserInfo.Account, this.GetPictrueRealSize(236), this.GetPictrueRealSize(236));
             btnQrCode.Gravity = Gravity.CenterHorizontal;
             btnQrCode.Y = btnUser.Bottom + this.GetRealSizeEx(69);
             frameBack.AddChidren(btnQrCode);

--
Gitblit v1.8.0