From 52005ed57f3f7bc796fdd1a878e4f298a126f1e8 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 16:48:47 +0800
Subject: [PATCH] 2019.10.29-3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index a2400e0..180c7d7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -54,18 +54,13 @@
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("DoorLock/GetDoorLockPager", localDoorLockObj);
+ var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("App/GetDoorLockPager", localDoorLockObj);
if (getDoorLockInfoList != null)
{
foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
@@ -86,10 +81,6 @@
}
}
}
- else
- {
-
- }
}
catch { }
finally
@@ -104,7 +95,7 @@
}
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -129,10 +120,6 @@
{
var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
if (curDoorLockUser.ConnectedAccount != "")
- {
- continue;
- }
- if (curDoorLockUser.UserID > 245)
{
continue;
}
@@ -278,7 +265,7 @@
public void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
{
#region UI
- FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
+ var flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
this.midFrameLayout.AddChidren(flMain);
flMain.MouseUpEventHandler += (sender11, e11) =>
{
@@ -410,7 +397,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
rowFrameLayout.AddChidren(btnLine);
- #endregion
+ #endregion
#region 鏁版嵁澶勭悊
int currentIndex = i;
if (currentIndex == localAccountList.Count - 1)
@@ -472,11 +459,6 @@
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)
{
@@ -520,8 +502,8 @@
}
addLockInfo.EntryTime = curDoorLockUser.EntryTime;
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
- if (result != null && result.StateCode == "Success")
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/AddDoorLock", addLockInfo);
+ if (result.StateCode == "Success")
{
if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
{
@@ -628,7 +610,7 @@
btnAllMethod.IsSelected = true;
oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- // 绫诲瀷鍖哄垎
+ // 绫诲瀷鍖哄垎
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
{
RefreshList();
--
Gitblit v1.8.0