Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -54,13 +54,18 @@

                        foreach (var curAccountObj in doorLock.localAllAccountList)
                        {
                            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("App/GetDoorLockPager", localDoorLockObj);
                            var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                            if (getDoorLockInfoList != null)
                            {
                                foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
@@ -80,6 +85,10 @@
                                }
                            }
                        }
                    }
                    else
                    {

                    }
                }
                catch { }
@@ -120,6 +129,10 @@
            {
                var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
                if (curDoorLockUser.ConnectedAccount != "")
                {
                    continue;
                }
                if (curDoorLockUser.UserID > 245)
                {
                    continue;
                }
@@ -265,7 +278,7 @@
        public void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
        {
            #region  UI
            var flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
            FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
            this.midFrameLayout.AddChidren(flMain);
            flMain.MouseUpEventHandler += (sender11, e11) =>
            {
@@ -459,6 +472,11 @@
                else
                {
                    var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                    {
                        addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                        addLockInfo.IsOtherAccountCtrl = true;
                    }
                    addLockInfo.CloudAccountId = curAccountId;
                    if (doorLock.DeviceAddr != null)
                    {
@@ -502,8 +520,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))
                        {