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/CBonder.cpp |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 40d014a..1bb185f 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -48,27 +48,23 @@
 		CEquipment::serialize(ar);
 	}
 
+	void CBonder::getAttributeVector(CAttributeVector& attrubutes)
+	{
+		__super::getAttributeVector(attrubutes);
+	}
+
 	int CBonder::recvIntent(CPin* pPin, CIntent* pIntent)
 	{
-		ASSERT(pPin);
+		return __super::recvIntent(pPin, pIntent);
+	}
 
-		CPin* pFromPin = pPin->getConnectedPin();
-		ASSERT(pFromPin);
+	BOOL CBonder::glassWillArrive(CGlass* pGlass)
+	{
+		BOOL bRet = __super::glassWillArrive(pGlass);
+		if (!bRet) {
+			return FALSE;
+		}
 
-		CEquipment* pFromEq = pFromPin->getEquipment();
-		ASSERT(pFromEq);
-
-
-		LOGI("<CBonder><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>", 
-			this->getName().c_str(), 
-			pPin->getName().c_str(),
-			pFromEq->getName().c_str(), 
-			pFromPin->getName().c_str(),
-			pIntent->getCode(),
-			pIntent->getMsg(),
-			pIntent->getContext()
-			);
-
-		return 0;
+		return m_glassList.empty();
 	}
 }

--
Gitblit v1.9.3