代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -82,7 +82,7 @@
        }

        /// <summary>
        ///  获取当前账户列表
        ///  获取当前账户列表（门锁只对主人和拥有管理员权限对成员用）
        /// </summary>
        public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> LocalAccountList()
        {
@@ -104,10 +104,11 @@
                        || member.Account == UserCenterResourse.UserInfo.Phone
                        || member.Account == UserCenterResourse.UserInfo.Email)
                        {
                            //如果是它自己的话，不显示
                            //如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一
                            continue;
                        }
                        //去掉子账户中普通成员，留下拥有管理员权限的成员
                        //（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）
                        if (member.AccountType != 1)
                        {
                            continue;
@@ -173,11 +174,39 @@
                            doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
                        }
                    }


                    //2、读取云端门锁信息  
                    var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
                    var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
                    if (getDoorLockInfoList != null)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                        if (getDoorLockInfoList.PageData.Count != 0)
                        {
                            getDoorLockInfoAllList = getDoorLockInfoList.PageData;
                        }
                    }
                    if (getDoorLockInfoList.TotalPages > 1)
                    {
                        for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
                        {
                            var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
                            if (getDoorLockInfoListTemp != null)
                            {
                                if (getDoorLockInfoListTemp.PageData.Count != 0)
                                {
                                    foreach (var curDoorLockUser in getDoorLockInfoListTemp.PageData)
                                    {
                                        getDoorLockInfoAllList.Add(curDoorLockUser);
                                    }
                                }
                            }
                        }
                    }

                    if (getDoorLockInfoAllList.Count != 0)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoAllList)
                        {
                            if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
                            {
@@ -213,6 +242,7 @@
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                    int i = 0;
                                }
                            }
                        }
@@ -258,8 +288,11 @@
                     }

                     //  读取云端门锁设备中的信息
                     var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
                     var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
                    var getDoorLockInfoAllList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
                    if (getDoorLockInfoAllList.Count != 0)
                    {
                        foreach (var getDoorLockInfoList in getDoorLockInfoAllList)
                        {
                     if (getDoorLockInfoList != null)
                     {
                         foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
@@ -304,7 +337,8 @@
                         }
                         doorLock.ReSave();
                     }

                        }
                    }
                 }
                 return doorLock.localDoorLockUserList;
             }));
@@ -317,6 +351,7 @@
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
                var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
                //  读取云端门锁设备中的信息
                var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

@@ -333,10 +368,34 @@
                }

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

                if (getDoorLockInfoList != null)
                {
                    foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                    if (getDoorLockInfoList.PageData.Count != 0)
                    {
                        getDoorLockInfoAllList = getDoorLockInfoList.PageData;
                    }
                }
                if (getDoorLockInfoList.TotalPages > 1)
                {
                    for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
                    {
                        var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
                        if (getDoorLockInfoListTemp != null)
                        {
                            if (getDoorLockInfoListTemp.PageData.Count != 0)
                            {
                                foreach (var curDoorLockUser in getDoorLockInfoListTemp.PageData)
                                {
                                    getDoorLockInfoAllList.Add(curDoorLockUser);
                                }
                            }
                        }
                    }
                }

                if (getDoorLockInfoAllList.Count != 0)
                {
                    foreach (var curDoorLockUser in getDoorLockInfoAllList)
                    {
                        if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
                        {
@@ -370,8 +429,10 @@
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>>>)(async () =>
            {
                //  读取云端门锁设备中的信息
                var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, subAccountDistributedMark);
                if (getDoorLockInfoList != null)
                var getAllDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, subAccountDistributedMark);
                if (getAllDoorLockInfoList != null)
                {
                    foreach (var getDoorLockInfoList in getAllDoorLockInfoList)
                {
                    //获取云端存储的门锁成员信息
                    foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
@@ -386,6 +447,7 @@
                        }
                    }
                }
                }
                return curAccountDoorLockUserList;
            }));
        }
@@ -393,10 +455,12 @@
        /// <summary>
        ///  获取当前账户门锁的所有信息
        /// </summary>
        public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllInfolist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        public static async System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.GetDoorLockDataRes>> GetDoorLockAllInfolist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.GetDoorLockDataRes>>>)(async () =>
           {
                var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.GetDoorLockDataRes> { };
                int curPage = 1;
               //  读取云端门锁设备中的信息
               var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

@@ -413,14 +477,32 @@
               }

               var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
               return getDoorLockInfoList;
                if (getDoorLockInfoList != null)
                {
                    if (getDoorLockInfoList.PageData.Count != 0)
                    {
                        getDoorLockInfoAllList.Add(getDoorLockInfoList);
                    }
                }
                if (getDoorLockInfoList.TotalPages > 1)
                {
                    for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
                    {
                        var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
                        if (getDoorLockInfoListTemp != null)
                        {
                            getDoorLockInfoAllList.Add(getDoorLockInfoListTemp);
                        }
                    }
                }
                return getDoorLockInfoAllList;
           }));
        }

        /// <summary>
        ///  获取当前账户门锁的所有信息
        /// </summary>
        public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock)
        public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock, int curPage = 1)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
            {
@@ -436,7 +518,9 @@
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }

                var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
                pageSetting.Page = curPage;
                localDoorLockObj.pageSetting = pageSetting;
                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                return getDoorLockInfoList;
            }));
@@ -445,7 +529,7 @@
        /// <summary>
        ///  获取云端存储的门锁成员信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
@@ -460,6 +544,13 @@
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }
                if (doorLock.DeviceAddr != null)
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }
                var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
                pageSetting.Page = curPage;
                localDoorLockObj.pageSetting = pageSetting;
                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                if (getDoorLockInfoList != null)
                {