版本号显示问题修正;

SATHelper/SATHelper/DlgService.cpp

@@ -489,12 +489,12 @@ void CDlgService::OnBnClickedSvnUpdate()
 {
 	// TODO: 在此添加控件通知处理程序代码
 	CSVNMgr::GetInstance()->Update();
-	if (CSVNMgr::GetInstance()->HasNewVersion())
+	if (!CSVNMgr::GetInstance()->HasNewVersion())
 	{
-		MessageBox(_T("更新失败"), _T("更新结果："), MB_OK);
+		MessageBox(_T("更新失败"), _T("更新结果："), MB_OK|MB_ICONWARNING);
 	}
 	else
 	{
-		MessageBox(_T("更新成功"), _T("更新结果："), MB_OK);
+		MessageBox(_T("更新成功，版本号为 ") + CSVNMgr::GetInstance()->GetVersion(), _T("更新结果："), MB_OK);
 	}
 }

SATHelper/SATHelper/Global.cpp

@@ -20,7 +20,7 @@ namespace Global
 	TCHAR g_szPython27Dir[MAX_PATH] = {0};
 	ULONGLONG g_ulWaitTime = 15000;
 	int g_nSysZoomRatio = 100;
-	TCHAR g_szVersion[MAX_PATH] = _T("4.44.200415");
+	TCHAR g_szVersion[MAX_PATH] = _T("4.45.200421");
 	//////////////////////////////////////////////////////////////////////////
 	// È«¾Öº¯Êý;
 	/************************************************************************/

SATHelper/SATHelper/MainFrm.cpp

@@ -385,7 +385,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	InitDevicePanel();
 
-	SetWindowText(CString(_T("SATHelper 版本")) + CString(Global::g_szVersion));
+	CString strVersionInfo;
+	strVersionInfo.Format(_T("SATHelper 版本 %s, SAT 版本 %s"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
+	SetWindowText(strVersionInfo);
 
 	SetTimer(0, 60000, NULL);
 	CSVNMgr::GetInstance()->Load();
@@ -787,14 +789,18 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 			if (bTopWnd == FALSE)
 			{
 				SetWindowPos(&wndTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);//窗口置顶
-				_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 前置窗口（请按F3取消或开启前置）"), Global::g_szVersion);
-				SetWindowText(szVersion);
+				CString strVersionInfo;
+				strVersionInfo.Format(_T("SATHelper 版本 %s, SAT 版本 %s。视频采集卡 - 前置窗口（请按F3取消或开启前置）"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
+				//_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 前置窗口（请按F3取消或开启前置）"), Global::g_szVersion);
+				SetWindowText(strVersionInfo);
 			}
 			else
 			{
 				SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);//取消窗口置顶	
-				_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 取消前置（请按F3取消或开启前置）"), Global::g_szVersion);
-				SetWindowText(szVersion);
+				CString strVersionInfo;
+				strVersionInfo.Format(_T("SATHelper 版本 %s, SAT 版本 %s。视频采集卡 - 取消前置（请按F3取消或开启前置）"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
+				//_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 取消前置（请按F3取消或开启前置）"), Global::g_szVersion);
+				SetWindowText(strVersionInfo);
 			}
 
 			bTopWnd = !bTopWnd;

SATHelper/SATHelper/SATHelper.cpp

@@ -25,6 +25,7 @@
 
 #include "IOCPModel.h"
 #include "SATClient.h"
+#include "SVNProc.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -140,6 +141,7 @@ BOOL CSATHelperApp::InitInstance()
 #endif
 #endif
 
+	CSVNMgr::GetInstance()->Load();
 #if 1
 	std::thread t([]() {
 		while (true) {
@@ -270,8 +272,9 @@ public:
 	BOOL OnInitDialog()
 	{
 		CDialogEx::OnInitDialog();
-
-		GetDlgItem(IDC_STATIC_VERSION)->SetWindowText(CString(_T("SATHelper，版本：")) + Global::g_szVersion);
+		CString strVersionInfo;
+		strVersionInfo.Format(_T("%s,%s。"), Global::g_szVersion, CSVNMgr::GetInstance()->GetVersion());
+		GetDlgItem(IDC_STATIC_VERSION)->SetWindowText(strVersionInfo);
 
 		return TRUE;
 	}

SATHelper/SATHelper/SATHelper.rc

@@ -444,7 +444,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "关于 SATHelper"
 FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,14,14,20,20
+    ICON            IDR_MAINFRAME,IDC_STATIC,14,14,18,18
     LTEXT           "SATHelper，版本: 4.39.003",IDC_STATIC_VERSION,42,14,125,8,SS_NOPREFIX
     LTEXT           "<自动化测试小组>版权所有 (C) 2019",IDC_STATIC,42,27,114,8
     DEFPUSHBUTTON   "确定",IDOK,121,42,50,14,WS_GROUP
@@ -510,7 +510,7 @@ BEGIN
     LTEXT           "执行中",LABLE_TASK_STATUS,138,123,25,8
     PUSHBUTTON      "mi Init",BTN_MI_INIT,3,95,46,14
     PUSHBUTTON      "scbc Init",BTN_SCBC_INIT,76,95,31,14
-    PUSHBUTTON      "SVN Update",BTN_SVN_UPDATE,111,95,50,14
+    PUSHBUTTON      "SAT Update",BTN_SVN_UPDATE,111,95,50,14
 END
 
 

SATHelper/SATHelper/SVNProc.cpp

@@ -372,6 +372,18 @@ void CSVNMgr::Store(LPCTSTR lpFileName)
 	}
 }
 
+CString CSVNMgr::GetVersion()
+{
+	CSVNProc* pSVN = NULL;
+	int nSize = m_arySVN.GetSize();
+	if (nSize == 0)
+		return CString("¡¾»ñÈ¡°æ±¾Ê§°Ü£¡¡¿");
+
+	CString strVersion;
+	strVersion.Format(_T("%ld"), m_arySVN.GetAt(0)->m_dwSVNVersion);
+	return strVersion;
+}
+
 BOOL CSVNMgr::CheckNewVersion(std::string url, std::string strContent)
 {
 	std::string data;

SATHelper/SATHelper/SVNProc.h

@@ -89,6 +89,7 @@ private:
 public:
 	void Load(LPCTSTR lpFileName =_T("svn.data"));
 	void Store(LPCTSTR lpFileName = _T("svn.data"));
+	CString GetVersion();
 	// ¼ì²â°æ±¾:ÓÐа汾·µ»ØTRUE;
 	BOOL CheckNewVersion(std::string url, std::string strContent);
 	void Update();