删除车辆超时告警

card_base.cpp

@@ -131,10 +131,11 @@ int  card_location_base::get_stat()
     {
         return  STATUS_CALL;
     }
-    else if(event_list::instance()->get_event_card(m_id, m_type,
-                is_person()? ET_CARD_AREA_OVER_TIME_PERSON: ET_CARD_AREA_OVER_TIME_VEHICLE))
+    else if(is_person())
     {
-        return  STATUS_AREA_OVER_TIME;
+        if(event_list::instance()->get_event_card(m_id, m_type,ET_CARD_AREA_OVER_TIME_PERSON)||
+                event_list::instance()->get_event_card(m_id, m_type,ET_CARD_OVER_TIME_PERSON))
+            return  STATUS_AREA_OVER_TIME;
     }
     else if(event_list::instance()->get_event_card(m_id, m_type, ET_CARD_OVER_SPEED))
     {

common.h

@@ -111,9 +111,7 @@ enum EVENT_TYPE{ // 事件类型
 
     ET_CARD_LOW_POWER_SERIOUS = 12, // 电量极低
     ET_CARD_OVER_TIME_PERSON = 13, // 人员井下超时
-    ET_CARD_OVER_TIME_VEHICLE = 14, // 车辆井下超时
     ET_CARD_AREA_OVER_TIME_PERSON = 15, // 人员区域超时
-    ET_CARD_AREA_OVER_TIME_VEHICLE = 16, // 车辆区域超时
 
     ET_CARD_AREA_FORBIDDEN_PERSON = 19,  // 人员进入禁止区域
     ET_CARD_AREA_FORBIDDEN_VEHICLE = 20, // 车辆进入禁止区域