Prechádzať zdrojové kódy

1、新增g_szPython27ServerConfig全局变量;
2、变更adb状态保存的ini文件,改为server_run.cfg.

scbc.sat2 5 rokov pred
rodič
commit
568bf9a839

+ 2 - 0
SATService/SATService/Global.cpp

@@ -46,6 +46,7 @@ namespace GLOBAL
 	TCHAR g_szDBName[MAX_PATH];					// Êý¾Ý¿âÃû³Æ;	
 	TCHAR g_szPython27Dir[MAX_PATH] = {0};
 	TCHAR g_szPython27ResourceConfig[MAX_PATH] = { 0 };
+	TCHAR g_szPython27ServerConfig[MAX_PATH] = { 0 };
 	std::string g_strIPAddress;
 	std::vector<std::string> g_vtIPAddress;
 
@@ -190,6 +191,7 @@ namespace GLOBAL
 		
 		// resoucre_run.cfg;
 		_stprintf_s(g_szPython27ResourceConfig, _T("%s%s"), g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\resource_run.cfg");
+		_stprintf_s(g_szPython27ServerConfig, _T("%s%s"), g_szPython27Dir, "Lib\\site-packages\\ssat_sdk\\config\\server_run.cfg");
 		if (ERROR_FILE_NOT_FOUND == GetLastError())
 		{
 			return -1;

+ 1 - 0
SATService/SATService/Global.h

@@ -126,6 +126,7 @@ namespace GLOBAL
 	extern TCHAR g_szExt[_MAX_EXT];
 	extern TCHAR g_szPython27Dir[MAX_PATH];
 	extern TCHAR g_szPython27ResourceConfig[MAX_PATH];
+	extern TCHAR g_szPython27ServerConfig[MAX_PATH];
 	extern std::string g_strIPAddress;
 	extern std::vector<std::string> g_vtIPAddress;
 	//////////////////////////////////////////////////////////////////////////

+ 5 - 5
SATService/SATService/SATDevices.cpp

@@ -461,19 +461,19 @@ int CSATDevices::AttachDeviceName2Buffer(SATPROTO::Device (&pbuff)[SATPROTO::MAX
 void CSATDevices::SaveDeviceStatus2Config(SATDEV::STDevice &stDevice)
 {
 	if ( stDevice.nStatus == SATDEV::Online )
-		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Online"), GLOBAL::g_szPython27ResourceConfig);
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Online"), GLOBAL::g_szPython27ServerConfig);
 	else if ( stDevice.nStatus == SATDEV::Offline )
-		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Offline"), GLOBAL::g_szPython27ResourceConfig);
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Offline"), GLOBAL::g_szPython27ServerConfig);
 	else if ( stDevice.nStatus == SATDEV::Dropline )
-		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Dropline"), GLOBAL::g_szPython27ResourceConfig);
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Dropline"), GLOBAL::g_szPython27ServerConfig);
 	else if ( stDevice.nStatus == SATDEV::Unauthorized)
-		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Unauthorized"), GLOBAL::g_szPython27ResourceConfig);
+		WritePrivateProfileString(_T("ADBSTATUS"), stDevice.strName.c_str(), _T("Unauthorized"), GLOBAL::g_szPython27ServerConfig);
 }
 
 void CSATDevices::SaveAllDevicesStatus2Config()
 {
 	// ÏÈÇå¿Õ¶ÎÄÚÈÝ;
-	WritePrivateProfileString(_T("ADBSTATUS"), NULL, NULL, GLOBAL::g_szPython27ResourceConfig);
+	WritePrivateProfileString(_T("ADBSTATUS"), NULL, NULL, GLOBAL::g_szPython27ServerConfig);
 
 	std::vector<SATDEV::STDevice>::iterator it = s_vtDevices.begin();
 	for ( ; it != s_vtDevices.end(); it++ ) {