|
@@ -65,11 +65,11 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
|
|
|
|
|
|
auto ptr_temp = static_cast<over_speed_data*>(ptr.get());
|
|
auto ptr_temp = static_cast<over_speed_data*>(ptr.get());
|
|
double limit = ptr_temp->m_limit_speed;
|
|
double limit = ptr_temp->m_limit_speed;
|
|
-
|
|
|
|
|
|
+ int _id = area_hover_ptr->id();
|
|
if(limit < card_ptr->m_speed)//超速
|
|
if(limit < card_ptr->m_speed)//超速
|
|
{
|
|
{
|
|
ptr_temp->m_normal_speed_count=0;
|
|
ptr_temp->m_normal_speed_count=0;
|
|
- log_info("[speed_checker:on_hover_1]%d %.2f,%.2f",card_ptr->m_id,limit,card_ptr->m_speed);
|
|
|
|
|
|
+ log_info("[speed_checker:on_hover_1]%d %.2f,%.2f areaid:%d",card_ptr->m_id,limit,card_ptr->m_speed,_id);
|
|
if(!ptr_temp->m_is_warning && ++ptr_temp->m_over_speed_count>=SPEED_COUNT_LIMIT)
|
|
if(!ptr_temp->m_is_warning && ++ptr_temp->m_over_speed_count>=SPEED_COUNT_LIMIT)
|
|
{
|
|
{
|
|
EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
|
|
EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
|
|
@@ -77,14 +77,14 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
|
|
card_ptr->set_event_flag(ev_type);
|
|
card_ptr->set_event_flag(ev_type);
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, true);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, true);
|
|
- log_info("[speed_checker:on_hover_true]%d",card_ptr->m_id);
|
|
|
|
|
|
+ log_info("[speed_checker:on_hover_true]%d,id:%d",card_ptr->m_id,_id);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
else//速度正常
|
|
else//速度正常
|
|
{
|
|
{
|
|
ptr_temp->m_over_speed_count=0;
|
|
ptr_temp->m_over_speed_count=0;
|
|
- log_info("[speed_checker:on_hover_2]%d %.2f,%.2f",card_ptr->m_id,limit,card_ptr->m_speed);
|
|
|
|
|
|
+ log_info("[speed_checker:on_hover_2]%d %.2f,%.2f id:%d",card_ptr->m_id,limit,card_ptr->m_speed,_id);
|
|
if(ptr_temp->m_is_warning && ++ptr_temp->m_normal_speed_count>=SPEED_COUNT_LIMIT)
|
|
if(ptr_temp->m_is_warning && ++ptr_temp->m_normal_speed_count>=SPEED_COUNT_LIMIT)
|
|
{
|
|
{
|
|
EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
|
|
EVENT_TYPE ev_type =area_hover_ptr->m_area->is_mine()?ET_CARD_OVER_SPEED: ET_CARD_AREA_OVER_SPEED;
|
|
@@ -92,7 +92,7 @@ void area_business_speed_checker::on_hover(const std::shared_ptr<area_hover>&are
|
|
card_ptr->set_event_flag(ev_type,0);
|
|
card_ptr->set_event_flag(ev_type,0);
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, false);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, false);
|
|
- log_info("[speed_checker:on_hover_false]%d",card_ptr->m_id);
|
|
|
|
|
|
+ log_info("[speed_checker:on_hover_false]%d id:%d",card_ptr->m_id,_id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -117,7 +117,7 @@ void area_business_speed_checker::on_leave(const std::shared_ptr<area_hover>&are
|
|
double limit = ptr_temp ->m_limit_speed;
|
|
double limit = ptr_temp ->m_limit_speed;
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, ptr_temp->m_is_warning=false);
|
|
event_tool::instance()->handle_event(OT_CARD, ev_type, id, limit, card_ptr->m_speed, ptr_temp->m_is_warning=false);
|
|
- log_info("[speed_checker:on_leave_false]%d",card_ptr->m_id);
|
|
|
|
|
|
+ log_info("[speed_checker:on_leave_false]%d,id:%d",card_ptr->m_id,area_hover_ptr->id());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|