~xm/HomeApp.git

			@@ -2,6 +2,7 @@
			using System.Collections.Generic;
			using System.Text;
			using Newtonsoft.Json.Linq;
			using Shared.Common;
			using ZigBee.Device;

			namespace Shared.Phone.UserCenter
			@@ -599,39 +600,36 @@
			/// </summary>
			/// <param name="receiveData"></param>
			private void DoorLockDeviceReportPush(JObject receiveData)
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
			if (device.Type != DeviceType.DoorLock)
			{
			//它不是门锁
			return;
			}

			var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
			if (info.Clusterid == 257)
			{
			//216：锁上设置的常开
			if (info.AlarmCode == 216)
			{
			HdlThreadLogic.Current.RunThread(async () =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//更新门锁涉及的常开/常关的界面
			if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
			{
			UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr + device.DeviceEpoint, true);
			}
			});
			});
			}
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}
			}
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
			if (device.Type != DeviceType.DoorLock)
			{
			//它不是门锁
			return;
			}

			var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
			if (info.Clusterid == 257)
			{
			//216：锁上设置的常开
			if (info.AlarmCode == 216)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//更新门锁涉及的常开/常关的界面
			if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
			{
			UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr + device.DeviceEpoint, true);
			}
			});
			}
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}
			}
			#endregion

			#region ■ 设备在线状态更新反馈_______________
			@@ -823,39 +821,45 @@
			private void LogicExecutePush(JObject receiveData)
			{
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();

			// 逻辑执行常开模式失效的情况
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			//自动化执行常开关闭
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
			if (data != null && data.ActionData != null)
			{
			var deviceAddr = data.ActionData.MacStr;
			var epoint = 1; //data.ActionData.Epoint; 门锁发送时是200，但是上传时要把真实的端点给网关上报
			var device = Common.LocalDevice.Current.GetDevice(deviceAddr, epoint);
			if (device.Type != DeviceType.DoorLock)
			{
			return;
			}
			this.ShowHadNewMessageAppeal();

			if (data.ActionData.Actiontype == 8 && data.ActionData.PassDataString == "055704010113")
			{
			HdlThreadLogic.Current.RunThread(async () =>
			// 逻辑执行常开模式失效的情况
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			//自动化执行常开关闭
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
			if (data != null && data.ActionData != null)
			{
			if (data.ActionData.Actiontype == 8 && data.ActionData.PassDataString == "055704010113")
			{
			var deviceAddr = data.ActionData.MacStr;
			var device = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr, false);
			if (device.Count > 0 && device[0].Type != DeviceType.DoorLock)
			{
			return;
			}

			HdlThreadLogic.Current.RunThread(async () =>
			{
			var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);
			HdlThreadLogic.Current.RunMain(() =>
			{
			//弹出徐梅的那个窗口
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
			result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);
			//提示门锁已经失效
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			});
			}
			}

			//更新门锁的深度控制页
			ControlCommonResourse.UpdateDoorLockStatusAction?.Invoke(false);

			//逻辑执行的失效要更新状态
			if (DoorLock.DoorLockCommonInfo.LogicAction != null)
			{
			DoorLock.DoorLockCommonInfo.LogicAction(false);
			}
			});
			}
			}
			}
			}
			}
			#endregion

			#region ■ 场景触发上报_______________________