From 72e1b4e4626315ebd4b879a68c94e7738fd0473e Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 11:00:28 +0800
Subject: [PATCH] 2019-10-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index b1dafcc..86f019f 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -128,23 +128,31 @@
}
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;
--
Gitblit v1.8.0