From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
index 0ee1ecc..e170e76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
@@ -145,19 +145,16 @@
/// <param name="txtMsg">淇℃伅鎺т欢</param>
private void SearchMemberInfo(string accountId)
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var result = HdlMemberLogic.Current.SearchNormalInfoByAccount(accountId);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
- if (result == null)
+ var pra = new AccountInfoPra();
+ pra.Account = accountId;
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
+ if (byteData == null)
{
//寮傚父
return;
}
- if (result.Account == string.Empty)
+ var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode == "AccountNoExists")
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -168,10 +165,13 @@
return;
}
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
+ infoResult.Account = accountId;
+
HdlThreadLogic.Current.RunMain(() =>
{
var form2 = new AddMemberInfoForm();
- form2.AddForm(result, this.TransferDiv);
+ form2.AddForm(infoResult, this.TransferDiv);
});
}
--
Gitblit v1.8.0