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/TransferResidenceByIdForm.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
index b80e73b..b45089f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
@@ -60,7 +60,7 @@
//璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
var txtCode = new TextInputControl(Application.GetRealWidth(900), rowAccount.Height, false);
txtCode.MustInput = true;
- txtCode.X = HdlControlResourse.XXLeft;
+ txtCode.X = ControlCommonResourse.XXLeft;
txtCode.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputReceiverPhoneOrEmail);
rowAccount.AddChidren(txtCode, ChidrenBindMode.NotBind);
//鑱斿姩绾跨殑鐘舵��
@@ -97,16 +97,19 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- var result = HdlMemberLogic.Current.SearchNormalInfoByAccount(accountId);
+ var pra = new AccountInfoPra();
+ pra.Account = accountId;
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- if (result == null)
+ 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(() =>
{
@@ -118,10 +121,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