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/DoorLockLogic/AddCondition.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 2c95b60..ea49ce1 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -76,25 +76,42 @@
};
this.AddChidren(middle);
-
- if (Send.LinkageventLockList.Count == 0)
+ bool d = false;
+ string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
+ for (int i = 0; i < Send.LockList.Count; i++)
{
- var allMemberslist = await Send.AllMembers(Send.CurrentDoorLock.DeviceAddr);
- Send.LinkageventLockList.AddRange(allMemberslist);
+ if (Send.LockList[i].DoorLockMacPort == macport)
+ {
+ ///宸茬粡瀛樺湪璇ラ棬閿佷俊鎭�
+ d = true;
+ break;
+ }
+
}
- UserAllView(middle);
+
+ if (!d)
+ {
+
+ var allMemberslist = await Send.AllMembers(Send.CurrentDoorLock.DeviceAddr);
+ Send.LockList.AddRange(allMemberslist);
+ }
+ UserAllView(middle, macport);
}
/// <summary>
/// 鏄剧ず鎵�鏈夌敤鎴�
/// </summary>
/// <param name="middle"></param>
- void UserAllView(VerticalScrolViewLayout middle)
+ void UserAllView(VerticalScrolViewLayout middle,string macport)
{
- for (int i = 0; i < Send.LinkageventLockList.Count; i++)
+ for (int i = 0; i < Send.LockList.Count; i++)
{
- var user = Send.LinkageventLockList[i];
+ var user = Send.LockList[i];
+ if (user.DoorLockMacPort != macport)
+ {
+ continue;
+ }
var userFramelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -114,12 +131,12 @@
var usernameBtn = new Button
{
- Text = user.MembershipName,
+ Text = user.UserName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(130),
- Tag = Send.LinkageventLockList[i],
+ Tag = Send.LockList[i],
};
userRow.AddChidren(usernameBtn);
@@ -151,7 +168,7 @@
/// </summary>
/// <param name="membershipIfon">瑙﹀彂婧愬垪琛�</param>
/// <param name="userName">鐢ㄦ埛鍚嶅瓧</param>
- void SelectedUserID(List<Send.LockMode> membershipIfon, string userName) {
+ void SelectedUserID(List<Send.UnlockingMode> membershipIfon, string userName) {
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
@@ -259,28 +276,28 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ Text = userIdmode.ModeName,
};
doorlockRow.AddChidren(doorlockBtn);
//(0鎸夐敭/3鍗�/15鎸囩汗)
- switch (userIdmode.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 (userIdmode.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
--
Gitblit v1.8.0