From 653b65a9bd3d3df806f7cbecc767085cd506058d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 14 十一月 2019 16:30:39 +0800
Subject: [PATCH] 2019-11-14-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index b1dafcc..1f83307 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -43,11 +43,20 @@
}
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </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) =>
{
@@ -128,23 +137,31 @@
}
else
{
+
+ ///澶囨敞锛歐JC鐨�
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
- Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
}
if (doorLock == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
}
- var lockLogicList = new Logic.DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(lockLogicList);
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
- lockLogicList.Show();
+ doorLockLogicList.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
@@ -186,4 +203,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0