Browse Source

修改日志输出,crc校验暂且屏蔽掉了。

zzj 6 years ago
parent
commit
669b9a37bf
2 changed files with 10 additions and 5 deletions
  1. 2 2
      card.cpp
  2. 8 3
      card_message_handle.cpp

+ 2 - 2
card.cpp

@@ -351,8 +351,8 @@ void card_list::on_message(zloop<task*> *loop,const message_locinfo&loc,bool is_
 		log_warn("数据库中未定义该卡的信息,card_id=%d, card_type=%d,cardid:%lld",loc.m_card_id,loc.m_card_type,cardid);
 		return;
 	}
-	logn_info(3,"card_message:site=%d,ant=%d,card=%d,tof=%lld,rav=%02X,acc=%02X,rssi=%d,stamp=%llu",
-			loc.m_site_id,loc.m_ant_id,loc.m_card_id,loc.m_tof,loc.m_rav,loc.m_acc,loc.m_rssi,loc.m_time_stamp);
+	logn_info(3,"card_message:site=%d,ant=%d,card=%d,ct=%d,tof=%lld,rav=%02X,acc=%02X,rssi=%d,stamp=%llu",
+			loc.m_site_id,loc.m_ant_id,loc.m_card_id,loc.m_card_ct,loc.m_tof,loc.m_rav,loc.m_acc,loc.m_rssi,loc.m_time_stamp);
 
 	c->on_message(loop,loc,is_history);
 }

+ 8 - 3
card_message_handle.cpp

@@ -109,8 +109,13 @@ struct one_ct_message_handle
 
     void calc_location()
 	{
-		log_info("calc_location:%d begin",m_card->m_id);
-        auto v = m_msg_list;
+		auto v = m_msg_list;
+		if(v.empty())
+		{
+			return;
+		}
+
+		log_info("calc_location_begin:card_id=%d,ct=%d,m_ct=%d",m_card->m_id,v[0].m_card_ct,m_ct);
 
 		std::vector<point> rc=std::move(m_loc_tool.calc_location(v));
 		log_info("calc_location:%d size:%d",m_card->m_id,rc.size());
@@ -118,7 +123,7 @@ struct one_ct_message_handle
 		if(!rc.empty()) m_card->on_location(std::move(rc),v);
 
 		reset();
-		log_info("calc_location:%d end",m_card->m_id);
+		log_info("calc_location_end:card_id=%d",m_card->m_id);
 	}
 };