From 0f5a53c7b36c27a0f2bec12e6119207edb6860f8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:29:21 +0800
Subject: [PATCH] 修改主页卡死问题
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 1b9661e..311d28a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -129,11 +129,30 @@
unLockMethod.Show();
}
else
- {
- var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ {
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅 --娓╁眳鍩�
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ }
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ 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;
+ doorLockLogicList.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
--
Gitblit v1.8.0