合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs

File was renamed from ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/DoorLockIfon.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);