Bläddra i källkod

所有adb设备状态都要写入配置文件中, adb atx不区分usb和ip设备;

scbc.sat2 5 år sedan
förälder
incheckning
8fa8853d6f
2 ändrade filer med 10 tillägg och 12 borttagningar
  1. 9 12
      SATService/SATService/SATDevices.cpp
  2. 1 0
      SATService/SATService/SATService.cpp

+ 9 - 12
SATService/SATService/SATDevices.cpp

@@ -157,7 +157,7 @@ DWORD CSATDevices::WorkThread(LPVOID lpVoid)
 #ifdef _DEBUG
 				printf("IsDevicesOffline\n");
 #endif
-				if ( GetTickCount64() - it->ulOfflineTime > GLOBAL::g_stSATConfig.dwAdbTimeout ) {
+				if ( (GetTickCount64() - it->ulOfflineTime) > GLOBAL::g_stSATConfig.dwAdbTimeout ) {
 					GLOBAL::WriteTextLog("移除设备->设备类型:%d, 设备名称:%s, 状态:%d", it->nType, it->strName.c_str(), it->nStatus);
 					// 移除设备(需要线程加锁);
 					it = s_vtDevices.erase(it);					
@@ -451,15 +451,12 @@ int CSATDevices::AttachDeviceName2Buffer(SATPROTO::Device (&pbuff)[SATPROTO::MAX
 
 void CSATDevices::SaveDeviceStatus2Config(SATDEV::STDevice &stDevice)
 {
-	if ( stDevice.nType == SATDEV::Usb ) {
-		// 如果是usb设备重连成功,写入文件中;
-		TCHAR szIniPath[MAX_PATH] = {0};
-		_stprintf_s(szIniPath, _T("%s%s"), GLOBAL::g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\resource_run.cfg");
-		if ( stDevice.nStatus == SATDEV::Online )
-			WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Online"), szIniPath);
-		else if ( stDevice.nStatus == SATDEV::Offline )
-			WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Offline"), szIniPath);
-		else if ( stDevice.nStatus == SATDEV::Dropline )
-			WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Dropline"), szIniPath);
-	}
+	TCHAR szIniPath[MAX_PATH] = {0};
+	_stprintf_s(szIniPath, _T("%s%s"), GLOBAL::g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\resource_run.cfg");
+	if ( stDevice.nStatus == SATDEV::Online )
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Online"), szIniPath);
+	else if ( stDevice.nStatus == SATDEV::Offline )
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Offline"), szIniPath);
+	else if ( stDevice.nStatus == SATDEV::Dropline )
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Dropline"), szIniPath);
 }

+ 1 - 0
SATService/SATService/SATService.cpp

@@ -69,6 +69,7 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 		GLOBAL::GetLocalAddress();
 		GLOBAL::WriteTextLog("SATService goto start, tcp port = %ld", GLOBAL::g_stSATConfig.dwTCPSvrPort);
 #ifdef _DEBUG
+		printf("服务端TCP端口号=%ld\n", GLOBAL::g_stSATConfig.dwTCPSvrPort);
 		WorkStart();
 
 		// 指定时间停止;