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/TransferingResidenceForm.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs
index 1dfabd7..98816ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs
@@ -97,7 +97,8 @@
btnName.IsMoreLines = true;
btnName.TextAlignment = TextAlignment.Center;
btnName.TextSize = 16;
- btnName.Text = memberResult.MemberName;
+ //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+ btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
bodyFrameLayout.AddChidren(btnName);
//寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
@@ -199,10 +200,8 @@
HomeId = Config.Instance.Home.Id,
TargetAccount = this.memberResult.Account
};
- //鈽嗐優銉笺偗鈽�
- //var result = HdlUserCenterLogic.GetResultCodeByRequestHttps("App/SellHome", false, pra2, new List<string> { "NotCheck" });
- //bool success = result.ToLower() == "success";
- bool success = false;
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/SellHome", false, pra2, new List<string> { "NotCheck" });
+ bool success = result.ToLower() == "success";
this.CloseProgressBar();
HdlThreadLogic.Current.RunMain(() =>
@@ -227,7 +226,7 @@
if (listLocalHouse.Count == 1)
{
//濡傛灉鍙湁涓�涓綇瀹�,鍒欒繃鎴蜂箣鍚�,鐩存帴閫�鍒扮櫥闄嗙晫闈�
- HdlAccountLogic.Current.ReLoginAgain(Config.Instance.Account);
+ UserCenterLogic.ReLoginAgain(Config.Instance.Account);
return;
}
else
@@ -258,7 +257,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鍏ㄩ儴鐨勭晫闈�.鐩村埌浣忓畢鍒楄〃鐣岄潰
- HdlFormLogic.Current.CloseAllOpenForm("ResidenceListMainForm");
+ UserCenterLogic.CloseAllOpenForm("ResidenceListMainForm");
});
}
this.CloseProgressBar();
--
Gitblit v1.8.0