From e6504e6155818b1e7f35dd4d74d13e02359ceb7e Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 25 十月 2019 16:29:02 +0800
Subject: [PATCH] 2019-10-25-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
index 1552318..1d13ab0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Shared;
-namespace Shared.Phone.Logic.DoorLockLogic
+namespace Shared.Phone.Device.Logic.DoorLockLogic
{
public class LockIfon
{
@@ -22,9 +22,12 @@
{
var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
locaDoorLockObjlist.Clear();
- var userlist = new ZigBee.Device.DoorLock();
- foreach (var dictionary in userlist.localDoorLockUserList)
+ foreach (var dictionary in DoorLock.localDoorLockUserList)
{
+ if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount)) {
+ //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
+ continue;
+ }
var @null = locaDoorLockObjlist.Find((o) => { return o.ConnectedAccount == dictionary.Value.ConnectedAccount; });
if (@null == null)
{
@@ -42,9 +45,13 @@
{
var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
locaDoorLockObjlist.Clear();
- var userlist = new ZigBee.Device.DoorLock();
- foreach (var dictionary in userlist.localDoorLockUserList)
+ foreach (var dictionary in DoorLock.localDoorLockUserList)
{
+ if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount))
+ {
+ //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
+ continue;
+ }
if (dictionary.Value.ConnectedAccount ==SubAccountDistributedMark)
{
locaDoorLockObjlist.Add(dictionary.Value);
--
Gitblit v1.8.0