1.在FetchedOutJob时，如果是双玻璃片，即已贴合，则两块一起从列表删除； 2.同上，在StoredJob时，如果是双玻璃片，即已贴合，则两...

LAPTOP-SNT8I5JK\Boounion

2025-05-15 26e26278bb7bf53b961f0414d9848679453349e4

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -311,13 +311,28 @@
         Unlock();
      }
      else {
         Lock();
         // addGlassToList前不需要上锁，因其内部有锁
         int count;
         ar >> count;
         for (int i = 0; i < count; i++) {
            CGlass* pGlass = new CGlass();
            pGlass->serialize(ar);
            addGlassToList(pGlass);
         }
			
         // 梳理各玻璃之间的绑定关系
         Lock();
         std::list<CGlass*> list = m_glassList;
         for (auto item : list) {
            std::string& strBuddyId = item->getBuddyId();
            if (!strBuddyId.empty()) {
               for (auto item2 : m_glassList) {
                  if (strBuddyId.compare(item2->getID()) == 0) {
                     item->setBuddy(item2);
                     TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
                  }
               }
            }
         }
         Unlock();
      }
@@ -786,6 +801,21 @@
      }
   }

   CGlass* CEquipment::getGlassFromList(const char* pszId)
   {
      CGlass* pGlass = nullptr;
      Lock();
      for (auto item : m_glassList) {
         if (item->getID().compare(pszId) == 0) {
            pGlass = item;
            break;
         }
      }
      Unlock();

      return pGlass;
   }

   BOOL CEquipment::removeClass(CGlass* pGlass)
   {
      Lock();
@@ -853,6 +883,19 @@
         return -3;
      }

      // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
      CGlass* pBuddy = pContext->getBuddy();
      if (pBuddy != nullptr) {
         for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
            if ((*iter)->getID().compare(pBuddy->getID()) == 0) {
               (*iter)->release();
               m_glassList.erase(iter);
               break;
            }
         }
      }


      ((CArm*)m_pArm)->tempStore(pContext);
      pContext->release();
      Unlock();
@@ -884,6 +927,18 @@
      pGlass->release();            // tempFetchOut需要调用一次release
      Unlock();


      // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
      CGlass* pBuddy = pGlass->getBuddy();
      if (pBuddy != nullptr) {
         Lock();
         pBuddy->addPath(m_nID);
         pBuddy->addRef();               // 加入list,addRef
         m_glassList.push_back(pBuddy);
         Unlock();
      }


      if (m_listener.onDataChanged != nullptr) {
         m_listener.onDataChanged(this, 0);
      }