From 2070871df480a664c9c4e38bc4e4e324682a64c6 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 16:12:28 +0800
Subject: [PATCH] 1. 解决 WebView2 控制器创建失败时闪退的问题 2. 解决连接图销毁时保存设备图形数据闪退的问题
---
SourceCode/Bond/Servo/CLoadPort.cpp | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index b455e4f..b881e5a 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -35,7 +35,8 @@
// 加入Pin初始化代码
LOGI("<CLoadPort>initPins");
addPin(SERVO::PinType::INPUT, _T("In"));
- addPin(SERVO::PinType::OUTPUT, _T("Out"));
+ addPin(SERVO::PinType::OUTPUT, _T("Out1"));
+ addPin(SERVO::PinType::OUTPUT, _T("Out2"));
}
void CLoadPort::onTimer(UINT nTimerid)
@@ -51,25 +52,38 @@
void CLoadPort::getAttributeVector(CAttributeVector& attrubutes)
{
__super::getAttributeVector(attrubutes);
-
- for (auto item : m_inputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
-
- for (auto item : m_outputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
}
- void CLoadPort::outputPanel()
+ int CLoadPort::recvIntent(CPin* pPin, CIntent* pIntent)
{
- CPin* pOutPin = getPin("Out");
+ return __super::recvIntent(pPin, pIntent);
+ }
- CIntent intent;
- intent.setCode(1);
- intent.setMsg("Hello");
- pOutPin->sendIntent(&intent);
+ int CLoadPort::outputGlass(int port)
+ {
+ // 如果列表中没有Panel,模拟生成10张
+ if (m_glassList.empty()) {
+ static int ii = 0;
+ char szBuffer[64];
+ LOGI("<CLoadPort>模拟生成10张PANEL");
+ for (int i = 0; i < 10; i++) {
+ sprintf_s(szBuffer, "P20250320A1A%d", ++ii);
+ CGlass* pGlass = new CGlass();
+ pGlass->setID(szBuffer);
+ addGlassToList(pGlass);
+ }
+ }
+
+ return __super::outputGlass(port);
+ }
+
+ BOOL CLoadPort::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
+ }
+
+ return (m_glassList.size() < 8);
}
}
--
Gitblit v1.9.3