From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index b43c2b8..a2400e0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/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)
{
--
Gitblit v1.8.0