~wjc/HomeApp.git

			@@ -188,7 +188,7 @@
			//逻辑触发上报
			else if (topic == gatewayId + "/Logic/Execute_Respon")
			{
			this.LogicExecutePush(null);
			this.LogicExecutePush(JObject.Parse(msgData));
			}
			//场景触发上报
			else if (topic == gatewayId + "/Scene/Exec_Respon")
			@@ -498,10 +498,10 @@
			private void DoorLockDeviceReportPush(JObject receiveData)
			{
			//只有徐梅的门锁界面没有打开的情况下,才会处理这个东西
			if (ControlCommonResourse.IsDoorLockPageOpen == false)
			if (ControlCommonResourse.IsDoorLockPageOpen == false && UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
			if ((device is ZigBee.Device.DoorLock) == false)
			if (device.Type != DeviceType.DoorLock)
			{
			//它不是门锁
			return;
			@@ -509,10 +509,14 @@
			var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
			if (info.Clusterid == 257)
			{
			//常开模式开启
			if (info.AlarmCode == 216)
			//常开模式关闭
			if (info.AlarmCode == 217 \|\| info.AlarmCode == 219)
			{
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
			HdlThreadLogic.Current.RunMain(() =>
			{
			//弹出徐梅的那个窗口
			DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
			});
			}
			}
			}
			@@ -705,10 +709,30 @@
			/// <param name="receiveData"></param>
			private void LogicExecutePush(JObject receiveData)
			{
			//目前不处理逻辑上报内容

			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();

			//这个东西暂时不处理
			////只有徐梅的门锁界面没有打开的情况下,才会处理这个东西
			//if (ControlCommonResourse.IsDoorLockPageOpen == false && 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 data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
			// if (data.ActionData != null && data.ActionData.Actiontype == 8
			// && data.ActionData.PassDataString == "055704010113")
			// {
			// HdlThreadLogic.Current.RunMain(() =>
			// {
			// //弹出徐梅的那个窗口
			// DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
			// });
			// }
			//}
			}

			#endregion