From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index e31c7df..c501829 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, Shared.Phone.UserCenter.MemberInfoRes accountObj)
+ public MasterManagementPage(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
{
this.doorLock = doorLock;
this.accountObj = accountObj;
@@ -24,7 +24,7 @@
/// <summary>
/// 褰撳墠璐︽埛
/// </summary>
- Shared.Phone.UserCenter.MemberInfoRes accountObj;
+ MemberInfoRes accountObj;
#endregion
/// <summary>
@@ -32,15 +32,7 @@
/// </summary>
public void Show()
{
- string accountTitle = "";
- if (accountObj.UserName != null)
- {
- accountTitle = accountObj.UserName;
- }
- else
- {
- accountTitle = accountObj.Account;
- }
+ string accountTitle = accountObj.ShowName;
this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -133,8 +125,8 @@
}
else
{
- ///澶囨敞锛歐JC鐨�
- ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅H06C
+ ///wjc
Shared.Phone.Device.Logic.SkipView.SkipAddLogic(1, doorLock, accountObj);
}
--
Gitblit v1.8.0