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

area.cpp

@@ -5,6 +5,7 @@
 
 #include <area.h>
 #include "point.h"
+#include "tool_time.h"
 #include "monkey_car/monkeycar_area.h"
 #include "landmark.h"
 #include "area_business.h"
@@ -80,6 +81,8 @@ area::area(int id,int limit_count_person, int limit_time_person,double scale,int
 
 void area::on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c)
 {
+	a->m_last_time=tool_time::now_to_ms();
+	a->m_last_point=*c;
  	for(const auto &i:m_area_business_list)
 	{
 		auto &x=a->get_business_data(i->area_business_type());
@@ -90,6 +93,8 @@ void area::on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<ca
 void area::on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c)
 {
 	log_info("on_enter..%d  areaId:%d",c->m_id,m_id);
+	a->m_enter_time=tool_time::now_to_ms();
+	a->m_enter_point=*c;
  	for(const auto &i:m_area_business_list)
 	{
 		auto &x=a->get_business_data(i->area_business_type());
@@ -100,6 +105,8 @@ void area::on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<ca
 void area::on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c)
 {
 	log_info("on_leave..%d  areaId:%d",c->m_id,m_id);
+	a->m_last_time=tool_time::now_to_ms();
+	a->m_last_point=*c;
  	for(const auto &i:m_area_business_list)
 	{
 		auto &x=a->get_business_data(i->area_business_type());