|
@@ -322,11 +322,14 @@ void CSATDevices::GetCurrentDevices(std::vector<SATDEV::STDevice> &vtDevices)
|
|
|
int npos = -1;
|
|
|
// offline设备也要加入,不区分usb或reticle;
|
|
|
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;
|
|
|
// 设备类型;
|
|
|
- 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.ulOfflineTime = 0;
|
|
|
// 设备状态;
|