From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/BondEq.cpp | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.cpp b/SourceCode/Bond/BondEq/BondEq.cpp
index c595973..984e455 100644
--- a/SourceCode/Bond/BondEq/BondEq.cpp
+++ b/SourceCode/Bond/BondEq/BondEq.cpp
@@ -77,6 +77,11 @@
SetRegistryKey(_T("应用程序向导生成的本地应用程序"));
+ // gdi+
+ Gdiplus::GdiplusStartupInput gdiplusStartupInput;
+ Gdiplus::GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, NULL);
+
+
// 本程序文件目录
TCHAR sDrive[_MAX_DRIVE];
TCHAR sDir[_MAX_DIR];
@@ -99,6 +104,17 @@
// 初始化BEQ库
BEQ_Initialize();
RX_Init();
+
+
+ CString strIniFile;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)m_strAppDir);
+ int plcTimeout = GetPrivateProfileInt("PLC", "Timeout", 700, strIniFile);
+ int plcBufSize = GetPrivateProfileInt("PLC", "BufSize", 20, strIniFile);
+ int plcPacketSize = GetPrivateProfileInt("PLC", "PacketSize", 80, strIniFile);
+ MCL_Initialize();
+ MCL_SetTimeout(plcTimeout);
+ MCL_SetMaxActionSize(plcBufSize);
+ MCL_SetPacketSize(plcPacketSize);
// 自定义组件
@@ -141,8 +157,16 @@
int CBondEqApp::ExitInstance()
{
+ m_model.term();
BEQ_Term();
RX_Term();
+ MCL_Term();
+ CloseHandle(m_hAppMutex);
+
+
+ // gdi+
+ Gdiplus::GdiplusShutdown(m_gdiplusToken);
+
return CWinApp::ExitInstance();
}
--
Gitblit v1.9.3