fix merging

SyncTime/SyncManager.cpp

@@ -25,22 +25,12 @@ void HostServer::SyncManager::init()
 	InitializeCriticalSectionAndSpinCount(&m_csSyncTime, 4000);
     _anchors.swap(unordered_map<unsigned long long, Position>());
     _distance.swap(unordered_map<unsigned long long,unordered_map<unsigned long long, double>>());
-<<<<<<< HEAD
-
-=======
-	//logDir = ".\\synclog\\";
->>>>>>> newprotocal
 	std::string dir = "";
 
 	TCHAR chpath[MAX_PATH];
 	::GetModuleFileName(NULL,chpath, MAX_PATH);
 	(_tcsrchr(chpath, _T('\\')))[1] = 0;
 	dir = CFunctions::TCHAR2string(chpath);
-<<<<<<< HEAD
-
-	//logDir = ".\\synclog\\";
-=======
->>>>>>> newprotocal
 	logDir = dir + "\\synclog\\";
 
 	if(0 != _access(logDir.c_str(), 0)){

YAServerDlg.cpp

@@ -14158,6 +14158,7 @@ std::string CYAServerDlg::get_json_event(bool bAll /*= false*/)
 	for(; it_ev != mp_event_list->end();){
 		// lihongzhen  2017/8/19 ÒÑ´¦Àíºô¾È²»ÔÙ·¢ËÍ
 		if(it_ev->second->status != ES_START && it_ev->second->status != ES_END){
+			++it_ev;
 			continue;
 		}
 		if(!it_ev->second->is_sent || bAll){

classdef.h

@@ -1427,7 +1427,6 @@ public:
 
 	bool CheckCardCtValid();	//检查卡的ct有效性
 	double GetFittingDegree(std::list<std::shared_ptr<Cell>> ltCells);	//检查拟合度
-	std::shared_ptr<POS> GetPosFromFittingData();						//从拟合数据获取定位坐标
 private:
 	int state_biz;					//业务状态，呼叫/超时/进入禁区等
 	int pos_state;					// 位置状态，0初始化，1井下，2井上，3车场分站