From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 9077c94..c69ca44 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -82,14 +82,34 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
- if (Send.UserList.Count == 0)
+
+
+ bool d = false;
+ string macport = common.DeviceAddr + "_" + common.DeviceEpoint.ToString();
+ for (int i = 0; i < Send.LockList.Count; i++)
+ {
+ if (Send.LockList[i].DoorLockMacPort == macport)
+ {
+ ///宸茬粡瀛樺湪璇ラ棬閿佷俊鎭�
+ d = true;
+ break;
+ }
+
+ }
+
+ if (!d)
{
var allMemberslist = await Send.AllMembers(common.DeviceAddr);
- Send.UserList.AddRange(allMemberslist);
+ Send.LockList.AddRange(allMemberslist);
}
- foreach (var user in Send.UserList)
- {
+
+ foreach (var user in Send.LockList)
+ {
+ if (user.DoorLockMacPort != macport)
+ {
+ continue;
+ }
var userFramelayout = new RowLayout
{
Height = Application.GetRealHeight(160),
@@ -111,7 +131,7 @@
var userBtn = new Button
{
- Text = user.MembershipName,
+ Text = user.UserName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
@@ -188,7 +208,7 @@
TextAlignment = TextAlignment.Center,
X = Btncancel.Right + Application.GetRealWidth(100),
TextSize = 16,
- Text = user.MembershipName,
+ Text = user.UserName,
};
lockRow.AddChidren(Btntitle);
var Btncomplete = new Button
@@ -232,27 +252,28 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ Text= userifon.ModeName,
};
doorlockRow.AddChidren(doorlockBtn);
//(1鎸夐敭/3鍗�/15鎸囩汗)
- switch (userifon.OpenMode.ToString())
- {
- case "0":
- {
- doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
- }
- break;
- case "3":
- {
- doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
- }
- break;
- case "15":
- {
- doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
- }
- break;
- }
+ //switch (userifon.OpenMode.ToString())
+ //{
+ // case "0":
+ // {
+ // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
+ // }
+ // break;
+ // case "3":
+ // {
+ // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
+ // }
+ // break;
+ // case "15":
+ // {
+ // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
+ // }
+ // break;
+ //}
var doorlockSelected = new Button
{
X = Application.GetRealWidth(860),
--
Gitblit v1.8.0