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 | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index f013a0f..1ed7e3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -106,7 +106,10 @@
btnOk.ButtonClickEvent += (sender, e) =>
{
//娣诲姞鎴愬憳
- this.DoAddMember();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.DoAddMember();
+ });
};
}
@@ -117,7 +120,7 @@
/// <summary>
/// 娣诲姞鎴愬憳
/// </summary>
- private async void DoAddMember()
+ private void DoAddMember()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -125,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)
{
//鍏抽棴杩涘害鏉�
@@ -135,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.uUnKnownError);
- 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;
@@ -158,14 +160,11 @@
}
if (memberInfoRes == null)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
+ //鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
- //娣诲姞缂撳瓨
- UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
- UserCenterLogic.SaveLocalMemberListInfo();
string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
if (memberResult.HeadImage != null)
@@ -174,16 +173,19 @@
Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
}
- //鎴愬憳娣诲姞鎴愬姛
- var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
- form.FormCloseEvent += (() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- this.CloseForm();
- //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
- this.CloseFormByFormName("AddMemberByIdForm");
- //娣诲姞鎴愬憳
- this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
+ //鎴愬憳娣诲姞鎴愬姛
+ 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