From cf1497e3bba45ddc3b31cf9768954248bedc0bc1 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 16:03:21 +0800
Subject: [PATCH] 1.修复以下问题：Only-1 Job 支持：isProcessJobsEmpty()/validate 决定了当前实现只支持单个 PJ/CJ。Host 如果按标准一次下多 PJ 或在运行中追加 PJ，会被拒绝但无明确回应，容易引起 Host/设备状态脱节。
---
SourceCode/Bond/BondEq/AccordionWnd.cpp | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/AccordionWnd.cpp b/SourceCode/Bond/BondEq/AccordionWnd.cpp
index fb8e2ee..026628e 100644
--- a/SourceCode/Bond/BondEq/AccordionWnd.cpp
+++ b/SourceCode/Bond/BondEq/AccordionWnd.cpp
@@ -47,9 +47,16 @@
BOOL CAccordionWnd::RegisterWndClass()
{
- WNDCLASS wc;
+ WNDCLASS wcExisting = {};
+ HINSTANCE hInstance = AfxGetInstanceHandle();
+ if (::GetClassInfo(hInstance, ACCORDIONWND_CLASS, &wcExisting) ||
+ ::GetClassInfo(NULL, ACCORDIONWND_CLASS, &wcExisting)) {
+ return TRUE;
+ }
+
+ WNDCLASS wc = {};
wc.lpszClassName = ACCORDIONWND_CLASS;
- wc.hInstance = AfxGetInstanceHandle();
+ wc.hInstance = hInstance;
wc.lpfnWndProc = WindowProc;
wc.hCursor = ::LoadCursor(NULL, IDC_ARROW);
wc.hIcon = 0;
@@ -60,7 +67,10 @@
wc.cbWndExtra = 0;
// 注册自定义类
- return (::RegisterClass(&wc) != 0);
+ if (::RegisterClass(&wc) != 0) {
+ return TRUE;
+ }
+ return (::GetLastError() == ERROR_CLASS_ALREADY_EXISTS);
}
CAccordionWnd * CAccordionWnd::FromHandle(HWND hWnd)
@@ -166,7 +176,7 @@
for (size_t i = 0; i < m_vectorItems.size(); i++) {
ACCORDIONITEM *pItem = m_vectorItems.at(i);
if (pItem->pWnd != NULL) {
- GetItemRect(rcClient, i, &rcItemClient);
+ GetItemRect(rcClient, (UINT)i, &rcItemClient);
rcItemClient.top += ITEM_HEIGHT;
if (pItem->nExpandHeight == -1) {
rcItemClient.bottom = rcClient.bottom;
@@ -672,8 +682,8 @@
RECT rcItem, rcItemHeader;
for (size_t i = 0; i < m_vectorItems.size(); i++) {
ACCORDIONITEM *pItem = m_vectorItems[i];
- GetItemRect(rcClient, i, &rcItem);
- GetItemHeaderRect(rcClient, i, &rcItemHeader);
+ GetItemRect(rcClient, (UINT)i, &rcItem);
+ GetItemHeaderRect(rcClient, (UINT)i, &rcItemHeader);
// 热点项的背景色和边框
--
Gitblit v1.9.3