From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 1b9661e..da55c58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -1,5 +1,4 @@
锘縰sing System;
-using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
@@ -21,27 +20,6 @@
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>
@@ -57,8 +35,7 @@
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
- ReadDoorLockUserInfo();
-
+ MidFrameLayoutContent();
}
public void MidFrameLayoutContent()
@@ -130,10 +107,7 @@
}
else
{
- 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;
--
Gitblit v1.8.0