Bläddra i källkod

usb设备adb重连超过多长时间后开启adb kill命令,该时长配置到配置文件中;

scbc.sat2 5 år sedan
förälder
incheckning
29f2dbff2d

+ 1 - 0
SATService/SATService/Global.cpp

@@ -199,6 +199,7 @@ namespace GLOBAL
 			WritePrivateProfileString(_T("SATService"), _T("ScriptDir"), g_stSATConfig.szScriptDir, szIniPath);
 		}
 
+		g_stSATConfig.dwAdbKillTime = GetPrivateProfileInt(_T("SATService"), _T("AdbKillTime"), 9000, szIniPath);
 		g_stSATConfig.dwAdbTimeout = GetPrivateProfileInt(_T("SATService"), _T("AdbTimeout"), 120000, szIniPath);
 		g_stSATConfig.dwTCPSvrPort = GetPrivateProfileInt(_T("SATService"), _T("TCPSvrPort"), 5588, szIniPath);
 		g_stSATConfig.dwScriptTimeout = GetPrivateProfileInt(_T("SATService"), _T("ScriptTimeout"), 300000, szIniPath);

+ 2 - 0
SATService/SATService/Global.h

@@ -35,6 +35,8 @@ namespace GLOBAL
 {
 	typedef struct __ST_SAT_CFG__ 
 	{
+		// usb设备adb重连时长(超过该时长,执行adb kill)
+		DWORD dwAdbKillTime;
 		// adb超时断线时长;
 		DWORD dwAdbTimeout;
 		// 脚本路径;

+ 1 - 1
SATService/SATService/SATDevices.cpp

@@ -189,7 +189,7 @@ DWORD CSATDevices::WorkThread(LPVOID lpVoid)
 						}
 						
 						// 不管状态是Offline还是Dropline,只要重连超过指定时长, 执行kill;
-						if ( it->ulOfflineTime != 0 && GetTickCount64() -  it->ulOfflineTime > 9000 ) { // 1/2掉线时长太久,固定9秒时间,大概3次重连;
+						if ( it->ulOfflineTime != 0 && GetTickCount64() -  it->ulOfflineTime > GLOBAL::g_stSATConfig.dwAdbKillTime ) { // 1/2掉线时长太久,固定9秒时间,大概3次重连;
 							std::string str = "adb kill-server";
 							// 如果是usb的话,可能要kill-server,再全部重连接;
 							WinExec(str.c_str(), SW_HIDE);