From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 2e1e226..749b70d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -44,14 +44,25 @@
this.ClearBodyFrame();
//澶村儚
- var btnIcon = new PicViewControl(207, 207);
- btnIcon.UnSelectedImagePath = "Center/Admin.png";
- btnIcon.Y = Application.GetRealHeight(219);
- btnIcon.Gravity = Gravity.CenterHorizontal;
- bodyFrameLayout.AddChidren(btnIcon);
+ var btnUserIcon = new ImageView();
+ btnUserIcon.Height = Application.GetMinRealAverage(207);
+ btnUserIcon.Width = Application.GetMinRealAverage(207);
+ btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
+ if (memberResult.HeadImage != null)
+ {
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
+ }
+ else
+ {
+ btnUserIcon.ImagePath = "Center/Admin.png";
+ }
+ btnUserIcon.Y = Application.GetRealHeight(219);
+ btnUserIcon.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnUserIcon);
//鎴愬憳ID
var btnUserId = new NormalViewControl(800, 50, true);
+ btnUserId.IsBold = true;
btnUserId.Y = Application.GetRealHeight(472);
btnUserId.Gravity = Gravity.CenterHorizontal;
btnUserId.Text = memberResult.Account;
@@ -61,6 +72,7 @@
//鏄电О
var btnName = new NormalViewControl(800, 55, true);
+ btnName.IsBold = true;
btnName.Y = Application.GetRealHeight(541);
btnName.Gravity = Gravity.CenterHorizontal;
btnName.TextAlignment = TextAlignment.Center;
@@ -76,6 +88,7 @@
strMsg = string.Format(strMsg, "\r\n");
}
var btnmsg = new NormalViewControl(800, 100, true);
+ btnmsg.IsBold = true;
btnmsg.Y = Application.GetRealHeight(913);
btnmsg.TextSize = 12;
btnmsg.Text = strMsg;
@@ -129,7 +142,7 @@
if (resultValue == null)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
@@ -146,7 +159,7 @@
if (memberInfoRes == null)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
@@ -154,14 +167,23 @@
UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
UserCenterLogic.SaveLocalMemberListInfo();
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+ if (memberResult.HeadImage != null)
+ {
+ //鍐欏叆澶村儚鍐呭
+ Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+ }
+
//鎴愬憳娣诲姞鎴愬姛
var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes);
+ form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
form.FormCloseEvent += (() =>
{
this.CloseForm();
//鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
this.CloseFormByFormName("AddMemberByIdForm");
+ //娣诲姞鎴愬憳
+ this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
});
}
--
Gitblit v1.8.0