From 63900e8f92ea0c781e57da006099fc034b3661c0 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 16:48:16 +0800
Subject: [PATCH] 2019-12-31-02
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index de49765..6a9b586 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -119,21 +119,29 @@
}
}
- if (!d)
- {
- 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.Start();
+ middle.RemoveAll();
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ if (!d)
+ {
+ var allMemberslist = await Send.AllMembers(macport);
+ Send.LockList.AddRange(allMemberslist);
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ UserList(macport);
+ });
+ }
+ });
}
/// <summary>
/// 鎴愬憳鍒楄〃鐨勬柟娉�
@@ -141,7 +149,6 @@
/// <param name="macport"></param>
public void UserList(string macport)
{
- middle.RemoveAll();
foreach (var user in Send.LockList)
{
if (user.DoorLockMacPort != macport)
@@ -289,6 +296,13 @@
string SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
+ if (user.UserIdMode.Count > 10)
+ {
+ ///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
+ }
+
for (int i = 0; i < user.UserIdMode.Count; i++)
{
var userifon = user.UserIdMode[i];
@@ -436,9 +450,9 @@
{
if (!edit)
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
--
Gitblit v1.8.0