From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/DoorLockIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
similarity index 72%
rename from ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/DoorLockIfon.cs
rename to ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
index 4ffe84f..1d13ab0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/DoorLockIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using Shared;
-namespace Shared.Phone.Logic.DoorLockLogic
+namespace Shared.Phone.Device.Logic.DoorLockLogic
{
- public class DoorLockIfon
+ public class LockIfon
{
/// <summary>
/// 褰撳墠闂ㄩ攣
@@ -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