From 0480792bde7bcf770290ba3414bd615e563e7b43 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 24 十二月 2019 15:46:00 +0800
Subject: [PATCH] 2019-12-24-02
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c387b1c..de49765 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -18,7 +18,6 @@
VerticalRefreshLayout middle;
CommonDevice common;
Dictionary<string, string> editdeviceConditionsInfo;
-
public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null)
{
common = commondevice;
@@ -44,6 +43,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.userlist,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -92,6 +92,7 @@
{
///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
Send.LockList.Remove(Send.LockList[i]);
+ i--;
}
}
Read();
@@ -103,7 +104,7 @@
/// <summary>
/// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
/// </summary>
- public async void Read()
+ public void Read()
{
bool d = false;
@@ -118,14 +119,21 @@
}
}
- CommonPage.Loading.Start();
if (!d)
{
- var allMemberslist = await Send.AllMembers(common.DeviceAddr);
- Send.LockList.AddRange(allMemberslist);
+ CommonPage.Loading.Start();
+ new System.Threading.Thread(async () =>
+ {
+ var allMemberslist = await Send.AllMembers(macport);
+ Send.LockList.AddRange(allMemberslist);
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ })
+ { IsBackground = true }.Start();
}
UserList(macport);
- CommonPage.Loading.Hide();
}
/// <summary>
/// 鎴愬憳鍒楄〃鐨勬柟娉�
@@ -133,7 +141,7 @@
/// <param name="macport"></param>
public void UserList(string macport)
{
-
+ middle.RemoveAll();
foreach (var user in Send.LockList)
{
if (user.DoorLockMacPort != macport)
--
Gitblit v1.8.0