From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 2d57e62..f7d429f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -90,10 +90,36 @@
{
List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+
//鍙湁涓讳汉鎵嶆湁鏉冮檺鑾峰彇鑷繁鐨勫瓙璐︽埛
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
- SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
+ var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
+ var SubAccounListDictionary = new Dictionary<string, Shared.Phone.UserCenter.MemberInfoRes> { };
+
+ foreach (var member in SubAccounListTemp)
+ {
+ //鍒ゆ柇涓�涓处鎴风粦瀹氫簡閭鐨勬儏鍐�
+ if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
+ || member.Account == UserCenterResourse.UserInfo.Phone
+ || member.Account == UserCenterResourse.UserInfo.Email)
+ {
+ //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず
+ continue;
+ }
+ //鍘绘帀瀛愯处鎴蜂腑鏅�氭垚鍛橈紝鐣欎笅鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳
+ if (member.AccountType != 1)
+ {
+ continue;
+ }
+
+ SubAccounListDictionary.Add(member.DistributedMark, member);
+ }
+
+ foreach (var addMemberID in SubAccounListDictionary.Keys)
+ {
+ SubAccounList.Add(SubAccounListDictionary[addMemberID]);
+ }
}
// 娉ㄦ剰锛歋ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤,鈥滄坊鍔犻棬閿佲�濆埌浜戠淇℃伅涓紝CloudAccountId濡傛灉鏄瓙璐︽埛锛屽垯鏄疭ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤锛屽鏋滄槸绠＄悊鍛樻垨鑰呬富浜哄垯鏄櫥褰曞埌G
@@ -115,7 +141,6 @@
{
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
{
- doorLock.localDoorLockUserList.Clear();
//1銆佽鍙栭棬閿佷俊鎭�
var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
@@ -134,6 +159,7 @@
// 鐢ㄦ埛淇℃伅澶勭悊
if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
{
+ doorLock.localDoorLockUserList.Clear();
var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
foreach (var doorData in dataList)
{
--
Gitblit v1.8.0