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 | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
index 0e978d9..194f8d7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs
@@ -41,7 +41,6 @@
{
System.Threading.Tasks.Task.Run(async () =>
{
- //Application.RunOnMainThread(() => {; });
try
{
var localAccountListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LocalAccountList();
@@ -86,6 +85,7 @@
{
MidFrameLayoutContent();
CommonPage.Loading.Hide();
+ midVerticalScrolViewLayout.EndHeaderRefreshing();
});
}
});
@@ -151,14 +151,15 @@
{
};
this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
+
+ CommonPage.Loading.Start("Loading...");
+ ReadAccountDoorLockInfoList();
+
midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
midVerticalScrolViewLayout.BeginHeaderRefreshing();
-
- midVerticalScrolViewLayout.EndHeaderRefreshing();
+ ReadAccountDoorLockInfoList();
};
- CommonPage.Loading.Start("Loading...");
- ReadAccountDoorLockInfoList();
}
/// <summary>
@@ -221,7 +222,7 @@
line2.Visible = false;
}
- if (currentAccount.UserName != null)
+ if (!string.IsNullOrEmpty(currentAccount.UserName))
{
btnText.Text = currentAccount.UserName;
}
--
Gitblit v1.8.0