完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

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

@@ -60,7 +60,7 @@
                                localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                            }

                            var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("App/GetDoorLockPager", localDoorLockObj);
                            var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                            if (getDoorLockInfoList != null)
                            {
                                foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
@@ -120,6 +120,10 @@
            {
                var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
                if (curDoorLockUser.ConnectedAccount != "")
                {
                    continue;
                }
                if (curDoorLockUser.UserID > 245)
                {
                    continue;
                }
@@ -502,8 +506,8 @@
                    }

                    addLockInfo.EntryTime = curDoorLockUser.EntryTime;
                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/AddDoorLock", addLockInfo);
                    if (result.StateCode == "Success")
                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
                    if (result != null && result.StateCode == "Success")
                    {
                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                        {