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/TransferResidenceResultForm.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs
index a94efde..c0efc0b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs
@@ -92,7 +92,8 @@
if (success == true)
{
string strMsg = Language.StringByID(R.MyInternationalizationString.uCongratulationsXXBecomingNNAdministrator);
- strMsg = strMsg.Replace("{0}", memberResult.MemberName).Replace("{1}", Common.Config.Instance.Home.Name);
+ string userName = string.IsNullOrEmpty(memberResult.UserName) == false ? memberResult.UserName : memberResult.Account;
+ strMsg = strMsg.Replace("{0}", userName).Replace("{1}", Common.Config.Instance.Home.Name);
//鎭枩XXXXX鎴愪负銆孨NNNN銆嶇鐞嗗憳
var btnMsg2 = new NormalViewControl(frameBack.Width - Application.GetRealWidth(100), Application.GetRealHeight(105), false);
--
Gitblit v1.8.0