|
@@ -38,19 +38,16 @@ void area_business_count_checker::on_load_his(const std::shared_ptr<area_hover>&
|
|
|
|
|
|
//增加计数,并进行判断
|
|
|
void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
|
|
|
- const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr)
|
|
|
+ const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr)
|
|
|
{
|
|
|
if (nullptr == a->m_area )//|| !a->m_area->is_mine())
|
|
|
{
|
|
|
return ;
|
|
|
}
|
|
|
- if (c->is_person())
|
|
|
- {
|
|
|
- a->m_area->m_person_count ++ ;
|
|
|
- //printf("Person=%d On Enter Aread=%d! CurPersonCount=%d,LimitCount=%d, IsEvent=%d \n"
|
|
|
- // ,c->m_id,a->m_area->m_id, (int)a->m_area->m_person_count , a->m_area->m_limit_person_count,a->m_area->m_event_person_count);
|
|
|
-
|
|
|
- if (!a->m_area->m_event_person_count && a->m_area->m_person_count > a->m_area->m_limit_person_count)
|
|
|
+ if (c->is_person())
|
|
|
+ {
|
|
|
+ a->m_area->m_person_count ++ ;
|
|
|
+ if (!a->m_area->m_event_person_count && a->m_area->m_person_count > a->m_area->m_limit_person_count)
|
|
|
{
|
|
|
a->m_area->m_event_person_count = true;
|
|
|
EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
|
|
@@ -58,12 +55,12 @@ void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
|
|
|
log_info("area_business_count_checker::on_enter : Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
|
|
|
,ev,a->m_area->id(),a->m_area->m_limit_person_count,(int)a->m_area->m_person_count);
|
|
|
}
|
|
|
- }
|
|
|
- else if (c->is_vehicle())
|
|
|
- {
|
|
|
+ }
|
|
|
+ else if (c->is_vehicle())
|
|
|
+ {
|
|
|
a->m_area->m_vehicle_count ++ ;
|
|
|
- //printf("Vehicle=%d On Enter Aread=%d! CurVehicleCount=%d,LimitCount=%d, IsEvent=%d \n"
|
|
|
- // ,c->m_id,a->m_area->m_id, (int)a->m_area->m_vehicle_count , a->m_area->m_limit_vehicle_count,a->m_area->m_event_vehicle_count);
|
|
|
+
|
|
|
+ log_info("area_id:%d,v_count:%d",a->m_area->m_id,a->m_area->m_vehicle_count.load());
|
|
|
|
|
|
if (a->m_area->m_vehicle_count > a->m_area->m_limit_vehicle_count && !a->m_area->m_event_vehicle_count)
|
|
|
{
|
|
@@ -73,33 +70,33 @@ void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
|
|
|
log_info("area_business_count_checker::on_enter : Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
|
|
|
,ev,a->m_area->id(),a->m_area->m_limit_vehicle_count,(int)a->m_area->m_vehicle_count);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void area_business_count_checker::on_hover(const std::shared_ptr<area_hover>&a,
|
|
|
- const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
|
|
|
+ const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
- //减少计数
|
|
|
+//减少计数
|
|
|
void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
|
|
|
- const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
|
|
|
+ const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
|
|
|
{
|
|
|
if (nullptr == a->m_area )
|
|
|
{
|
|
|
return ;
|
|
|
}
|
|
|
- int limitVal = 0;
|
|
|
- int curVal = 0;
|
|
|
- bool tmp_event = false;
|
|
|
- EVENT_TYPE ev = EVENT_TYPE::ET_OVER_COUNT_PERSON;
|
|
|
- if (c->is_person())
|
|
|
- {
|
|
|
- a->m_area->m_person_count -- ;
|
|
|
- limitVal = a->m_area->m_limit_person_count;
|
|
|
- curVal = a->m_area->m_person_count;
|
|
|
- tmp_event = a->m_area->m_event_person_count;
|
|
|
- ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
|
|
|
+ int limitVal = 0;
|
|
|
+ int curVal = 0;
|
|
|
+ bool tmp_event = false;
|
|
|
+ EVENT_TYPE ev = EVENT_TYPE::ET_OVER_COUNT_PERSON;
|
|
|
+ if (c->is_person())
|
|
|
+ {
|
|
|
+ a->m_area->m_person_count -- ;
|
|
|
+ limitVal = a->m_area->m_limit_person_count;
|
|
|
+ curVal = a->m_area->m_person_count;
|
|
|
+ tmp_event = a->m_area->m_event_person_count;
|
|
|
+ ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
|
|
|
if(tmp_event && curVal < limitVal)
|
|
|
{
|
|
|
a->m_area->m_event_person_count = false;
|
|
@@ -107,21 +104,21 @@ void area_business_count_checker::on_leave(const std::shared_ptr<area_hover>&a,
|
|
|
,ev,a->m_area->id(),limitVal,curVal);
|
|
|
event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,false);
|
|
|
}
|
|
|
- }
|
|
|
- else if (c->is_vehicle())
|
|
|
- {
|
|
|
- a->m_area->m_vehicle_count -- ;
|
|
|
- limitVal = a->m_area->m_limit_vehicle_count;
|
|
|
- curVal = a->m_area->m_vehicle_count;
|
|
|
- tmp_event = a->m_area->m_event_vehicle_count;
|
|
|
- ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
|
|
|
- if(tmp_event && curVal <= limitVal)
|
|
|
+ }
|
|
|
+ else if (c->is_vehicle())
|
|
|
+ {
|
|
|
+ a->m_area->m_vehicle_count -- ;
|
|
|
+ limitVal = a->m_area->m_limit_vehicle_count;
|
|
|
+ curVal = a->m_area->m_vehicle_count;
|
|
|
+ tmp_event = a->m_area->m_event_vehicle_count;
|
|
|
+ ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
|
|
|
+ if(tmp_event && curVal < limitVal)
|
|
|
{
|
|
|
a->m_area->m_event_vehicle_count = false;
|
|
|
log_info("area_business_count_checker::on_leave :Cancel Event OVER_COUNT=%d AreaId=%d,Limit=%d,CurNum=%d"
|
|
|
,ev,a->m_area->id(),limitVal,curVal);
|
|
|
event_tool::instance()->handle_event(OT_AREA,ev,a->m_area->id(),limitVal,curVal,false);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
|