2019-10-31-1

WJC

2019-10-31 d7ad5a3953a8cd001659092ebde204b881f94b9d

 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs

@@ -1361,8 +1361,7 @@
                case DeviceType.DoorLock:
                    {
                        #region  ------
                        var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
                        //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
                        var doorlockifonlist = await Send.UserListIfon(common.DeviceAddr);
                        var pra = new UserCenter.MemberListInfoPra();
                        string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
                        var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
@@ -1376,9 +1375,20 @@
                                ///查找成员以及成员门锁触发源(1按键/3卡/15指纹)
                                if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
                                {
                                    membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
                                    membership.MembershipName = membershipifon.UserName;
                                    var lockMode = new Send.LockMode();
                                    lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId;
                                    lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
                                    membership.UserIdMode.Add(lockMode);
                                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
                                    if (string.IsNullOrEmpty(membershipifon.UserName))
                                    {
                                        membership.MembershipName = membershipifon.Account;
                                    }
                                    else
                                    {
                                        membership.MembershipName = membershipifon.UserName;

                                    }

                                }

@@ -1386,7 +1396,7 @@
                            if (membership.UserIdMode.Count != 0)
                            {
                                ///过滤掉重复数据；
                                var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
                                var str = Send.UserList.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; });
                                if (str == null)
                                {
                                    Send.UserList.Add(membership);