~wjc/HomeApp.git

			@@ -45,26 +45,6 @@
			/// </summary>
			private string oldDeviceAlarmFile = string.Empty;

			#endregion

			#region ■ 报警信息上报事件___________________

			/// <summary>
			/// 添加报警信息上报事件(不需要再执行任何操作,并且永久存在)
			/// </summary>
			public void AddAlarmInfoEvent()
			{
			//安防设备上报
			HdlDeviceAttributeLogic.Current.AddAttributeEvent("SaveSafetyAlarmInfo", "IASInfoReport", (device)=>
			{
			if (HdlGatewayLogic.Current.IsGatewayExist(device.CurrentGateWayId) == true)
			{
			//保存安防报警信息到本地
			this.SaveSafeguardAlarmInfo(device);
			}
			});
			}

			#endregion

			#region ■ 重新刷新报警信息___________________
			@@ -180,8 +160,7 @@
			/// </summary>
			/// <param name="garrison">布防模式</param>
			/// <param name="appendText">附加文本</param>
			/// <param name="push">是否推送到安防主界面</param>
			public void SaveSafeguardAlarmInfo(GarrisonMode garrison, string appendText = "", bool push = false)
			public void SaveSafeguardAlarmInfo(GarrisonMode garrison, string appendText = "")
			{
			if (garrison == GarrisonMode.None)
			{
			@@ -242,16 +221,6 @@
			var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
			string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
			Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);

			//推送
			if (push == true)
			{
			if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
			{
			var form = (Phone.UserCenter.Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
			form?.AddSafeguardLogPushRow(null);
			}
			}
			}
			}

			@@ -436,6 +405,8 @@

			#endregion



			#region ■ 门锁报警保存_______________________

			/// <summary>