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 | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
old mode 100755
new mode 100644
index 1b9661e..97ee2c8
--- 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()
{
@@ -130,10 +130,29 @@
}
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;
@@ -175,4 +194,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0