修改cardid的类型为int64_t

area.cpp

@@ -13,17 +13,17 @@ struct area_impl
 	}
 
 
-	void on_hover(int card_id,std::shared_ptr<area_hover>&c,double speed)
+    void on_hover(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)
 	{
-	
+
 	}
 
-	void on_enter(int card_id,std::shared_ptr<area_hover>&c,double speed)
+    void on_enter(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)
 	{
 	
 	}
 
-	void on_leave(int card_id,std::shared_ptr<area_hover>&c,double speed)
+    void on_leave(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)
 	{
 	
 	

area.h

@@ -16,9 +16,9 @@ struct area
 	{
 	}
 
-	virtual void on_hover(int card_id,std::shared_ptr<area_hover>&c,double speed)=0;
-	virtual void on_enter(int card_id,std::shared_ptr<area_hover>&c,double speed)=0;
-	virtual void on_leave(int card_id,std::shared_ptr<area_hover>&c,double speed)=0;
+    virtual void on_hover(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)=0;
+    virtual void on_enter(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)=0;
+    virtual void on_leave(int64_t card_id,std::shared_ptr<area_hover>&c,double speed)=0;
 
 	int id()const
 	{
@@ -89,7 +89,7 @@ struct area_tool
 	void on_point(int card_id,const point&pt,double speed)
 	{
 		std::vector<std::shared_ptr<area>> areas=area_list::instance()->get_area(pt);//找出所有的区域
-		std::sort(areas.begin(),areas.end(),[](std::shared_ptr<area>&l,std::shared_ptr<area>&r){
+        std::sort(areas.begin(),areas.end(),[](std::shared_ptr<area>l,std::shared_ptr<area>r){
 			return l->id()<r->id();
 		});
 
@@ -137,22 +137,22 @@ struct area_tool
 
 
 	//检测是否超时
-	void on_timer(int card_id)
+    void on_timer(int64_t card_id)
 	{
 	
 	}
 
-	void do_hover_biz(int card_id,std::shared_ptr<area_hover>&a,double speed)
+    void do_hover_biz(int64_t card_id,std::shared_ptr<area_hover>&a,double speed)
 	{
 		a->m_area->on_hover(card_id,a,speed);
 	}
 
-	void do_enter_biz(int card_id,std::shared_ptr<area_hover> a,double speed)
+    void do_enter_biz(int64_t card_id,std::shared_ptr<area_hover> a,double speed)
 	{
 		a->m_area->on_enter(card_id,a,speed);
 	}
 
-	void do_leave_biz(int card_id,std::shared_ptr<area_hover> a,double speed)
+    void do_leave_biz(int64_t card_id,std::shared_ptr<area_hover> a,double speed)
 	{
 		a->m_area->on_leave(card_id,a,speed);
 	}

card.cpp

@@ -248,5 +248,5 @@ struct card_list_impl:card_list
 };
 
 template<> std::shared_ptr<card_list> 
-single_base<card_list, int, std::shared_ptr<card_location_base>>::m_instance=std::make_shared<card_list_impl>();
+single_base<card_list, int64_t, std::shared_ptr<card_location_base>>::m_instance=std::make_shared<card_list_impl>();
 

card.h

@@ -11,7 +11,7 @@ struct card_location_base;
 struct task;
 template<typename T> struct zloop;
 
-struct card_list:single_base<card_list,int,std::shared_ptr<card_location_base>>
+struct card_list:single_base<card_list,int64_t,std::shared_ptr<card_location_base>>
 {
 	virtual void on_message(zloop<task*> *loop,const message_locinfo&loc,bool is_history)=0;
 	virtual ~card_list(){}

log.h

@@ -1 +1,34 @@
-../dist/include/log.h
+#ifndef __ZLOG_HPP__
+#define __ZLOG_HPP__
+
+extern int log_impl_init(const char*config_file_name);
+extern void log_impl_print(int log_id,const char*fname,int line,int level,const char*fmt,...);
+extern void log_impl_print_errno(int log_id,const char*fname,int line,int level,const char*fmt,...);
+extern void log_impl_binary(int log_id,const char*fname,int line,const char*add_msg,const char*d,int len);
+
+#define log_init(cfg_name)log_impl_init(cfg_name)
+
+#define logn_debug(id,fmt,...)log_impl_print(id,__FILE__,__LINE__,0,fmt, ##__VA_ARGS__ )
+#define logn_info(id,fmt,...)log_impl_print(id,__FILE__,__LINE__,1,fmt, ##__VA_ARGS__ )
+#define logn_warn(id,fmt,...)log_impl_print(id,__FILE__,__LINE__,2,fmt, ##__VA_ARGS__ )
+#define logn_error(id,fmt,...)log_impl_print(id,__FILE__,__LINE__,3,fmt, ##__VA_ARGS__ )
+#define logn_errno(id,fmt,...)log_impl_print_errno(id,__FILE__,__LINE__,3,fmt, ##__VA_ARGS__ )
+#define logn_bin(id,add_msg,d,dlen)log_impl_binary(id,__FILE__,__LINE__,add_msg,d,dlen)
+
+#define log_debug(fmt,...)logn_debug(0,fmt,##__VA_ARGS__)
+#define log_info(fmt,...)logn_info(0,fmt,##__VA_ARGS__)
+#define log_warn(fmt,...)logn_warn(0,fmt,##__VA_ARGS__)
+#define log_error(fmt,...)logn_error(0,fmt,##__VA_ARGS__)
+#define log_errno(fmt,...)logn_errno(0,fmt,##__VA_ARGS__)
+#define log_bin(add_msg,d,dlen)logn_bin(0,add_msg,d,dlen)
+
+#define std_debug(fmt,...)logn_debug(-1,fmt,##__VA_ARGS__)
+#define std_info(fmt,...)logn_info(-1,fmt,##__VA_ARGS__)
+#define std_warn(fmt,...)logn_warn(-1,fmt,##__VA_ARGS__)
+#define std_error(fmt,...)logn_error(-1,fmt,##__VA_ARGS__)
+#define std_errno(fmt,...)logn_errno(-1,fmt,##__VA_ARGS__)
+#define std_bin(add_msg,d,dlen)logn_bin(-1,add_msg,d,dlen)
+
+#endif
+
+

site_area.cpp

@@ -1,6 +1,8 @@
 
 #include "site_area.h"
 
+#include "card.h"
+
 //每张卡包含这样一个对象，保存最后一个分站区域
 //1、记录卡进出分站的时间，地点
 //2、用于考勤
@@ -11,7 +13,7 @@ site_area_hover::site_area_hover()
 {
 }
 
-void site_area_hover::on_point(int card_id,int site_id,const point*pt)
+void site_area_hover::on_point(int64_t card_id,int site_id,const point*pt)
 {
 	if(pt!=nullptr)
 	{
@@ -26,7 +28,7 @@ void site_area_hover::on_point(int card_id,int site_id,const point*pt)
 			return;
 
 		//离开现有分站处理，记录现有分站的进出时间和地点
-		leave_site(card_id,site_id);
+        leave_site(card_id,m_site_id);
 
 		//进入分站覆盖区域处理，考勤
 		enter_site(card_id,site_id);
@@ -38,13 +40,13 @@ void site_area_hover::on_point(int card_id,int site_id,const point*pt)
 	}
 }
 
-void site_area_hover::enter_site(int card_id,int enter_site)
+void site_area_hover::enter_site(int64_t card_id,int enter_site)
 {
 
 
 }
 
-void site_area_hover::leave_site(int card_id,int enter_site)
+void site_area_hover::leave_site(int64_t card_id,int enter_site)
 {
 
 

site_area.h

@@ -10,10 +10,10 @@ struct site_area_hover
 	//调用时机：
 	//1、tof一维收到第一个数据点时，以pt=0调用
 	//2、数据点解析完毕之后调用
-	void on_point(int card_id,int site_id,const point*pt);
+    void on_point(int64_t card_id,int site_id,const point*pt);
 private:
-	void enter_site(int card_id,int enter_site);
-	void leave_site(int card_id,int enter_site);
+    void enter_site(int64_t card_id,int enter_site);
+    void leave_site(int64_t card_id,int enter_site);
 
 	int    m_site_id;
 	time_t m_enter_time,m_last_time;