From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 82b875f..49fb50e 100755
--- 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()
{
};
@@ -129,31 +134,11 @@
unLockMethod.Show();
}
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();
+ {
+ 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