From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 386 ++++++++++++++++++++++++++----------------------------
1 files changed, 186 insertions(+), 200 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index cd61dfd..71d7f2e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -120,7 +120,7 @@
bool? IsDoorLockNormallyMode = null;
var result = await doorLock.ReadNormallyOpenModeFuncAsync();
//鍏遍�氶敊璇娴�
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (result == null || result.errorMessageBase != null || result.errorResponData != null)
{
@@ -147,8 +147,8 @@
{
var listDevice = new List<CommonDevice> { };
listDevice.Add(doorLock);
- var devTemp = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
{
return true;
}
@@ -182,7 +182,7 @@
public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null, int type = 0)
{
//甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
Application.RunOnMainThread(() =>
{
@@ -377,54 +377,54 @@
};
}
- /// <summary>
- /// 鍒犻櫎甯稿紑妯″紡
- /// </summary>
- /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
- /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
- {
- //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
- if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
- {
- action?.Invoke();
- return false;
- }
-
- if (result.defaultControlResponseData.status == 0)
- {
- //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
- NormallyOpenModeValue(doorLock, false);
- action?.Invoke();
- return true;
- }
- return false;
- }
-
- /// <summary>
- /// 璁剧疆甯稿紑妯″紡
- /// </summary>
- /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
- /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
- {
- //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
- if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
- {
- return false;
- }
-
- if (result.defaultControlResponseData.status == 0)
- {
- //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
- NormallyOpenModeValue(doorLock, false);
- return true;
- }
- return false;
+ /// <summary>
+ /// 鍒犻櫎甯稿紑妯″紡
+ /// </summary>
+ /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+ /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
+ {
+ //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+ {
+ action?.Invoke();
+ return false;
+ }
+
+ if (result.defaultControlResponseData.status == 0)
+ {
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+ NormallyOpenModeValue(doorLock, false);
+ action?.Invoke();
+ return true;
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 璁剧疆甯稿紑妯″紡
+ /// </summary>
+ /// <param name="doorLock">褰撳墠闂ㄩ攣</param>
+ /// <param name="action">鍥炶皟澶勭悊鏇存柊鍐呭</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+ if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
+ {
+ return false;
+ }
+
+ if (result.defaultControlResponseData.status == 0)
+ {
+ //app璁剧疆鈥滃父寮�妯″紡鈥濇垚鍔�
+ NormallyOpenModeValue(doorLock, false);
+ return true;
+ }
+ return false;
}
/// <summary>
@@ -435,7 +435,7 @@
public static async void NomallyOpenModeStartDialog(ZigBee.Device.DoorLock doorLock, Action action)
{
//甯稿紑妯″紡鍙兘涓讳汉鎿嶄綔ZigBee.Device.DoorLock doorLock
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
Application.RunOnMainThread(() =>
{
@@ -524,8 +524,8 @@
{
var listDevice = new List<CommonDevice> { };
listDevice.Add(doorLock);
- var devTemp = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
{
return true;
}
@@ -594,56 +594,55 @@
/// <summary>
/// 鑾峰彇褰撳墠璐︽埛鍒楄〃锛堥棬閿佸彧瀵逛富浜哄拰鎷ユ湁绠＄悊鍛樻潈闄愬鎴愬憳鐢級
/// </summary>
- public static async System.Threading.Tasks.Task<List<MemberInfoRes>> LocalAccountList()
+ public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> LocalAccountList()
{
return await System.Threading.Tasks.Task.Run(async () =>
{
- List<MemberInfoRes> localAccountList = new List<MemberInfoRes> { };
- List<MemberInfoRes> SubAccounList = new List<MemberInfoRes> { };
+ 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.ResidenceOption.AuthorityNo == 1)
- //{
- // var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
- // var SubAccounListDictionary = new Dictionary<string, MemberInfoRes> { };
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ {
+ var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
+ var SubAccounListDictionary = new Dictionary<string, Shared.Phone.UserCenter.MemberInfoRes> { };
- // if (SubAccounListTemp != null)
- // {
- // foreach (var member in SubAccounListTemp)
- // {
- // //鍒ゆ柇涓�涓处鎴风粦瀹氫簡閭鐨勬儏鍐�
- // if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
- // || member.Account == UserCenterResourse.UserInfo.UserPhone
- // || member.Account == UserCenterResourse.UserInfo.UserEmail)
- // {
- // //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず,璐︽埛鍜岀粦瀹氱殑閭鍙樉绀哄叾涓箣涓�
- // continue;
- // }
- // //鍘绘帀瀛愯处鎴蜂腑鏅�氭垚鍛橈紝鐣欎笅鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳
- // //锛堝洜涓哄垎閰嶈处鎴风粰鏅�氭垚鍛橈紝鏅�氭垚鍛樺湪app涓笉鑳借繘鍏ヨ澶囩鐞嗛偅閲岋紝鎵�浠ユ病鍙戞煡鐪嬩富浜哄垎閰嶅璐︽埛锛�
- // if (member.AccountType != 1)
- // {
- // continue;
- // }
+ if (SubAccounListTemp != null)
+ {
+ foreach (var member in SubAccounListTemp)
+ {
+ //鍒ゆ柇涓�涓处鎴风粦瀹氫簡閭鐨勬儏鍐�
+ if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
+ || member.Account == UserCenterResourse.UserInfo.Phone
+ || member.Account == UserCenterResourse.UserInfo.Email)
+ {
+ //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず,璐︽埛鍜岀粦瀹氱殑閭鍙樉绀哄叾涓箣涓�
+ continue;
+ }
+ //鍘绘帀瀛愯处鎴蜂腑鏅�氭垚鍛橈紝鐣欎笅鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳
+ //锛堝洜涓哄垎閰嶈处鎴风粰鏅�氭垚鍛橈紝鏅�氭垚鍛樺湪app涓笉鑳借繘鍏ヨ澶囩鐞嗛偅閲岋紝鎵�浠ユ病鍙戞煡鐪嬩富浜哄垎閰嶅璐︽埛锛�
+ if (member.AccountType != 1)
+ {
+ continue;
+ }
+
+ SubAccounListDictionary.Add(member.DistributedMark, member);
+ }
+ }
+ foreach (var addMemberID in SubAccounListDictionary.Keys)
+ {
+ SubAccounList.Add(SubAccounListDictionary[addMemberID]);
+ }
+ }
- // SubAccounListDictionary.Add(member.DistributedMark, member);
- // }
- // }
- // foreach (var addMemberID in SubAccounListDictionary.Keys)
- // {
- // SubAccounList.Add(SubAccounListDictionary[addMemberID]);
- // }
- //}
-
- //// 娉ㄦ剰锛歋ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤,鈥滄坊鍔犻棬閿佲�濆埌浜戠淇℃伅涓紝CloudAccountId濡傛灉鏄瓙璐︽埛锛屽垯鏄疭ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤锛屽鏋滄槸绠＄悊鍛樻垨鑰呬富浜哄垯鏄櫥褰曞埌G
- //var masterAccount = new MemberInfoRes();
- //masterAccount.Account = Shared.Common.Config.Instance.Account;
- //masterAccount.AccountType = Shared.Common.Config.Instance.AccountType;
- //masterAccount.SubAccountDistributedMark = Shared.Common.Config.Instance.Guid;
- //masterAccount.UserName = UserCenterResourse.UserInfo.NickName;
- //localAccountList.Add(masterAccount);
- //localAccountList.AddRange(SubAccounList);
+ // 娉ㄦ剰锛歋ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤,鈥滄坊鍔犻棬閿佲�濆埌浜戠淇℃伅涓紝CloudAccountId濡傛灉鏄瓙璐︽埛锛屽垯鏄疭ubAccountDistributedMark杩欎釜鍊煎緢鏈夌敤锛屽鏋滄槸绠＄悊鍛樻垨鑰呬富浜哄垯鏄櫥褰曞埌G
+ var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
+ masterAccount.Account = Shared.Common.Config.Instance.Account;
+ masterAccount.AccountType = Shared.Common.Config.Instance.AccountType;
+ masterAccount.SubAccountDistributedMark = Shared.Common.Config.Instance.Guid;
+ masterAccount.UserName = UserCenterResourse.UserInfo.UserName;
+ localAccountList.Add(masterAccount);
+ localAccountList.AddRange(SubAccounList);
return localAccountList;
});
}
@@ -658,19 +657,18 @@
//1銆佽鍙栭棬閿佷俊鎭�
var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
- //鈽嗐優銉笺偗鈽�
//鏈湴闂ㄩ攣鍒楄〃澶勭悊
- //foreach (var curAccountObj in doorLock.localAllAccountList)
- //{
- // if (getDoorLockInfo == null)
- // {
- // doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
- // }
- // else
- // {
- // doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
- // }
- //}
+ foreach (var curAccountObj in doorLock.localAllAccountList)
+ {
+ if (getDoorLockInfo == null)
+ {
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
+ }
+ else
+ {
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
+ }
+ }
// 鐢ㄦ埛淇℃伅澶勭悊
if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
{
@@ -743,9 +741,9 @@
{
//闂ㄩ攣涓病鏈夛紝浜戠鏈夌敤鎴稩D锛屽悗鍙板垹闄や簯绔繖浜汭D
var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
deleteDoorLockData.IsOtherAccountCtrl = true;
}
if (doorLock.DeviceAddr != null)
@@ -769,7 +767,7 @@
/// <summary>
/// 鑾峰彇褰撳墠璐︽埛涓棬閿佷俊鎭�
/// </summary>
- public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLocklist(ZigBee.Device.DoorLock doorLock, MemberInfoRes curAccountObj)
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLocklist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
{
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
{
@@ -778,13 +776,11 @@
var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
if (getDoorLockInfo == null)
{
- //鈽嗐優銉笺偗鈽�
- //doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
}
else
{
- //鈽嗐優銉笺偗鈽�
- //doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
+ doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
{
var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
@@ -802,58 +798,57 @@
}
}
- //鈽嗐優銉笺偗鈽�
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
- //var getDoorLockInfoAllList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
- //if (getDoorLockInfoAllList.Count != 0)
- //{
- // foreach (var getDoorLockInfoList in getDoorLockInfoAllList)
- // {
- // if (getDoorLockInfoList != null)
- // {
- // foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
- // {
- // if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
- // {
- // continue;
- // }
- // if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
- // {
- // var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- // doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
- // doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
- // doorLockObj.PrimaryId = curDoorLockUser.Id;
- // doorLockObj.EntryTime = curDoorLockUser.EntryTime;
- // doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
- // doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
- // doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
- // }
- // else
- // {
- // if (curDoorLockUser.DoorLockLocalUserId != null)
- // {
- // //闂ㄩ攣涓病鏈夛紝浜戠鏈夌敤鎴稩D锛屽悗鍙板垹闄や簯绔繖浜汭D
- // var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
- // {
- // //deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- // deleteDoorLockData.IsOtherAccountCtrl = true;
- // }
- // if (doorLock.DeviceAddr != null)
- // {
- // deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- // }
- // deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
- // deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
- // deleteDoorLockData.DelDoorLockDelType = 2;
- // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- // }
- // }
- // }
- // doorLock.ReSave();
- // }
- // }
- //}
+ var getDoorLockInfoAllList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
+ if (getDoorLockInfoAllList.Count != 0)
+ {
+ foreach (var getDoorLockInfoList in getDoorLockInfoAllList)
+ {
+ if (getDoorLockInfoList != null)
+ {
+ foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
+ {
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
+ {
+ continue;
+ }
+ if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
+ {
+ var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
+ doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
+ doorLockObj.PrimaryId = curDoorLockUser.Id;
+ doorLockObj.EntryTime = curDoorLockUser.EntryTime;
+ doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
+ doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
+ doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
+ }
+ else
+ {
+ if (curDoorLockUser.DoorLockLocalUserId != null)
+ {
+ //闂ㄩ攣涓病鏈夛紝浜戠鏈夌敤鎴稩D锛屽悗鍙板垹闄や簯绔繖浜汭D
+ var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
+ deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
+ deleteDoorLockData.DelDoorLockDelType = 2;
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
+ }
+ }
+ }
+ doorLock.ReSave();
+ }
+ }
+ }
}
return doorLock.localDoorLockUserList;
}));
@@ -870,9 +865,9 @@
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
localDoorLockObj.IsOtherAccountCtrl = true;
}
@@ -982,10 +977,9 @@
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鈽嗐優銉笺偗鈽�
- //localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
localDoorLockObj.IsOtherAccountCtrl = true;
}
@@ -1039,10 +1033,9 @@
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鈽嗐優銉笺偗鈽�
- //localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
localDoorLockObj.IsOtherAccountCtrl = true;
}
if (doorLock.DeviceAddr != null)
@@ -1060,20 +1053,18 @@
/// <summary>
/// 鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭�
/// </summary>
- public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, MemberInfoRes curAccountObj, int curPage)
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int curPage)
{
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
{
// 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- ////鈽嗐優銉笺偗鈽�
- //localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
localDoorLockObj.IsOtherAccountCtrl = true;
}
- //鈽嗐優銉笺偗鈽�
- //localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
{
localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
}
@@ -1116,7 +1107,7 @@
/// <summary>
/// 鑾峰彇鏈湴鍖归厤鎴愬憳鐨勯棬閿佺敤鎴蜂俊鎭垪琛�
/// </summary>
- public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, MemberInfoRes curAccountObj)
+ public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetMatchDoorlockAccountList(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
{
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
{
@@ -1125,15 +1116,14 @@
{
var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];
- //鈽嗐優銉笺偗鈽�
- //if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
- //{
- // continue;
- //}
- //else
- //{
- // curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
- //}
+ if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+ {
+ continue;
+ }
+ else
+ {
+ curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
+ }
}
return curAccountDoorLockUserList;
}));
@@ -1237,11 +1227,7 @@
{
/// <summary>
/// 鐢ㄦ埛id
- /// <para>绠＄悊鍛�10涓紝0~9锛�</para>
- ///<para>鏅�氱敤鎴�220涓紝10~234</para>
- ///<para>涓�娆℃�х敤鎴�10涓紝235~245</para>
- ///<para>涓存椂瀵嗙爜瀵嗙爜10涓紝245~255锛�</para>
- ///<para>鍏朵腑鎸囩汗100锛屽瘑鐮�100锛屽崱56</para>
+ /// <para>绠＄悊鍛�10涓紝0~9锛�</para>
///<para>鏅�氱敤鎴�220涓紝10~234</para>
///<para>涓�娆℃�х敤鎴�10涓紝235~245</para>
///<para>涓存椂瀵嗙爜瀵嗙爜10涓紝245~255锛�</para>
///<para>鍏朵腑鎸囩汗100锛屽瘑鐮�100锛屽崱56</para>
///<para>闂ㄩ攣鏈湴褰曞叆鐨勫瘑鐮併�佹寚绾广�佹劅搴斿崱閮芥湁鍞竴瀵瑰簲鐨勭敤鎴稩d</para>
/// </summary>
public int UserID = -1;
@@ -1265,9 +1251,9 @@
/// 闂ㄩ攣褰曞叆鐨勬椂
/// </summary>
public DateTime EntryTime = System.DateTime.MinValue;
- /// <summary>
- /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
- /// </summary>
+ /// <summary>
+ /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
+ /// </summary>
public string PrimaryId = "";
}
--
Gitblit v1.8.0