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

card_base.cpp

@@ -89,6 +89,8 @@ void card_location_base::on_location(const std::vector<point>&vp,const std::vect
 	loc_point pt = m_sel_tool->select_solution(vp,lm);
 	pt.y=-pt.y;
 	auto site_ptr=get_area_tool()->m_site;
+	int sid=0;
+	if(site_ptr)sid=site_ptr->m_id;
 	if(pt.m_useless)
 	{
 		x = tool_other::round(pt.x,3);
@@ -100,18 +102,11 @@ void card_location_base::on_location(const std::vector<point>&vp,const std::vect
 
 		double acc = lm[0].m_acc;
         m_acc = lm[0].m_acc;
-		log_info("useful:type:%d,card_id:%d,ct:%d,timestamp:%llu, loc_point,x:%f,y:%f acc:%.2f",m_type,m_id,m_ct,m_time,x,y,acc);
+		log_info("useful:type:%d,card_id:%d,site:%d,ct:%d,timestamp:%llu, loc_point,x:%f,y:%f acc:%.2f",m_type,m_id,sid,m_ct,m_time,x,y,acc);
 		do_business(lm.front().m_sit, pt, acc);
 	}
 	else
 	{
-		int sid=0;
-
-		if(site_ptr)
-		{
-			sid=site_ptr->m_id;
-		}
-		
 		log_warn("坐标不可用:site_id:%d,type:%d,card_id:%d,ct:%d,x:%f,y:%f",sid,m_type,m_id,m_ct,pt.x,pt.y);
 	}
 }