From d7ad5a3953a8cd001659092ebde204b881f94b9d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 31 十月 2019 10:47:13 +0800
Subject: [PATCH] 2019-10-31-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index b1dafcc..97ee2c8 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -43,7 +43,7 @@
}
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -56,7 +56,9 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
+
ReadDoorLockUserInfo();
+
}
public void MidFrameLayoutContent()
@@ -129,22 +131,28 @@
else
{
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
- Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
}
if (doorLock == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = 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 +194,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0