From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 311d28a..bb4f462 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -47,7 +47,16 @@
/// </summary>
public void Show()
{
- this.TopFrameLayout(this, accountObj.Account);
+ string accountTitle = "";
+ if (accountObj.UserName != null)
+ {
+ accountTitle = accountObj.UserName;
+ }
+ else
+ {
+ accountTitle = accountObj.Account;
+ }
+ this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
@@ -56,9 +65,7 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
ReadDoorLockUserInfo();
-
}
public void MidFrameLayoutContent()
@@ -130,18 +137,19 @@
}
else
{
- ///璁板綍褰撳墠鐢ㄦ埛淇℃伅 --娓╁眳鍩�
- Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
- Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ ///澶囨敞锛歐JC鐨�
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
+ Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
}
if (doorLock == null)
{
///闃叉鎶涘紓甯�
- Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
}
///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
Common.Logic.LogicDviceList.Clear();
--
Gitblit v1.8.0