合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -109,19 +109,107 @@
        }

        /// <summary>
        ///  获取门锁包含设备信息和账户信息
        ///  获取所有账户和门锁包含的信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetDoorLockAllAcountUserlist(ZigBee.Device.DoorLock doorLock)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
                doorLock.localDoorLockUserList.Clear();
                //1、读取门锁信息
                var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();

                //本地门锁列表处理
                foreach (var curAccountObj in doorLock.localAllAccountList)
                {
                    if (getDoorLockInfo == null)
                    {
                        doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
                    }
                    else
                    {
                        doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
                    }
                }
                // 用户信息处理
                if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
                {
                    var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
                    foreach (var doorData in dataList)
                    {
                        var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj()
                        {
                            UserID = doorData.UserId,
                            UnlockType = doorData.UserType
                        };
                        if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false)
                        {
                            doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
                        }
                    }
                    //2、读取云端门锁信息  
                    var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
                    if (getDoorLockInfoList != null)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                        {
                            if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
                            {
                                continue;
                            }
                            if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
                            {
                                var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
                                doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
                                doorLockObj.PrimaryId = curDoorLockUser.Id;
                                doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                                doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                                doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                                doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
                            }
                            else
                            {
                                if (curDoorLockUser.DoorLockLocalUserId != null)
                                {
                                    //门锁中没有，云端有用户ID，后台删除云端这些ID
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                                    }
                                    deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                }
                            }
                        }
                        doorLock.ReSave();
                    }
                }
                return doorLock.localDoorLockUserList;
            }));
        }

        /// <summary>
        ///  获取当前账户中门锁信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLocklist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
             {
                 //  读取设备中的信息
                 //读取设备中的信息
                 doorLock.localDoorLockUserList.Clear();
                 var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
                 if (getDoorLockInfo == null)
                 {
                     doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;

                 }
                 else
                 {
@@ -197,7 +285,7 @@
        }

        /// <summary>
        ///  获取云端存储的门锁信息
        ///  获取当前账户中云端存储的门锁信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetCloudLocalDoorLocklist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        {
@@ -248,7 +336,7 @@
        }

        /// <summary>
        ///  获取云端存储的当前账户的门锁信息
        ///  获取云端存储的当前账户的门锁信
        /// </summary>
        public static async System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>> GetAccountDoorLockUserList(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        {
@@ -304,6 +392,31 @@
        }

        /// <summary>
        ///  获取当前账户门锁的所有信息
        /// </summary>
        public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
            {
                //  读取云端门锁设备中的信息
                var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                {
                    localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                    localDoorLockObj.IsOtherAccountCtrl = true;
                }
                if (doorLock.DeviceAddr != null)
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }

                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                return getDoorLockInfoList;
            }));
        }

        /// <summary>
        ///  获取云端存储的门锁成员信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)