From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 71438e2..ed2c5a7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -1,5 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
+using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
@@ -21,8 +21,29 @@
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鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -36,7 +57,8 @@
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
- MidFrameLayoutContent();
+ ReadDoorLockUserInfo();
+
}
public void MidFrameLayoutContent()
@@ -108,23 +130,10 @@
}
else
{
- ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Logic.DoorLockLogic.DoorLockIfon.UserMemberInfoRes = accountObj;
- Logic.DoorLockLogic.DoorLockIfon.DoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.DoorLockIfon.UserMemberInfoRes = new MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.DoorLockIfon.DoorLock = new ZigBee.Device.DoorLock();
- }
- var doorLockLogicList = new Logic.DoorLockLogic.DoorLockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
+ var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
}
};
btnRight.MouseUpEventHandler += eHandler;
@@ -166,4 +175,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0