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/DoorLock/MasterManagementPage.cs | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs index c501829..9a3861b 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs @@ -9,7 +9,7 @@ /// 鏋勯�犲嚱鏁� /// </summary> /// <param name="doorLock"></param> - public MasterManagementPage(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj) + public MasterManagementPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj) { this.doorLock = doorLock; this.accountObj = accountObj; @@ -24,7 +24,7 @@ /// <summary> /// 褰撳墠璐︽埛 /// </summary> - MemberInfoRes accountObj; + Shared.Phone.UserCenter.MemberInfoRes accountObj; #endregion /// <summary> @@ -32,7 +32,15 @@ /// </summary> public void Show() { - string accountTitle = accountObj.ShowName; + string accountTitle = ""; + if (accountObj.UserName != null) + { + accountTitle = accountObj.UserName; + } + else + { + accountTitle = accountObj.Account; + } this.TopFrameLayout(this, accountTitle); EventHandler<MouseEventArgs> eHandlerBack = (sender, e) => -- Gitblit v1.8.0