~wjc/HomeApp.git

			@@ -39,7 +39,7 @@
			/// <summary>
			/// 命令区分
			/// </summary>
			private Dictionary<string, string> dicCommandDiv = new Dictionary<string, string>();
			private Dictionary<string, ReceiveComandDiv> dicCommandDiv = new Dictionary<string, ReceiveComandDiv>();

			#endregion

			@@ -65,6 +65,7 @@

			UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
			});
			return;
			}
			else if (topic == "BeingSqueezedOffline")
			{
			@@ -77,6 +78,7 @@

			UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
			});
			return;
			}
			else if (topic == "YouIpAndPortNoRecord")
			{
			@@ -89,6 +91,7 @@

			UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
			});
			return;
			}
			try
			{
			@@ -102,12 +105,12 @@
			if (reportTopic == "DeviceStatusReport")
			{
			//设备属性上报
			//this.DeviceAttributeReportPush(receiveData);
			this.DeviceAttributeReportPush(receiveData);
			}
			//传感器上报
			else if (reportTopic == "IASInfoReport")
			{
			//this.SensorDeviceReportPush(receiveData);
			this.SensorDeviceReportPush(receiveData);
			}
			//门锁上报
			else if (topic == gatewayId + "/Alarms/SendAlarmInform")
			@@ -117,13 +120,175 @@
			//通过外部方式布防撤防成功时报告
			else if (topic == gatewayId + "/Security/EnOrWithdrawSucceedReport")
			{
			SecurityEnOrWithdrawSucceedReport(receiveData);
			this.SecurityEnOrWithdrawSucceedReport(receiveData);
			}
			//设备在线状态更新反馈
			else if (reportTopic == "OnlineStatusChange_Respon")
			{
			this.DeviceOnlineChangePush(receiveData);
			}
			//撤防
			else if (topic == gatewayId + "/Security/WithdrawMode_Respon")
			{
			this.RemoveSafetyGarrisonPush(receiveData);
			}
			//布防
			else if (topic == gatewayId + "/Security/EnableMode_Respon")
			{
			this.SetSafetyGarrisonPush(receiveData);
			}
			//逻辑触发上报
			else if (topic == gatewayId + "/Logic/Execute_Respon")
			{
			this.LogicExecutePush(receiveData);
			}
			//场景触发上报
			else if (topic == gatewayId + "/Scene/Exec_Respon")
			{
			this.SceneExecPush(receiveData);
			}
			}
			catch (Exception ex)
			{
			//Log出力
			HdlLogLogic.Current.WriteLog(ex);
			}
			}

			#endregion

			#region ■ 设备属性上报_______________________

			/// <summary>
			/// 设备属性上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void DeviceAttributeReportPush(JObject receiveData)
			{
			var deviceAddr = receiveData.Value<string>("DeviceAddr");
			var deviceEpoint = receiveData.Value<int>("Epoint");

			var tempDevice = new CommonDevice { DeviceAddr = deviceAddr, DeviceEpoint = deviceEpoint };
			tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(receiveData["Data"].ToString());

			this.DeviceReportPush(tempDevice, ReceiveComandDiv.A设备属性上报);
			}

			#endregion

			#region ■ 传感器上报_________________________

			/// <summary>
			/// 传感器设备上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void SensorDeviceReportPush(JObject receiveData)
			{
			var ias = new IASZone() { DeviceAddr = receiveData.Value<string>("DeviceAddr"), DeviceEpoint = receiveData.Value<int>("Epoint") };
			ias.iASInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.IASInfoData>(receiveData["Data"].ToString());

			//如果没有添加入安防
			if (HdlSafeguardLogic.Current.GetZoneIdByIASZone(ias) != -1)
			{
			//保存安防报警信息到本地
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(ias);
			}

			this.DeviceReportPush(ias, ReceiveComandDiv.A传感器上报);

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

			#endregion

			#region ■ 门锁上报___________________________

			/// <summary>
			/// 门锁上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void DoorLockDeviceReportPush(JObject receiveData)
			{
			//保存门锁信息到本地
			HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);

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

			#endregion

			#region ■ 设备在线状态更新反馈_______________

			/// <summary>
			/// 设备在线状态更新反馈
			/// </summary>
			/// <param name="receiveData"></param>
			private void DeviceOnlineChangePush (JObject receiveData)
			{
			var tempDevice = new CommonDevice() { DeviceAddr = receiveData.Value<string>("DeviceAddr"), DeviceEpoint = receiveData.Value<int>("Epoint") };
			tempDevice.IsOnline = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(receiveData["Data"]["IsOnline"].ToString());

			this.DeviceReportPush(tempDevice, ReceiveComandDiv.A设备在线上报);
			}

			#endregion

			#region ■ 布防_______________________________

			/// <summary>
			/// 布防推送
			/// </summary>
			/// <param name="receiveData"></param>
			private void SetSafetyGarrisonPush(JObject receiveData)
			{
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.EnableModeResponseData>(receiveData["Data"].ToString());
			if (data.Result == 0)
			{
			var garrison = GarrisonMode.None;
			//在家布防
			if (data.ModeId == 1) { garrison = GarrisonMode.AtHome; }
			//离家布防
			else if (data.ModeId == 2) { garrison = GarrisonMode.RemoveHome; }
			else { return; }

			//保存报警信息然后推送到界面上
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(garrison);
			if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
			{
			//推送
			var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
			form?.GarrisonModePush(garrison);
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}
			}

			#endregion

			#region ■ 撤防_______________________________

			/// <summary>
			/// 撤防推送
			/// </summary>
			/// <param name="receiveData"></param>
			private void RemoveSafetyGarrisonPush(JObject receiveData)
			{
			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.WithdrawModeResponseData>(receiveData["Data"].ToString());
			if (data.Result == 0)
			{
			//保存报警信息然后推送到界面上
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(GarrisonMode.RemoveGarrison);
			if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
			{
			//推送
			var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
			form?.GarrisonModePush(GarrisonMode.RemoveGarrison);
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}
			}

			@@ -162,7 +327,15 @@
			else if (data.OperationWay == 1) { appendText = "(" + Language.StringByID(R.MyInternationalizationString.uPanelOperation) + ")"; }

			//保存报警信息然后推送到界面上
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(garrison, appendText, true);
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(garrison, appendText);
			if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
			{
			//推送
			var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
			form?.GarrisonModePush(garrison);
			}
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}

			/// <summary>
			@@ -186,59 +359,34 @@

			#endregion

			#region ■ 设备属性上报_______________________
			#region ■ 逻辑触发上报_______________________

			/// <summary>
			/// 设备属性上报
			/// 逻辑触发上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void DeviceAttributeReportPush(JObject receiveData)
			private void LogicExecutePush(JObject receiveData)
			{
			var deviceAddr = receiveData.Value<string>("DeviceAddr");
			var deviceEpoint = receiveData.Value<int>("Epoint");
			//目前不处理逻辑上报内容

			var tempDevice = new CommonDevice { DeviceAddr = deviceAddr, DeviceEpoint = deviceEpoint };
			tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(receiveData["Data"].ToString());

			this.DeviceReportPush(tempDevice, "DeviceStatusReport");
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}

			#endregion

			#region ■ 传感器上报_________________________
			#region ■ 场景触发上报_______________________

			/// <summary>
			/// 传感器设备上报
			/// 场景触发上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void SensorDeviceReportPush(JObject receiveData)
			private void SceneExecPush(JObject receiveData)
			{
			var ias = new IASZone() { DeviceAddr = receiveData.Value<string>("DeviceAddr"), DeviceEpoint = receiveData.Value<int>("Epoint") };
			ias.iASInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.IASInfoData>(receiveData["Data"].ToString());
			//目前不处理场景上报内容

			//如果没有添加入安防
			if (HdlSafeguardLogic.Current.GetZoneIdByIASZone(ias) == -1)
			{
			}
			else
			{
			//保存安防报警信息到本地
			HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(ias);
			}
			}

			#endregion

			#region ■ 门锁上报___________________________

			/// <summary>
			/// 门锁上报
			/// </summary>
			/// <param name="receiveData"></param>
			private void DoorLockDeviceReportPush(JObject receiveData)
			{
			//保存门锁信息到本地
			HdlAlarmsLogic.Current.SaveDoorLockAlarmInfo(receiveData);
			//显示有新消息的特效
			this.ShowHadNewMessageAppeal();
			}

			#endregion
			@@ -249,12 +397,20 @@
			/// 添加获取设备属性的事件(推送已经强制指定运行于主线程，属性上报的对象：device.DeviceStatusReport)
			/// </summary>
			/// <param name="mainKeys">标识事件的主键(可以随便填,主要是针对多个界面一起使用的情况)</param>
			/// <param name="comand">命令区分,比如：DeviceStatusReport,IASInfoReport等等</param>
			/// <param name="action">当接收到网关回复之后的回调函数,属性上报的对象：device.DeviceStatusReport</param>
			public void AddAttributeEvent(string mainKeys, string comand, Action<CommonDevice> action)
			/// <param name="comand">命令区分</param>
			/// <param name="action">
			/// <para>当接收到网关回复之后的回调函数</para>
			/// <para>设备属性上报的对象：device.DeviceStatusReport</para>
			/// <para>传感器上报的对象：ias.iASInfo</para>
			/// <para>设备在线上报的对象：device.IsOnline</para></param>
			public void AddAttributeEvent(string mainKeys, ReceiveComandDiv comand, Action<CommonDevice> action)
			{
			lock (this.dicDeviceEvent)
			{
			if (this.dicDeviceEvent.ContainsKey(mainKeys) == true)
			{
			this.RemoveEvent(mainKeys);
			}
			this.dicDeviceEvent[mainKeys] = action;
			this.dicCommandDiv[mainKeys] = comand;
			}
			@@ -305,14 +461,14 @@

			#endregion

			#region ■ 设备上报推送_______________________
			#region ■ 一般方法___________________________

			/// <summary>
			/// 设备上报推送
			/// </summary>
			/// <param name="common"></param>
			/// <param name="typeTag"></param>
			private void DeviceReportPush(CommonDevice common, string reportTopic)
			/// <param name="comand"></param>
			private void DeviceReportPush(CommonDevice common, ReceiveComandDiv comand)
			{
			lock (this.dicDeviceEvent)
			{
			@@ -325,7 +481,7 @@
			var list = new List<Action<CommonDevice>>();
			foreach (string keys in this.dicDeviceEvent.Keys)
			{
			if (this.dicCommandDiv[keys] != reportTopic)
			if (this.dicCommandDiv[keys] != comand)
			{
			//命令区分不一致，则不调用回调函数
			continue;
			@@ -354,10 +510,6 @@
			}
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			/// 是否存在指定的事件
			/// </summary>
			@@ -368,6 +520,45 @@
			return this.dicCommandDiv.ContainsKey(mainkeys);
			}

			/// <summary>
			/// 显示有新消息的特效
			/// </summary>
			private void ShowHadNewMessageAppeal()
			{
			//有新消息(特效还在时,不需要再处理)
			if (ControlCommonResourse.HadNewMessage == false)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			for (int i = 0; i < ControlCommonResourse.listMessageManaContr.Count; i++)
			{
			//显示角标特效
			ControlCommonResourse.listMessageManaContr[i].IsSelected = true;
			}
			ControlCommonResourse.HadNewMessage = true;
			});
			}
			}

			#endregion
			}

			/// <summary>
			/// 接收命令区分
			/// </summary>
			public enum ReceiveComandDiv
			{
			/// <summary>
			/// 设备属性上报
			/// </summary>
			A设备属性上报 = 1,
			/// <summary>
			/// 传感器上报
			/// </summary>
			A传感器上报 = 2,
			/// <summary>
			/// 设备在线上报
			/// </summary>
			A设备在线上报 = 3
			}
			}