From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index db92327..194f8d7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -31,14 +31,16 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;
- VerticalScrolViewLayout midVerticalScrolViewLayout;
+ VerticalRefreshLayout midVerticalScrolViewLayout;
#endregion
- void ReadAccountList()
+ /// <summary>
+ /// 鏁版嵁鍒锋柊
+ /// </summary>
+ void ReadAccountDoorLockInfoList()
{
System.Threading.Tasks.Task.Run(async () =>
{
- Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
var localAccountListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LocalAccountList();
@@ -46,9 +48,10 @@
{
doorLock.localAllAccountList.Clear();
doorLock.localAllAccountList = localAccountListTemp;
+
+ //鍒濆鍖栨潈闄愪俊鎭�
foreach (var sub in localAccountListTemp)
{
- //鍒濆鍖栨潈闄愪俊鎭�
if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
{
doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
@@ -62,6 +65,9 @@
doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
}
}
+
+ //鑾峰彇鏈湴闂ㄩ攣鍒楄〃
+ var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
doorLock.ReSave();
}
else
@@ -79,11 +85,15 @@
{
MidFrameLayoutContent();
CommonPage.Loading.Hide();
+ midVerticalScrolViewLayout.EndHeaderRefreshing();
});
}
});
}
+ /// <summary>
+ /// 鏄剧ず鐣岄潰
+ /// </summary>
public void Show()
{
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.UserManagement));
@@ -137,13 +147,24 @@
btnAddFrameLayout.MouseDownEventHandler += eHandler;
btnUndistributeText.MouseDownEventHandler += eHandler;
btnUndistributeIcon.MouseDownEventHandler += eHandler;
- midVerticalScrolViewLayout = new VerticalScrolViewLayout()
+ midVerticalScrolViewLayout = new VerticalRefreshLayout()
{
};
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
- ReadAccountList();
+
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+
+ midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
+ {
+ midVerticalScrolViewLayout.BeginHeaderRefreshing();
+ ReadAccountDoorLockInfoList();
+ };
}
+ /// <summary>
+ /// 涓儴甯冨眬鏄剧ず
+ /// </summary>
async void MidFrameLayoutContent()
{
midVerticalScrolViewLayout.RemoveAll();
@@ -201,7 +222,7 @@
line2.Visible = false;
}
- if (currentAccount.UserName != null)
+ if (!string.IsNullOrEmpty(currentAccount.UserName))
{
btnText.Text = currentAccount.UserName;
}
--
Gitblit v1.8.0