瀏覽代碼

版本号:由全局变量控制;

scbc.sat2 5 年之前
父節點
當前提交
4f4f56bdbf

+ 1 - 0
SATHelper/SATHelper/Global.cpp

@@ -20,6 +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");
 	//////////////////////////////////////////////////////////////////////////
 	// È«¾Öº¯Êý;
 	/************************************************************************/

+ 1 - 0
SATHelper/SATHelper/Global.h

@@ -65,6 +65,7 @@ namespace Global
 	extern TCHAR g_szPython27Dir[MAX_PATH];
 	extern ULONGLONG g_ulWaitTime;
 	extern int g_nSysZoomRatio;
+	extern TCHAR g_szVersion[MAX_PATH];
 
 	//////////////////////////////////////////////////////////////////////////
 	// È«¾Öº¯Êý;

+ 6 - 3
SATHelper/SATHelper/MainFrm.cpp

@@ -383,7 +383,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	InitDevicePanel();
 
-	SetWindowText(_T("SATHelper 版本4.39.003"));
+	SetWindowText(CString(_T("SATHelper 版本")) + CString(Global::g_szVersion));
 
 	return 0;
 }
@@ -774,6 +774,7 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 {
 	// TODO: 在此添加专用代码和/或调用基类
 	static BOOL bTopWnd = FALSE;
+	static TCHAR szVersion[MAX_PATH];
 	if (pMsg->message == WM_KEYDOWN)
 	{
 		if (pMsg->wParam == VK_F3)
@@ -781,12 +782,14 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 			if (bTopWnd == FALSE)
 			{
 				SetWindowPos(&wndTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);//窗口置顶
-				SetWindowText(_T("SATHelper 版本4.39.003 视频采集卡 - 前置窗口(请按F3取消或开启前置)"));
+				_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 前置窗口(请按F3取消或开启前置)"), Global::g_szVersion);
+				SetWindowText(szVersion);
 			}
 			else
 			{
 				SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);//取消窗口置顶	
-				SetWindowText(_T("SATHelper 版本4.39.003 视频采集卡-取消前置(请按F3取消或开启前置)"));
+				_stprintf_s(szVersion, _T("SATHelper 版本%s 视频采集卡 - 取消前置(请按F3取消或开启前置)"), Global::g_szVersion);
+				SetWindowText(szVersion);
 			}
 
 			bTopWnd = !bTopWnd;

+ 2 - 2
SATHelper/SATHelper/Resource.h

@@ -142,6 +142,7 @@
 #define LABLE_TASK                      1019
 #define LABLE_TASK_STATUS               1020
 #define TX_TASKID                       1021
+#define IDC_STATIC_VERSION              1022
 #define ID_WRITE_PASTEASHYPERLINK       32770
 #define ID_TRAYMENU_RECONNECT           32771
 #define ID_TRAYMENU_EXIT                32772
@@ -193,7 +194,6 @@
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
 #define ID_DEVICES_DEL                  32829
-#define ID_CHECK3                       32830
 #define ID_CHECK_ACTUATOR               32830
 
 // Next default values for new objects
@@ -202,7 +202,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
 #define _APS_NEXT_COMMAND_VALUE         32831
-#define _APS_NEXT_CONTROL_VALUE         1022
+#define _APS_NEXT_CONTROL_VALUE         1023
 #define _APS_NEXT_SYMED_VALUE           310
 #endif
 #endif

+ 10 - 0
SATHelper/SATHelper/SATHelper.cpp

@@ -265,6 +265,16 @@ protected:
 // 实现
 protected:
 	DECLARE_MESSAGE_MAP()
+
+public:
+	BOOL OnInitDialog()
+	{
+		CDialogEx::OnInitDialog();
+
+		GetDlgItem(IDC_STATIC_VERSION)->SetWindowText(CString(_T("SATHelper,版本:")) + Global::g_szVersion);
+
+		return TRUE;
+	}
 };
 
 CAboutDlg::CAboutDlg() noexcept : CDialogEx(IDD_ABOUTBOX)

+ 3 - 3
SATHelper/SATHelper/SATHelper.rc

@@ -445,7 +445,7 @@ CAPTION "关于 SATHelper"
 FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,14,14,20,20
-    LTEXT           "SATHelper,版本: 4.39.003",IDC_STATIC,42,14,125,8,SS_NOPREFIX
+    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
 END
@@ -519,7 +519,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,39,3
+ FILEVERSION 4,44,3807,0
  PRODUCTVERSION 2,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -537,7 +537,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "自动化测试小组"
             VALUE "FileDescription", "SATHelper"
-            VALUE "FileVersion", "2.4.39.3"
+            VALUE "FileVersion", "4.44.3807.0"
             VALUE "InternalName", "SATHelper.exe"
             VALUE "LegalCopyright", "自动化测试小组。  保留所有权利。"
             VALUE "OriginalFilename", "SATHelper.exe"

+ 2 - 2
SATHelper/SATHelper/resource.h

@@ -142,6 +142,7 @@
 #define LABLE_TASK                      1019
 #define LABLE_TASK_STATUS               1020
 #define TX_TASKID                       1021
+#define IDC_STATIC_VERSION              1022
 #define ID_WRITE_PASTEASHYPERLINK       32770
 #define ID_TRAYMENU_RECONNECT           32771
 #define ID_TRAYMENU_EXIT                32772
@@ -193,7 +194,6 @@
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
 #define ID_DEVICES_DEL                  32829
-#define ID_CHECK3                       32830
 #define ID_CHECK_ACTUATOR               32830
 
 // Next default values for new objects
@@ -202,7 +202,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
 #define _APS_NEXT_COMMAND_VALUE         32831
-#define _APS_NEXT_CONTROL_VALUE         1022
+#define _APS_NEXT_CONTROL_VALUE         1023
 #define _APS_NEXT_SYMED_VALUE           310
 #endif
 #endif