合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -54,6 +54,11 @@

                        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)
                            {
@@ -80,6 +85,10 @@
                                }
                            }
                        }
                    }
                    else
                    {

                    }
                }
                catch { }
@@ -463,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)
                    {