From 7fa61a2e8415f8dd862aad5541d323c9c51c45c5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:29 +0800
Subject: [PATCH] 2019.10.29
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index 9727d69..a2400e0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/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)
@@ -81,6 +86,10 @@
}
}
}
+ else
+ {
+
+ }
}
catch { }
finally
@@ -95,7 +104,7 @@
}
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -120,6 +129,10 @@
{
var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
if (curDoorLockUser.ConnectedAccount != "")
+ {
+ continue;
+ }
+ if (curDoorLockUser.UserID > 245)
{
continue;
}
@@ -397,7 +410,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
rowFrameLayout.AddChidren(btnLine);
- #endregion
+ #endregion
#region 鏁版嵁澶勭悊
int currentIndex = i;
if (currentIndex == localAccountList.Count - 1)
@@ -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))
{
@@ -610,7 +628,7 @@
btnAllMethod.IsSelected = true;
oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- // 绫诲瀷鍖哄垎
+ // 绫诲瀷鍖哄垎
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
{
RefreshList();
--
Gitblit v1.8.0