From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
index 3eadc3f..ecdad76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
@@ -32,12 +32,13 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_memberResult">鎴愬憳淇℃伅</param>
- public void ShowForm(MemberInfoRes i_memberResult)
+ /// <param name="i_iconMark">澶村儚鐨凪ark</param>
+ public void ShowForm(MemberInfoRes i_memberResult, string i_iconMark)
{
this.memberResult = i_memberResult;
//鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame(i_memberResult.ChildAccountId);
+ this.InitMiddleFrame(i_iconMark);
}
@@ -56,7 +57,7 @@
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
- string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, i_iconMark + ".png");
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, i_iconMark + ".png");
var btnUserIcon = new ImageView();
btnUserIcon.Height = this.GetPictrueRealSize(207);
btnUserIcon.Width = this.GetPictrueRealSize(207);
@@ -80,7 +81,11 @@
btnName.Y = Application.GetRealHeight(334);
btnName.TextColor = UserCenterColor.Current.TextColor2;
btnName.TextSize = 16;
- btnName.Text = memberResult.ShowName;
+ btnName.Text = memberResult.UserName;
+ if (string.IsNullOrEmpty(memberResult.UserName) == true)
+ {
+ btnName.Text = memberResult.Account;
+ }
frame.AddChidren(btnName);
//鏉冮檺
--
Gitblit v1.8.0