|
@@ -389,7 +389,11 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
strVersionInfo.Format(_T("SATHelper 版本 %s, SAT 版本 %s"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
|
|
strVersionInfo.Format(_T("SATHelper 版本 %s, SAT 版本 %s"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
|
|
SetWindowText(strVersionInfo);
|
|
SetWindowText(strVersionInfo);
|
|
|
|
|
|
|
|
+#ifdef _DEBUG
|
|
|
|
+ SetTimer(0, 3000, NULL);
|
|
|
|
+#else
|
|
SetTimer(0, 60000, NULL);
|
|
SetTimer(0, 60000, NULL);
|
|
|
|
+#endif
|
|
CSVNMgr::GetInstance()->Load();
|
|
CSVNMgr::GetInstance()->Load();
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -1286,13 +1290,38 @@ void CMainFrame::OnHadSound()
|
|
{
|
|
{
|
|
// TODO: 在此添加命令处理程序代码
|
|
// TODO: 在此添加命令处理程序代码
|
|
std::thread t([&]() {
|
|
std::thread t([&]() {
|
|
- // 强制stdion, stdout和stderr完全无缓冲:python -u
|
|
|
|
TCHAR szCommandLine[MAX_PATH] = { 0 };
|
|
TCHAR szCommandLine[MAX_PATH] = { 0 };
|
|
- _stprintf_s(szCommandLine, _T("python -W ignore \"%s%s\" >>%ssound_log.txt"), Global::g_szPython27Dir, _T("Lib\\site-packages\\ssat_sdk\\sound_init.py"), Global::g_szCurModuleDir);
|
|
|
|
- WinExec(szCommandLine, SW_HIDE);
|
|
|
|
|
|
+ //_stprintf_s(szCommandLine, _T("cmd /c python -W ignore \"%s%s\" >%ssound_log.txt &pause"), Global::g_szPython27Dir, _T("Lib\\site-packages\\ssat_sdk\\sound_init.py"), Global::g_szCurModuleDir);
|
|
|
|
+ _stprintf_s(szCommandLine, _T("cmd /c python -W ignore \"%s%s\" &pause"), Global::g_szPython27Dir, _T("Lib\\site-packages\\ssat_sdk\\sound_init.py"));
|
|
|
|
+#if 0
|
|
|
|
+ // 强制stdion, stdout和stderr完全无缓冲:python -u
|
|
|
|
+ WinExec(szCommandLine, SW_SHOW);
|
|
OutputDebugString(szCommandLine);
|
|
OutputDebugString(szCommandLine);
|
|
// 等待10秒;
|
|
// 等待10秒;
|
|
Sleep(30000);
|
|
Sleep(30000);
|
|
|
|
+#else
|
|
|
|
+ SHELLEXECUTEINFO sei;
|
|
|
|
+ memset(&sei, 0, sizeof(SHELLEXECUTEINFO));
|
|
|
|
+ sei.cbSize = sizeof(SHELLEXECUTEINFO);
|
|
|
|
+ sei.hwnd = NULL;
|
|
|
|
+ sei.lpVerb = _T("open");
|
|
|
|
+ sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI;
|
|
|
|
+ sei.lpFile = "cmd";
|
|
|
|
+ sei.lpParameters = szCommandLine;
|
|
|
|
+ sei.lpDirectory = NULL;
|
|
|
|
+ sei.nShow = SW_SHOW;
|
|
|
|
+ sei.hInstApp = NULL;
|
|
|
|
+
|
|
|
|
+ if (!ShellExecuteEx(&sei)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (sei.hProcess != NULL) {
|
|
|
|
+ WaitForSingleObject(sei.hProcess, INFINITE);
|
|
|
|
+ if (sei.hProcess)
|
|
|
|
+ CloseHandle(sei.hProcess);
|
|
|
|
+ }
|
|
|
|
+#endif
|
|
ReadRsRunCfg(m_rscfg);
|
|
ReadRsRunCfg(m_rscfg);
|
|
// Ribbon Combobox添加默认项;
|
|
// Ribbon Combobox添加默认项;
|
|
CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
|
|
CMFCRibbonBar* pRibbon = g_pMainFrame->GetRibbonBar();
|