~wjc/HomeApp.git

			@@ -6,7 +6,6 @@
			using Newtonsoft.Json.Linq;
			using Shared;
			using Shared.Common;
			using Shared.Common.ResponseEntity;
			using Shared.Phone.UserCenter;

			namespace ZigBee.Device
			@@ -34,7 +33,7 @@

			public string currentUserDisplayMethod = string.Empty;//当前用户显示方式
			//本地所有账户列表
			public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
			public List<Shared.Phone.MemberInfoRes> localAllAccountList = new List<Shared.Phone.MemberInfoRes> { };

			/// <summary>
			/// 是否常开模式
			@@ -476,15 +475,16 @@
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockTempPasswordDataRes>>)(async () =>
			{
			GetDoorLockTempPasswordDataRes listInfo = null;
			var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
			if (revertObj != null && revertObj.ResponseData != null)
			{
			var result = revertObj.ResponseData.ToString();
			if (result != null)
			{
			listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
			}
			}
			//☆マーク☆
			//var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
			//if (revertObj != null && revertObj.ResponseData != null)
			//{
			// var result = revertObj.ResponseData.ToString();
			// if (result != null)
			// {
			// listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
			// }
			//}
			return listInfo;
			}));
			}
			@@ -597,15 +597,16 @@
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockDataRes>>)(async () =>
			{
			GetDoorLockDataRes listInfo = null;
			var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
			if (revertObj != null && revertObj.ResponseData != null)
			{
			var result = revertObj.ResponseData.ToString();
			if (result != null)
			{
			listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
			}
			}
			//☆マーク☆
			//var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
			//if (revertObj != null && revertObj.ResponseData != null)
			//{
			// var result = revertObj.ResponseData.ToString();
			// if (result != null)
			// {
			// listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
			// }
			//}
			return listInfo;
			}));
			}
			@@ -617,7 +618,7 @@
			/// <returns>获取从接口那里取到的ResponsePack</returns>
			/// <param name="RequestName">访问地址</param>
			/// <param name="obj">一个类</param>
			public static async Task<ResponsePack> SendDoorLockToServer(string RequestName, object obj)
			public static async Task<Shared.Phone.ResponsePack> SendDoorLockToServer(string RequestName, object obj)
			{
			try
			{
			@@ -625,21 +626,21 @@
			var requestJson = JsonConvert.SerializeObject(obj);
			var byteData = System.Text.Encoding.UTF8.GetBytes(requestJson);
			byte[] result1 = null;
			//访问接口
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			//访问接口 //☆マーク☆
			if (Shared.Phone.HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
			{
			result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
			//result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
			}
			else
			{
			result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
			//result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
			}
			if (result1 != null)
			{
			var result2 = Encoding.UTF8.GetString(result1);
			if (result2 != null)
			{
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResponsePack>(result2);
			var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Phone.ResponsePack>(result2);
			return result;
			}
			}
			@@ -655,19 +656,13 @@
			/// <summary>
			/// 获取子账户信息
			/// </summary>
			static List<Shared.Phone.UserCenter.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
			public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> GetSubAccountByDistributedMark()
			static List<Shared.Phone.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.MemberInfoRes> { };
			public static async System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>> GetSubAccountByDistributedMark()
			{
			DoorLockAccountList.Clear();
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>>>)(async () =>
			return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>>>)(async () =>
			{
			var pra = new Shared.Phone.UserCenter.MemberListInfoPra();
			string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
			if (result == null)
			{
			return null;
			}
			var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Shared.Phone.UserCenter.MemberInfoRes>>(result);
			var listInfo = Shared.Phone.HdlMemberLogic.Current.GetMemberListInfo();
			return listInfo;
			}));
			}
			@@ -934,9 +929,9 @@
			/// Unlock命令：error,invalid schedule事件
			/// </summary>
			UnlockInvalidScheduleEvent = 6,
			}
			}
			#endregion


			#region 门锁编程事件通知
			/// <summary>
			/// 门锁编程事件通知
			@@ -1118,7 +1113,7 @@
			result = new DefaultControlResponseAllData { errorMessageBase = "网关返回的数据为空" };
			}
			else
			{
			{
			if (clientDataPassthroughResponseData?.PassData != null)
			{
			var data = clientDataPassthroughResponseData.PassData;