|
|
@@ -10,6 +10,8 @@ using OHV.Common.Model;
|
|
|
using OHV.Common.Events;
|
|
|
using VehicleControlSystem.ControlLayer;
|
|
|
using GSG.NET.Utils;
|
|
|
+using System.Collections.Generic;
|
|
|
+using System.Linq;
|
|
|
|
|
|
namespace VehicleControlSystem.Managers
|
|
|
{
|
|
|
@@ -50,6 +52,7 @@ namespace VehicleControlSystem.Managers
|
|
|
public event Action<int> OnOccurAlarm;
|
|
|
public event Action<int> OnClearAlarm;
|
|
|
Alarm activeAlarm = null;
|
|
|
+ List<Alarm> Alarms { get; set; }
|
|
|
|
|
|
IEventAggregator eventAggregator = null;
|
|
|
SqliteManager sql = null;
|
|
|
@@ -128,11 +131,12 @@ namespace VehicleControlSystem.Managers
|
|
|
set { buzzerState = value; }
|
|
|
}
|
|
|
|
|
|
- public AutoManager( IIO io, IEventAggregator ea, SqliteManager sql )
|
|
|
+ public AutoManager( IIO io, IEventAggregator ea, SqliteManager sql, List<Alarm> al )
|
|
|
{
|
|
|
this.iO = io;
|
|
|
this.eventAggregator = ea;
|
|
|
this.sql = sql;
|
|
|
+ this.Alarms = al;
|
|
|
}
|
|
|
|
|
|
#region Vehicle Events
|
|
|
@@ -282,10 +286,8 @@ namespace VehicleControlSystem.Managers
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
-
|
|
|
public void ProcessAlarm( int alarmID )
|
|
|
{
|
|
|
this.AutoModeStateProperty = eAutoModeState.ErrorStop;
|
|
|
@@ -293,7 +295,7 @@ namespace VehicleControlSystem.Managers
|
|
|
this.BuzzerStateProperty = eBuzzerKind.Alarm;
|
|
|
|
|
|
HisAlarm hisAlarm = new HisAlarm();
|
|
|
- var alarm = sql.AlarmDAL.GetById( alarmID );
|
|
|
+ var alarm = this.Alarms.Where( x => x.AlarmId == alarmID ).FirstOrDefault();
|
|
|
if ( alarm == null )
|
|
|
{
|
|
|
hisAlarm.AlarmId = alarmID;
|