~xm/HomeApp.git

old mode 100644 new mode 100755

File was renamed from Home0630/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
			@@ -16,7 +16,6 @@
			public static Action<bool> LogicAction = null;
			/// <summary>
			/// 更新当前门锁涉及的状态【主要用于门锁操作常开模式的回调】
			/// string=mac
			/// </summary>
			public static Action<string, bool> UpdateCurrentDoorlockAction = null;
			/// <summary>
			@@ -112,10 +111,10 @@

			#region 常开模式 API
			/// <summary>
			/// 获取当前门锁的常开模式
			/// 获取当前门锁的常开模式
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>null:没有回复； true:门锁常开；false：门锁常关</returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>null:没有回复； true:门锁常开；false：门锁常关</returns>
			public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
			{
			bool? IsDoorLockNormallyMode = null;
			@@ -142,8 +141,8 @@
			/// <summary>
			/// 门锁是否支持常开[这里暂时只有S-One门锁支持，H06C不支持, 后期通过能力值支持]
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>true:支持常开；false：不支持常开</returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>true:支持常开；false：不支持常开</returns>
			public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
			{
			var listDevice = new List<CommonDevice> { };
			@@ -177,7 +176,7 @@
			/// </summary>
			/// <param name="doorLock">当前门锁</param>
			/// <param name="doorLockMessType">导致门锁失效的操作类型</param>
			/// <param name="haveLogic">网关中是否存在逻辑常开模式</param>
			/// <param name="haveLogic">网关中是否存在逻辑常开模式</param>
			/// <param name="action">回调处理更新内容</param>
			/// <param name="type">1:确认常开模式已经开启；0:常开模式失效提示</param>
			public static async void NomallyOpenModeInvalidDialog(ZigBee.Device.DoorLock doorLock, DoorLockMessType doorLockMessType, bool haveLogic, Action<bool> action = null, int type = 0)
			@@ -209,7 +208,7 @@
			{
			if (doorLockMessType == DoorLockMessType.DeviceReport \|\| doorLockMessType == DoorLockMessType.ServicePush)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			if (LogicAction != null)
			{
			@@ -291,7 +290,7 @@
			}
			else
			{
			//app操作不取消“常开模式”
			//app操作不取消“常开模式”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			}
			action?.Invoke(doorLock.IsDoorLockNormallyMode);
			@@ -353,7 +352,7 @@
			{
			//添加App开启常开模式的历史记录
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9002, string.Empty);
			//app确认取消“常开模式”成功
			//app确认取消“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			//删除设置常开模式创建的逻辑
			if (haveLogic)
			@@ -386,7 +385,7 @@
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
			{
			//app操作取消“常开模式”
			//app操作取消“常开模式”
			var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
			if (result == null \|\| result.defaultControlResponseData == null \|\| result.defaultControlResponseData.status != 0)
			{
			@@ -396,7 +395,7 @@

			if (result.defaultControlResponseData.status == 0)
			{
			//app确认取消“常开模式”成功
			//app确认取消“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			action?.Invoke();
			return true;
			@@ -412,7 +411,7 @@
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
			{
			//app设置“常开模式”失败
			//app设置“常开模式”失败
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			if (result == null \|\| result.defaultControlResponseData == null \|\| result.defaultControlResponseData.status != 0)
			{
			@@ -421,7 +420,7 @@

			if (result.defaultControlResponseData.status == 0)
			{
			//app设置“常开模式”成功
			//app设置“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			return true;
			}
			@@ -446,7 +445,7 @@
			return;
			}

			//设置常开模式后，您的门锁将始终处于打开状态，确认开启？
			//设置常开模式后，您的门锁将始终处于打开状态，确认开启？
			string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
			var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
			@@ -463,7 +462,7 @@
			/// </summary>
			public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock, Action action)
			{
			//失效设置
			//失效设置
			string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
			var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
			@@ -519,8 +518,8 @@
			/// <summary>
			/// 门锁是否支持音量[这里暂时只有S-One门锁支持，H06C不支持，后期通过能力值支持]
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns></returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns></returns>
			public static bool CanVolume(ZigBee.Device.DoorLock doorLock)
			{
			var listDevice = new List<CommonDevice> { };
			@@ -535,7 +534,7 @@

			#endregion

			#region 从云端获取的方法
			#region 从云端获取的方法
			/// <summary>
			/// 获取当前账户门锁操作权限（是否被冻结）
			/// </summary>
			@@ -607,26 +606,27 @@
			{
			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.Phone
			\|\| member.Account == UserCenterResourse.UserInfo.Email)
			{
			//如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一
			continue;
			}
			//去掉子账户中普通成员，留下拥有管理员权限的成员
			//（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）
			if (member.AccountType != 1)
			{
			continue;
			}

			SubAccounListDictionary.Add(member.DistributedMark, member);
			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)
			@@ -688,7 +688,7 @@
			}


			//2、读取云端门锁信息
			//2、读取云端门锁信息
			var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
			var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
			if (getDoorLockInfoList != null)
			@@ -1174,7 +1174,7 @@
			/// <returns></returns>
			public static DateTime GetDoorLockZoneTime()
			{
			//通过经度获取时区
			//通过经度获取时区
			var gwZone = int.Parse(CaculateTimeZone(Common.Config.Instance.Home.Longitude));
			//将本地时间转换成世界时
			var utc = DateTime.Now.AddHours(-gwZone);
			@@ -1188,7 +1188,7 @@
			}

			/// <summary>
			/// 获取时区
			/// 获取时区
			/// </summary>
			/// <param name="currentLon">currentLon:"+"为东区，“-”为西区</param>
			/// <returns></returns>
			@@ -1249,7 +1249,7 @@

			#endregion

			#region 一般方法
			#region 一般方法
			/// <summary>
			/// 显示错误信息窗口
			/// </summary>
			@@ -1276,6 +1276,6 @@
			});
			}

			#endregion
			#endregion
			}
			}