Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

card_person.cpp

@@ -115,8 +115,8 @@ void person::handle_three_rates(const point & pt)
 	cp.biz_stat = m_biz_stat;
 	cp.x=pt.x;cp.y=pt.y;cp.z=pt.z;	
 	const auto lm = m_area_tool->getLandmark();
-	cp.enter_time = std::get<0>(lm)*1000;
-	cp.area_id = std::get<3>(lm);
+//	cp.enter_time = std::get<0>(lm)*1000;
+//	cp.area_id = std::get<3>(lm);
 	put_three_rates(cp);
 }
 

module_service/area_business_motionless_persion.cpp

@@ -24,8 +24,6 @@ struct motionless_data:business_data
 //    time_t m_acc_start_time;
 };
 
-int area_business_motionless_persion::_acc_0count_limit;
-
 void area_business_motionless_persion::on_enter(const std::shared_ptr<area_hover>&a,
                                  const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
 {
@@ -64,6 +62,8 @@ void area_business_motionless_persion::on_leave(const std::shared_ptr<area_hover
     event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, false);
 }
 
+int area_business_motionless_persion::_acc_0count_limit;
+
 //void module_motionless_persion::deal_alarm(std::shared_ptr<card_location_base>& card_ptr)
 //{
 //    auto area_hover_ptr = card_ptr->get_area_hover();

module_service/area_business_speed_checker.cpp

@@ -172,7 +172,4 @@ void area_business_speed_checker::init_vehicle_category_from_db()
         std_debug("dat_vehicle_category:category_id:%d--over_speed:%.2f",p.first,p.second);
 }
 
-std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;
-
-