From 6f16607efe766271c69a4f3f96fb928fe25f112c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 01 十一月 2019 16:22:13 +0800
Subject: [PATCH] 2019-11-01-2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 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..7059117
--- 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,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()
{
@@ -35,7 +57,8 @@
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
- MidFrameLayoutContent();
+ ReadDoorLockUserInfo();
+
}
public void MidFrameLayoutContent()
@@ -108,6 +131,30 @@
else
{
+ ///澶囨敞锛歐JC鐨�
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
+ Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Phone.Device.Logic.Send.CurrentDoorLock = 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;
@@ -149,4 +196,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0