还原之前代码，，暂时不做分站消息解析

net-service.cpp

@@ -47,10 +47,10 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 		case CHAR_LOCATEDATA_TOF_EXTEND://tof-扩展
 			{
 				uint32_t site_id;
-				//is>>site_id>>skip(12);
-				message_siteinfo msgSiteInfo;
-				msgSiteInfo.load(is,false);
-				site_id = msgSiteInfo.m_site_id;
+				is>>site_id>>skip(12);
+				//message_siteinfo msgSiteInfo;
+				//msgSiteInfo.load(is,false);
+				//site_id = msgSiteInfo.m_site_id;
 				auto site_ptr = sit_list::instance()->get(static_cast<int32_t>(site_id));
 				if(!site_ptr)
 				{
@@ -58,13 +58,13 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 					break;
 				}
 				//分站数据到队列
-				task* t_site=task::alloc<message_siteinfo>();
-				message_siteinfo &msg = t_site->body<message_siteinfo>();
-				msg = msgSiteInfo;
-				t_site->m_cmd_code=cmd;
-				t_site->m_hash_id=site_id;
-				t_site->m_site_data = 1;
-				m_loc_worker->request(t_site);
+				//task* t_site=task::alloc<message_siteinfo>();
+				//message_siteinfo &msg = t_site->body<message_siteinfo>();
+				//msg = msgSiteInfo;
+				//t_site->m_cmd_code=cmd;
+				//t_site->m_hash_id=site_id;
+				//t_site->m_site_data = 1;
+				//m_loc_worker->request(t_site);
 				//设置连接到分站数据中
                 site_ptr->set_client(clt);
 
@@ -81,7 +81,7 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 					m.load(is,cmd==0x863b);
 					m.m_time_stamp=tstamp;
 					m.m_site_id=site_id;
-					t_site->m_site_data = 0;
+					//t_site->m_site_data = 0;
 
 					t->m_cmd_code=cmd;
 					t->m_hash_id=m.m_card_id;
@@ -94,25 +94,25 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 		case CHAR_LOCATEDATA_TDOA_EXTEND://tdoa
 			{
 				uint32_t site_id;
-				//is>>site_id>>skip(12);
+				is>>site_id>>skip(12);
 				//分站数据
-				message_siteinfo msgSiteInfo;
-				msgSiteInfo.load(is,false);
-				message_siteinfo &msg = t_site->body<message_siteinfo>();
-				msg = msgSiteInfo;
-				site_id = msgSiteInfo.m_site_id;
-				task*t_site=task::alloc<message_locinfo>();
-				t_site->m_cmd_code=cmd;
-				t_site->m_hash_id=site_id;
-				t_site->m_site_data = 1;
-				m_loc_worker->request(t_site);
+				//message_siteinfo msgSiteInfo;
+				//msgSiteInfo.load(is,false);
+				//message_siteinfo &msg = t_site->body<message_siteinfo>();
+				//msg = msgSiteInfo;
+				//site_id = msgSiteInfo.m_site_id;
+				//task*t_site=task::alloc<message_locinfo>();
+				//t_site->m_cmd_code=cmd;
+				//t_site->m_hash_id=site_id;
+				//t_site->m_site_data = 1;
+				//m_loc_worker->request(t_site);
 				while(!is.eof())
 				{
 					task*t=task::alloc<message_locinfo>();
 					message_locinfo&m=t->body<message_locinfo>();
 					m.load(is,cmd==0x863b);
 					m.m_site_id=site_id;
-					t->m_site_data = 0;
+					//t->m_site_data = 0;
 					t->m_cmd_code=cmd;
 					t->m_hash_id=m.m_card_id;
 					m_sync_worker->translate(m);

worker.cpp

@@ -107,10 +107,7 @@ struct worker_thread: zloop<task*> ,visitor<std::shared_ptr<card_location_base>>
 			case 0x843b://tof
 			case 0x863b://tdoa
 				log_info("card loc message%04X",t.m_cmd_code);
-				if (t.m_site_data == 1)
-					site_message_handle::instance()->parse_data_locate_reader(t.m_cmd_code,t.body<message_siteinfo>(),false);
-				else
-					card_list::instance()->on_message(this,t.body<message_locinfo>(),false);
+				card_list::instance()->on_message(this,t.body<message_locinfo>(),false);
 
 				//card_message::on_loc_message(this,t.m_param1);
 			break;