From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index 02107ae..f896578 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -28,9 +28,7 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
- CommonDevice.DebugPrintLog($"11111111111111F");
await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
- CommonDevice.DebugPrintLog($"11111111111111G");
}
catch { }
finally
@@ -38,7 +36,6 @@
Application.RunOnMainThread(() =>
{
MidFrameLayoutContent();
- CommonDevice.DebugPrintLog($"11111111111111E");
CommonPage.Loading.Hide();
});
}
@@ -50,8 +47,16 @@
/// </summary>
public void Show()
{
- CommonDevice.DebugPrintLog($"11111111111111A");
- this.TopFrameLayout(this, accountObj.Account);
+ string accountTitle = "";
+ if (accountObj.UserName != null)
+ {
+ accountTitle = accountObj.UserName;
+ }
+ else
+ {
+ accountTitle = accountObj.Account;
+ }
+ this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
@@ -60,14 +65,11 @@
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()
{
};
@@ -77,7 +79,8 @@
{
var RowView = new FrameLayout()
{
- Height = Application.GetRealHeight(161),
+ Height = Application.GetRealHeight(127 + 23),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
};
bodyView.AddChidren(RowView);
@@ -122,6 +125,7 @@
else
{
btnMemberName.Text = Language.StringByID(R.MyInternationalizationString.LinkageEvent);
+ line2.Visible = false;
}
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
@@ -134,7 +138,7 @@
unLockMethod.Show();
}
else
- {
+ {
///澶囨敞锛歐JC鐨�
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
@@ -162,7 +166,8 @@
}
};
btnRight.MouseUpEventHandler += eHandler;
- RowView.MouseUpEventHandler += eHandler;
+ RowView.MouseUpEventHandler += eHandler;
+ btnMemberName.MouseUpEventHandler += eHandler;
}
}
--
Gitblit v1.8.0