From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
index 264daa7..ecdad76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鐣岄潰鍏抽棴浜嬩欢
- /// </summary>
+ /// </summary>
public Action FormCloseEvent = null;
/// <summary>
/// 鎴愬憳淇℃伅
@@ -30,21 +30,22 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_memberResult">鎴愬憳淇℃伅</param>
- public void ShowForm(MemberInfoRes i_memberResult)
- {
- this.memberResult = i_memberResult;
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
-
+ /// </summary>
+ /// <param name="i_memberResult">鎴愬憳淇℃伅</param>
+ /// <param name="i_iconMark">澶村儚鐨凪ark</param>
+ public void ShowForm(MemberInfoRes i_memberResult, string i_iconMark)
+ {
+ this.memberResult = i_memberResult;
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame(i_iconMark);
+ }
+
+
/// <summary>
/// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
+ /// </summary>
+ private void InitMiddleFrame(string i_iconMark)
{
//鑳屾櫙妗�
var frame = new FrameLayout();
@@ -52,23 +53,35 @@
frame.Height = Application.GetRealHeight(1097);
frame.BackgroundColor = UserCenterColor.Current.White;
frame.Gravity = Gravity.Center;
- frame.Radius = 6;
+ frame.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
- var btnUserIcon = new PicViewControl(207, 207);
- btnUserIcon.Y = Application.GetRealHeight(104);
+ 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);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
+ btnUserIcon.Y = Application.GetRealHeight(104);
btnUserIcon.Gravity = Gravity.CenterHorizontal;
- btnUserIcon.UnSelectedImagePath = "Center/Admin.png";
+ if (System.IO.File.Exists(iconPath) == true)
+ {
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
+ }
+ else
+ {
+ btnUserIcon.ImagePath = "Center/Admin.png";
+ }
frame.AddChidren(btnUserIcon);
//鏄电О
var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);
- btnName.TextAlignment = TextAlignment.Center;
- btnName.Y = Application.GetRealHeight(334);
- btnName.TextColor = UserCenterColor.Current.TextColor2;
- btnName.TextSize = 16;
- btnName.Text = memberResult.UserName;
+ btnName.IsBold = true;
+ btnName.TextAlignment = TextAlignment.Center;
+ btnName.Y = Application.GetRealHeight(334);
+ btnName.TextColor = UserCenterColor.Current.TextColor2;
+ btnName.TextSize = 16;
+ btnName.Text = memberResult.UserName;
if (string.IsNullOrEmpty(memberResult.UserName) == true)
{
btnName.Text = memberResult.Account;
@@ -77,15 +90,16 @@
//鏉冮檺
var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);
- btnAuthority.TextAlignment = TextAlignment.Center;
- btnAuthority.Y = Application.GetRealHeight(400);
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextAlignment = TextAlignment.Center;
+ btnAuthority.Y = Application.GetRealHeight(400);
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.TextID = R.MyInternationalizationString.uMember;
btnAuthority.TextSize = 12;
frame.AddChidren(btnAuthority);
//瀹舵棌鎴愬憳娣诲姞鎴愬姛
var btnSuccess = new NormalViewControl(frame.Width, Application.GetRealHeight(82), false);
+ btnSuccess.IsBold = true;
btnSuccess.Y = Application.GetRealHeight(547);
btnSuccess.TextAlignment = TextAlignment.Center;
btnSuccess.TextID = R.MyInternationalizationString.uAddMemberSuccess;
@@ -114,13 +128,13 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
if (clearEvent == true)
{
FormCloseEvent = null;
}
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0