Browse Source

普通的cmd命令由WinExec执行;

scbc.sat2 5 years ago
parent
commit
c81c78c6e8
1 changed files with 11 additions and 5 deletions
  1. 11 5
      SATService/SATService/SATDevices.cpp

+ 11 - 5
SATService/SATService/SATDevices.cpp

@@ -134,10 +134,12 @@ DWORD CSATDevices::WorkThread(LPVOID lpVoid)
 				} else {
 					if ( it->nType == 1 ) {
 						// 设备下线,尝试重新连接;
-						//cmd("adb connect"+it->strName);
+						std::string str = "adb connect ";
+						str.append(it->strName);
+						WinExec(str.c_str(), SW_HIDE);
 					} else {
 						// 如果是usb的话,可能要kill-server,再全部重连接;
-						//cmd("adb kill-server");
+						WinExec("adb kill-server", SW_HIDE);
 						// 重连所有;
 						ReConnectAllDevices();
 					}
@@ -266,7 +268,7 @@ bool CSATDevices::IsNewAndroid(STAndroid &stAndroid)
 
 void CSATDevices::GetCurrentDevices(std::vector<STAndroid> &vtAndroids)
 {
-	std::string strLines = "";//ExecuteCmd("adb devices");
+	std::string strLines = ExecuteCMD("adb devices");
 	std::vector<std::string> vtLine;
 	Split(vtLine, strLines, "\r\n");
 	int npos = -1;
@@ -290,9 +292,13 @@ void CSATDevices::GetCurrentDevices(std::vector<STAndroid> &vtAndroids)
 
 void CSATDevices::ReConnectAllDevices()
 {
+	std::string str;
 	std::vector<STAndroid>::iterator it = s_vtAndroids.begin();
 	for ( ;it != s_vtAndroids.end(); it++ ) {
-		if ( it->nType )
-			;//cmd("adb connect"+it->strName);
+		if ( it->nType == Reticle ) {
+			str = "adb connect ";
+			str.append(it->strName);
+			WinExec(str.c_str(), SW_HIDE);
+		}
 	}
 }