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/AddMemberInfoForm.cs | 71 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 0a985ae..1ed7e3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -43,21 +43,14 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberResult.DistributedMark + ".png");
- if (memberResult.HeadImage != null)
- {
- //鍐欏叆澶村儚鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
- }
-
//澶村儚
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 (memberResult.HeadImage != null)
{
- btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
}
else
{
@@ -69,6 +62,7 @@
//鎴愬憳ID
var btnUserId = new NormalViewControl(800, 50, true);
+ btnUserId.IsBold = true;
btnUserId.Y = Application.GetRealHeight(472);
btnUserId.Gravity = Gravity.CenterHorizontal;
btnUserId.Text = memberResult.Account;
@@ -78,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;
@@ -93,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;
@@ -110,7 +106,10 @@
btnOk.ButtonClickEvent += (sender, e) =>
{
//娣诲姞鎴愬憳
- this.DoAddMember();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.DoAddMember();
+ });
};
}
@@ -121,7 +120,7 @@
/// <summary>
/// 娣诲姞鎴愬憳
/// </summary>
- private async void DoAddMember()
+ private void DoAddMember()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -129,7 +128,7 @@
var pra = new BindSubAccountPra();
pra.SubAccount = memberResult.Account;
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -139,22 +138,21 @@
//鑾峰彇杩欎釜鎴愬憳鐨凷ubDistributedMark
var pra2 = new MemberListInfoPra();
- string resultValue = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- if (resultValue == null)
+ if (string.IsNullOrEmpty(resultValue) == true)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
- this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);
MemberInfoRes memberInfoRes = null;
foreach (var info in listInfo)
{
- if (info.Account == memberResult.Account)
+ //褰撹处鍙风粦瀹氫簡閭鏃�,瀹冭繑鍥炵殑鏄偖绠辫处鍙�
+ if (info.Account == memberResult.Account
+ || info.Account == memberResult.Email)
{
memberInfoRes = info;
break;
@@ -162,23 +160,32 @@
}
if (memberInfoRes == null)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+ //鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
- //娣诲姞缂撳瓨
- UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
- UserCenterLogic.SaveLocalMemberListInfo();
- //鎴愬憳娣诲姞鎴愬姛
- var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes);
- form.FormCloseEvent += (() =>
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+ if (memberResult.HeadImage != null)
{
- this.CloseForm();
- //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
- this.CloseFormByFormName("AddMemberByIdForm");
+ //鍐欏叆澶村儚鍐呭
+ Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+ }
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鎴愬憳娣诲姞鎴愬姛
+ var form = new AddMemberSuccessForm();
+ form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
+ form.FormCloseEvent += (() =>
+ {
+ this.CloseForm();
+ //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
+ this.CloseFormByFormName("AddMemberByIdForm");
+ //娣诲姞鎴愬憳
+ this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
+ });
});
}
--
Gitblit v1.8.0