合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -53,12 +53,18 @@

                 //  读取云端门锁设备中的信息
                 var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

                 if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                 {
                     localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                     localDoorLockObj.IsOtherAccountCtrl = true;
                 }

                 localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                 if (doorLock.DeviceAddr != null)

                 {
                     localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                 }

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

                 if (getDoorLockInfoList != null)
@@ -73,12 +79,18 @@
                             doorLockObj.PrimaryId = curDoorLockUser.Id;
                             doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                             doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                             doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId; doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
                             doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                             doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
                         }
                         else
                         {
                             //门锁中不存在用户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;