Quellcode durchsuchen

对usb adb设备添加Unauthorized状态记录。

scbc.sat2 vor 5 Jahren
Ursprung
Commit
cf6ba3c916
2 geänderte Dateien mit 9 neuen und 3 gelöschten Zeilen
  1. 7 2
      SATService/SATService/SATDevices.cpp
  2. 2 1
      SATService/SATService/SATDevices.h

+ 7 - 2
SATService/SATService/SATDevices.cpp

@@ -393,8 +393,11 @@ void CSATDevices::GetCurrentDevices(std::vector<SATDEV::STDevice> &vtDevices)
 			stDevice.nStatus = SATDEV::Online;
 		else if ( (npos = it->find("	offline")) != std::string::npos )
 			stDevice.nStatus = SATDEV::Offline;
-		else if ( (npos = it->find(" unauthorized")) != std::string::npos ) // 未认证也做为离线的一种;
-			stDevice.nStatus = SATDEV::Offline;
+		else if ( (npos = it->find("unauthorized")) != std::string::npos ) // 未认证也做为离线的一种;
+		{
+			stDevice.nStatus = SATDEV::Unauthorized;
+			GLOBAL::WriteTextLog("找到unauthorized状态的设备");
+		}
 		// 获取设备名;
 		stDevice.strName = it->substr(0, npos);
 		// 如果是网络,去掉5555;
@@ -463,6 +466,8 @@ void CSATDevices::SaveDeviceStatus2Config(SATDEV::STDevice &stDevice)
 		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Offline"), GLOBAL::g_szPython27ResourceConfig);
 	else if ( stDevice.nStatus == SATDEV::Dropline )
 		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Dropline"), GLOBAL::g_szPython27ResourceConfig);
+	else if ( stDevice.nStatus == SATDEV::Unauthorized)
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Unauthorized"), GLOBAL::g_szPython27ResourceConfig);
 }
 
 void CSATDevices::SaveAllDevicesStatus2Config()

+ 2 - 1
SATService/SATService/SATDevices.h

@@ -18,7 +18,8 @@ namespace SATDEV{
 	enum DEVICE_STATUS{
 		Online,
 		Offline,
-		Dropline
+		Dropline,
+		Unauthorized
 	};
 
 	// É豸ʹÓÃ״̬;