From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 67 ++++++---------------------------
1 files changed, 13 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 1ed7e3a..5eb8f1c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -77,8 +77,7 @@
btnName.Gravity = Gravity.CenterHorizontal;
btnName.TextAlignment = TextAlignment.Center;
btnName.TextSize = 16;
- //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
- btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
+ btnName.Text = memberResult.MemberName;
bodyFrameLayout.AddChidren(btnName);
//璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
@@ -125,48 +124,26 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- var pra = new BindSubAccountPra();
- pra.SubAccount = memberResult.Account;
-
- bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
- if (result == false)
+ //娣诲姞鎴愬憳
+ var memberInfoRes = HdlMemberLogic.Current.AddMember(memberResult.Account, memberResult.MemberName);
+ if (memberInfoRes == null)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
return;
}
-
- //鑾峰彇杩欎釜鎴愬憳鐨凷ubDistributedMark
- var pra2 = new MemberListInfoPra();
- string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
- if (string.IsNullOrEmpty(resultValue) == true)
+ //娣诲姞瀛愯处鍙锋椂,鎺ュ彛骞朵笉杩斿洖杩欎簺涓滆タ,鎵�浠ラ渶瑕佹墜鍔ㄨ祴鍊�
+ memberInfoRes.ChildNickName = memberResult.MemberName;
+ if (memberResult.Account.Contains("@") == true)
{
- return;
+ memberInfoRes.ChildAccountEmail = memberResult.Account;
}
- List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);
- MemberInfoRes memberInfoRes = null;
- foreach (var info in listInfo)
+ else
{
- //褰撹处鍙风粦瀹氫簡閭鏃�,瀹冭繑鍥炵殑鏄偖绠辫处鍙�
- 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;
+ memberInfoRes.ChildAccountPhone = memberResult.Account;
}
- string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+ string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfoRes.ChildAccountId + ".png");
if (memberResult.HeadImage != null)
{
//鍐欏叆澶村儚鍐呭
@@ -177,36 +154,18 @@
{
//鎴愬憳娣诲姞鎴愬姛
var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
+ form.AddForm(memberResult);
form.FormCloseEvent += (() =>
{
this.CloseForm();
//鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
- this.CloseFormByFormName("AddMemberByIdForm");
+ HdlFormLogic.Current.CloseFormByFormName("AddMemberByIdForm");
//娣诲姞鎴愬憳
this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
});
});
}
- #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