Browse Source

修正:GetCurrentDevices函数逻辑处理;

scbc.sat2 5 years ago
parent
commit
1758919d17
2 changed files with 7 additions and 4 deletions
  1. 6 3
      SATService/SATService/SATDevices.cpp
  2. 1 1
      SATService/SATService/SATService.cpp

+ 6 - 3
SATService/SATService/SATDevices.cpp

@@ -322,11 +322,14 @@ void CSATDevices::GetCurrentDevices(std::vector<SATDEV::STDevice> &vtDevices)
 	int npos = -1;
 	int npos = -1;
 	// offline设备也要加入,不区分usb或reticle;
 	// offline设备也要加入,不区分usb或reticle;
 	for ( std::vector<std::string>::iterator it = vtLine.begin(); it != vtLine.end(); it++ ) {
 	for ( std::vector<std::string>::iterator it = vtLine.begin(); it != vtLine.end(); it++ ) {
+		//if ( _tcsicmp("List of devices attached ", it->c_str()) == 0 )
+		if ( it->find("List of devices attached ") != std::string::npos )
+			continue;
 		SATDEV::STDevice stDevice;
 		SATDEV::STDevice stDevice;
 		// 设备类型;
 		// 设备类型;
-		if ( it->find(":5555") == std::string::npos )
-			stDevice.nType = SATDEV::Usb;
-		else
+		if ( it->find(":5555") != std::string::npos )
+			stDevice.nType = SATDEV::Reticle;
+		else if ( it->find(":5555") == std::string::npos )
 			stDevice.nType = SATDEV::Reticle;
 			stDevice.nType = SATDEV::Reticle;
 		stDevice.ulOfflineTime = 0;
 		stDevice.ulOfflineTime = 0;
 		// 设备状态;
 		// 设备状态;

+ 1 - 1
SATService/SATService/SATService.cpp

@@ -84,7 +84,7 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 #if 1
 #if 1
 		// Æô¶¯SAT TCP·þÎñ¶Ë;
 		// Æô¶¯SAT TCP·þÎñ¶Ë;
 		CSATTCPServer::GetInstance()->LoadSocketLib();
 		CSATTCPServer::GetInstance()->LoadSocketLib();
-		CSATTCPServer::GetInstance()->Start(5588);
+		CSATTCPServer::GetInstance()->Start(5599);
 #endif
 #endif
 
 
 #if 1
 #if 1