From e6504e6155818b1e7f35dd4d74d13e02359ceb7e Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 25 十月 2019 16:29:02 +0800
Subject: [PATCH] 2019-10-25-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 71438e2..86f019f 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,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>
@@ -35,8 +56,7 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
- MidFrameLayoutContent();
+ ReadDoorLockUserInfo();
}
public void MidFrameLayoutContent()
@@ -108,23 +128,31 @@
}
else
{
+
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Logic.DoorLockLogic.DoorLockIfon.UserMemberInfoRes = accountObj;
- Logic.DoorLockLogic.DoorLockIfon.DoorLock = doorLock;
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.DoorLockIfon.UserMemberInfoRes = new MemberInfoRes();
+ Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
}
if (doorLock == null)
{
///闃叉鎶涘紓甯�
- Logic.DoorLockLogic.DoorLockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
}
- var doorLockLogicList = new Logic.DoorLockLogic.DoorLockLogicList();
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ 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