From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 97ee2c8..a1b16b0 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -28,7 +28,9 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
+ CommonDevice.DebugPrintLog($"11111111111111F");
await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
+ CommonDevice.DebugPrintLog($"11111111111111G");
}
catch { }
finally
@@ -36,6 +38,7 @@
Application.RunOnMainThread(() =>
{
MidFrameLayoutContent();
+ CommonDevice.DebugPrintLog($"11111111111111E");
CommonPage.Loading.Hide();
});
}
@@ -47,6 +50,7 @@
/// </summary>
public void Show()
{
+ CommonDevice.DebugPrintLog($"11111111111111A");
this.TopFrameLayout(this, accountObj.Account);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -56,13 +60,14 @@
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
this.MidFrameLayout(this);
-
+ CommonDevice.DebugPrintLog($"11111111111111B");
ReadDoorLockUserInfo();
-
+ CommonDevice.DebugPrintLog($"11111111111111C");
}
public void MidFrameLayoutContent()
{
+ CommonDevice.DebugPrintLog($"11111111111111D");
var bodyView = new VerticalScrolViewLayout()
{
};
@@ -130,18 +135,20 @@
}
else
{
+
+ ///澶囨敞锛歐JC鐨�
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
- Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
+ Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
+ Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
+ Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
}
if (doorLock == null)
{
///闃叉鎶涘紓甯�
- Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
+ Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
}
///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
Common.Logic.LogicDviceList.Clear();
--
Gitblit v1.8.0