~wjc/HomeApp.git

			@@ -9,19 +9,61 @@
			public class DoorLockCommonInfo : CommonDevice
			{
			#region 本地变量
			/// <summary>
			/// 是否支持修改
			/// </summary>
			public static bool IsModify = false;
			/// <summary>
			/// 是否显示临时密码
			/// </summary>
			public static bool InTempPasswordVisiable = false;
			/// <summary>
			/// 有效日期“年”
			/// </summary>
			public static int ValidDateYear = 0;
			/// <summary>
			/// 有效日期“月”
			/// </summary>
			public static int ValidDateMonth = 0;
			/// <summary>
			/// 有效日期“日”
			/// </summary>
			public static int ValidDateDay = 0;
			/// <summary>
			/// 有效日期“时”
			/// </summary>
			public static int ValidDateHour = 100;
			/// <summary>
			/// 有效日期“分”
			/// </summary>
			public static int ValidDateMinute = 100;
			/// <summary>
			/// 有效日期“秒”
			/// </summary>
			public static int ValidDateSecond = 0;
			/// <summary>
			/// 失效效日期“年”
			/// </summary>
			public static int InValidDateYear = 0;
			/// <summary>
			/// 失效效日期“月”
			/// </summary>
			public static int InValidDateMonth = 0;
			/// <summary>
			/// 失效效日期“日”
			/// </summary>
			public static int InValidDateDay = 0;
			/// <summary>
			/// 失效效日期“时”
			/// </summary>
			public static int InValidDateHour = 100;
			/// <summary>
			/// 失效效日期“分”
			/// </summary>
			public static int InValidDateMinute = 100;
			/// <summary>
			/// 失效效日期“秒”
			/// </summary>
			public static int InValidDateSecond = 0;
			#endregion

			@@ -82,7 +124,7 @@
			}

			/// <summary>
			/// 获取当前账户列表
			/// 获取当前账户列表（门锁只对主人和拥有管理员权限对成员用）
			/// </summary>
			public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> LocalAccountList()
			{
			@@ -90,10 +132,37 @@
			{
			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;
			}
			//去掉子账户中普通成员，留下拥有管理员权限的成员
			//（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）
			if (member.AccountType != 1)
			{
			continue;
			}

			SubAccounListDictionary.Add(member.DistributedMark, member);
			}

			foreach (var addMemberID in SubAccounListDictionary.Keys)
			{
			SubAccounList.Add(SubAccounListDictionary[addMemberID]);
			}
			}

			// 注意：SubAccountDistributedMark这个值很有用,“添加门锁”到云端信息中，CloudAccountId如果是子账户，则是SubAccountDistributedMark这个值很有用，如果是管理员或者主人则是登录到G
			@@ -147,13 +216,41 @@
			doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
			}
			}


			//2、读取云端门锁信息
			var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
			var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
			if (getDoorLockInfoList != null)
			{
			foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
			if (getDoorLockInfoList.PageData.Count != 0)
			{
			if (curDoorLockUser.DoorLockLocalUserId == null \|\| curDoorLockUser.DoorLockLocalUserId == "")
			getDoorLockInfoAllList = getDoorLockInfoList.PageData;
			}
			}
			if (getDoorLockInfoList.TotalPages > 1)
			{
			for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
			{
			var getDoorLockInfoListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock, j + 1);
			if (getDoorLockInfoListTemp != null)
			{
			if (getDoorLockInfoListTemp.PageData.Count != 0)
			{
			foreach (var curDoorLockUser in getDoorLockInfoListTemp.PageData)
			{
			getDoorLockInfoAllList.Add(curDoorLockUser);
			}
			}
			}
			}
			}

			if (getDoorLockInfoAllList.Count != 0)
			{
			foreach (var curDoorLockUser in getDoorLockInfoAllList)
			{
			if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
			{
			continue;
			}
			@@ -232,13 +329,16 @@
			}

			// 读取云端门锁设备中的信息
			var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
			var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, curAccountObj.SubAccountDistributedMark);
			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 (curDoorLockUser.DoorLockLocalUserId == null \|\| curDoorLockUser.DoorLockLocalUserId == "")
			if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
			{
			continue;
			}
			@@ -272,13 +372,13 @@
			deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			int i = 0;
			}
			}
			}
			doorLock.ReSave();
			}

			}
			}
			}
			return doorLock.localDoorLockUserList;
			}));
			@@ -291,6 +391,7 @@
			{
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
			{
			var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
			// 读取云端门锁设备中的信息
			var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

			@@ -307,12 +408,39 @@
			}

			var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);

			if (getDoorLockInfoList != null)
			{
			foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
			if (getDoorLockInfoList.PageData.Count != 0)
			{
			if (curDoorLockUser.DoorLockLocalUserId == null \|\| curDoorLockUser.DoorLockLocalUserId == "")
			getDoorLockInfoAllList = getDoorLockInfoList.PageData;
			}
			}
			if (getDoorLockInfoList.TotalPages > 1)
			{
			for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
			{
			var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
			pageSetting.Page = j + 1;
			localDoorLockObj.pageSetting = pageSetting;
			var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			if (getDoorLockInfoListTemp != null)
			{
			if (getDoorLockInfoListTemp.PageData.Count != 0)
			{
			foreach (var curDoorLockUser in getDoorLockInfoListTemp.PageData)
			{
			getDoorLockInfoAllList.Add(curDoorLockUser);
			}
			}
			}
			}
			}

			if (getDoorLockInfoAllList.Count != 0)
			{
			foreach (var curDoorLockUser in getDoorLockInfoAllList)
			{
			if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
			{
			continue;
			}
			@@ -344,19 +472,22 @@
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>>>)(async () =>
			{
			// 读取云端门锁设备中的信息
			var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, subAccountDistributedMark);
			if (getDoorLockInfoList != null)
			var getAllDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllInfolist(doorLock, subAccountDistributedMark);
			if (getAllDoorLockInfoList != null)
			{
			foreach (var getDoorLockInfoList in getAllDoorLockInfoList)
			{
			//获取云端存储的门锁成员信息
			foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
			{
			if (curDoorLockUser.CloudAccountId == "" \|\| curDoorLockUser.CloudAccountId != subAccountDistributedMark)
			if (string.IsNullOrEmpty(curDoorLockUser.CloudAccountId) \|\| curDoorLockUser.CloudAccountId != subAccountDistributedMark)
			{
			continue;
			}
			else
			{
			curAccountDoorLockUserList.Add(curDoorLockUser);
			}
			}
			}
			}
			@@ -367,10 +498,12 @@
			/// <summary>
			/// 获取当前账户门锁的所有信息
			/// </summary>
			public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllInfolist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
			public static async System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.GetDoorLockDataRes>> GetDoorLockAllInfolist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
			{
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.GetDoorLockDataRes>>>)(async () =>
			{
			var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.GetDoorLockDataRes> { };

			// 读取云端门锁设备中的信息
			var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

			@@ -387,14 +520,35 @@
			}

			var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			return getDoorLockInfoList;
			if (getDoorLockInfoList != null)
			{
			if (getDoorLockInfoList.PageData.Count != 0)
			{
			getDoorLockInfoAllList.Add(getDoorLockInfoList);
			}
			}
			if (getDoorLockInfoList.TotalPages > 1)
			{
			for (int j = 1; j < getDoorLockInfoList.TotalPages; j++)
			{
			var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
			pageSetting.Page = j + 1;
			localDoorLockObj.pageSetting = pageSetting;
			var getDoorLockInfoListTemp = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			if (getDoorLockInfoListTemp != null)
			{
			getDoorLockInfoAllList.Add(getDoorLockInfoListTemp);
			}
			}
			}
			return getDoorLockInfoAllList;
			}));
			}

			/// <summary>
			/// 获取当前账户门锁的所有信息
			/// </summary>
			public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock)
			public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock, int curPage = 1)
			{
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
			{
			@@ -410,7 +564,9 @@
			{
			localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}

			var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
			pageSetting.Page = curPage;
			localDoorLockObj.pageSetting = pageSetting;
			var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			return getDoorLockInfoList;
			}));
			@@ -419,7 +575,7 @@
			/// <summary>
			/// 获取云端存储的门锁成员信息
			/// </summary>
			public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
			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 () =>
			{
			@@ -434,6 +590,13 @@
			{
			localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			if (doorLock.DeviceAddr != null)
			{
			localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			var pageSetting = new ZigBee.Device.DoorLock.PageSetting() { };
			pageSetting.Page = curPage;
			localDoorLockObj.pageSetting = pageSetting;
			var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			if (getDoorLockInfoList != null)
			{
			@@ -475,7 +638,7 @@
			{
			var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId];

			if (curDoorLockUser.ConnectedAccount == "" \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			{
			continue;
			}