From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 74cbb04..348c207 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -28,7 +28,6 @@
Application.RunOnMainThread(() =>
{
-
});
}
}
@@ -46,17 +45,20 @@
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
- ZigBee.Device.DoorLock doorLock;
- VerticalRefreshLayout bodyView;
+ ZigBee.Device.DoorLock doorLock;//褰撳墠闂ㄩ攣
+ VerticalRefreshLayout bodyView;//鍒锋柊View
Button currentMethod;// 褰撳墠閫夋嫨鐨勬柟寮�
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ Shared.Phone.UserCenter.MemberInfoRes curAccountObj;//褰撳墠璐︽埛
Button entryStatusPic;
Button btnPicTip;
Button btnPicTip1;
- bool isSecondDel;
- FrameLayout blankFrameLayout;
+ bool isSecondDel;//鏄惁浜屾鍒犻櫎
+ FrameLayout blankFrameLayout;//绌烘暟鎹樉绀哄竷灞�
#endregion
+ /// <summary>
+ /// 璇诲彇闂ㄩ攣瀛樺偍鐨勬渶鏂版暟鎹�
+ /// </summary>
void ReadDoorLockUserInfo()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -238,6 +240,9 @@
BlankPicUI();
}
+ /// <summary>
+ /// 绌烘暟鎹甎I鏄剧ず
+ /// </summary>
void BlankPicUI()
{
blankFrameLayout = new FrameLayout
@@ -334,6 +339,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
};
bodyView.AddChidren(frameLayoutRow);
+
int i = 0;
foreach (var curUserId in curAccountDoorLockUserList.Keys)
{
@@ -655,6 +661,20 @@
#endregion
i++;
}
+
+ //閬尅RowLayout澶氫綑鐨勭嚎鏉�
+ for (int j = 0; j < curAccountDoorLockUserList.Keys.Count; j++)
+ {
+ var frameLayoutRowLineHide = new FrameLayout()
+ {
+ Height = 10,
+ Width = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(58),
+ Y = (j + 1) * Application.GetRealHeight(145),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ frameLayoutRow.AddChidren(frameLayoutRowLineHide);
+ }
frameLayoutRow.Height = i * Application.GetRealHeight(150);
}
}
@@ -697,6 +717,8 @@
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
};
sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
@@ -704,7 +726,6 @@
{
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(81),
Y = Application.GetRealHeight(55),
};
rowFrameLayout.AddChidren(btnAllMethod);
@@ -713,7 +734,7 @@
{
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(92),
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
--
Gitblit v1.8.0