From 528c105b3aea0e6e00477365f16f57c1e3d7eb1c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 15:31:28 +0800
Subject: [PATCH] 2019-10-24-3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 da55c58..b1dafcc
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
@@ -20,6 +21,27 @@
Shared.Phone.UserCenter.MemberInfoRes accountObj;
#endregion
+ void ReadDoorLockUserInfo()
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ try
+ {
+ await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ MidFrameLayoutContent();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+
/// <summary>
/// UI鏄剧ず
/// </summary>
@@ -34,8 +56,7 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
- MidFrameLayoutContent();
+ ReadDoorLockUserInfo();
}
public void MidFrameLayoutContent()
@@ -107,7 +128,23 @@
}
else
{
-
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
+ Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
+ Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ }
+ var lockLogicList = new Logic.DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(lockLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ lockLogicList.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
--
Gitblit v1.8.0