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 | 94 +++++++++++++++++++++++++++++++++--------------
1 files changed, 66 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index fe53862..1ed7e3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鎴愬憳淇℃伅
/// </summary>
- private AccountInfoResult AccountResult = null;
+ private AccountInfoResult memberResult = null;
#endregion
@@ -25,7 +25,7 @@
/// <param name="i_infoResult">鎴愬憳淇℃伅</param>
public void ShowForm(AccountInfoResult i_infoResult)
{
- this.AccountResult = i_infoResult;
+ this.memberResult = i_infoResult;
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uMemberInformation));
@@ -48,9 +48,9 @@
btnUserIcon.Height = this.GetPictrueRealSize(207);
btnUserIcon.Width = this.GetPictrueRealSize(207);
btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
- if (AccountResult.HeadImage != null)
+ if (memberResult.HeadImage != null)
{
- btnUserIcon.ImageBytes = AccountResult.HeadImage;
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
}
else
{
@@ -65,7 +65,7 @@
btnUserId.IsBold = true;
btnUserId.Y = Application.GetRealHeight(472);
btnUserId.Gravity = Gravity.CenterHorizontal;
- btnUserId.Text = AccountResult.Account;
+ btnUserId.Text = memberResult.Account;
btnUserId.TextAlignment = TextAlignment.Center;
btnUserId.TextColor = UserCenterColor.Current.TextGrayColor1;
bodyFrameLayout.AddChidren(btnUserId);
@@ -77,7 +77,8 @@
btnName.Gravity = Gravity.CenterHorizontal;
btnName.TextAlignment = TextAlignment.Center;
btnName.TextSize = 16;
- btnName.Text = AccountResult.MemberName;
+ //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+ btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
bodyFrameLayout.AddChidren(btnName);
//璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
@@ -124,45 +125,64 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- //娣诲姞鎴愬憳
- var memberInfoRes = HdlMemberLogic.Current.AddMember(AccountResult.Account, AccountResult.MemberName);
- if (memberInfoRes == null)
+ var pra = new BindSubAccountPra();
+ pra.SubAccount = memberResult.Account;
+
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
+ if (result == false)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
return;
}
- //娣诲姞瀛愯处鍙锋椂,鎺ュ彛骞朵笉杩斿洖杩欎簺涓滆タ,鎵�浠ラ渶瑕佹墜鍔ㄨ祴鍊�
- memberInfoRes.ChildNickName = AccountResult.MemberName;
- if (AccountResult.Account.Contains("@") == true)
- {
- memberInfoRes.ChildAccountEmail = AccountResult.Account;
- }
- else
- {
- memberInfoRes.ChildAccountPhone = AccountResult.Account;
- }
- string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfoRes.ChildAccountId + ".png");
- if (AccountResult.HeadImage != null)
- {
- //鍐欏叆澶村儚鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(iconPath, AccountResult.HeadImage);
- }
-
+ //鑾峰彇杩欎釜鎴愬憳鐨凷ubDistributedMark
+ var pra2 = new MemberListInfoPra();
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
+
+ if (string.IsNullOrEmpty(resultValue) == true)
+ {
+ return;
+ }
+ List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);
+ MemberInfoRes memberInfoRes = null;
+ foreach (var info in listInfo)
+ {
+ //褰撹处鍙风粦瀹氫簡閭鏃�,瀹冭繑鍥炵殑鏄偖绠辫处鍙�
+ if (info.Account == memberResult.Account
+ || info.Account == memberResult.Email)
+ {
+ memberInfoRes = info;
+ break;
+ }
+ }
+ if (memberInfoRes == null)
+ {
+ //鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ return;
+ }
+
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+ if (memberResult.HeadImage != null)
+ {
+ //鍐欏叆澶村儚鍐呭
+ Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+ }
HdlThreadLogic.Current.RunMain(() =>
{
//鎴愬憳娣诲姞鎴愬姛
var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes);
+ form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
form.FormCloseEvent += (() =>
{
this.CloseForm();
//鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
- HdlFormLogic.Current.CloseFormByFormName("AddMemberByIdForm");
+ this.CloseFormByFormName("AddMemberByIdForm");
//娣诲姞鎴愬憳
this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
});
@@ -170,5 +190,23 @@
}
#endregion
+
+ #region 鈻� 缁撴瀯浣揰____________________________
+
+ /// <summary>
+ /// 缁戝畾鎴愬憳ID鍒颁綇瀹呯殑鍚姩鍙傛暟
+ /// </summary>
+ private class BindSubAccountPra : IfacePraCommon
+ {
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public string SubAccount = string.Empty;
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HouseDistributedMark = Common.Config.Instance.Home.Id;
+ }
+ #endregion
}
}
--
Gitblit v1.8.0