合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -242,7 +242,6 @@
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                    int i = 0;
                                }
                            }
                        }
@@ -331,7 +330,6 @@
                                            deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
                                            deleteDoorLockData.DelDoorLockDelType = 2;
                                            var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                            int i = 0;
                                        }
                                    }
                                }
@@ -379,7 +377,10 @@
                {
                    for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
                    {
                        var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
                        var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
                        pageSetting.Page = j + 1;
                        localDoorLockObj.pageSetting = pageSetting;
                        var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                        if (getDoorLockInfoListTemp != null)
                        {
                            if (getDoorLockInfoListTemp.PageData.Count != 0)
@@ -460,7 +461,7 @@
            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() { };

@@ -488,7 +489,10 @@
                {
                    for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
                    {
                        var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
                        var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
                        pageSetting.Page = j + 1;
                        localDoorLockObj.pageSetting = pageSetting;
                        var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                        if (getDoorLockInfoListTemp != null)
                        {
                            getDoorLockInfoAllList.Add(getDoorLockInfoListTemp);