Merge branch 'master' into liuyang

LAPTOP-T815PCOQ\25526

2024-11-15 f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60

 SourceCode/Bond/BEQLibrary/Equipment.cpp

@@ -144,6 +144,11 @@
            repData(m_pActiveClient, (CUnit*)pUnit, AS_MC_INFO_REP);
         }
      };
      listener.onReqNotReady = [&](void* pUnit, int layer) -> void {
         if (m_pActiveClient != nullptr) {
            repNotReady(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
         }
      };
      listener.onReqLoad = [&](void* pUnit, int layer) -> void {
         if (m_pActiveClient != nullptr) {
            repLoad(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
@@ -836,6 +841,27 @@
      return 0;
   }

   void CEquipment::repNotReady(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
   {
      ASSERT(pClient != nullptr);
      CString strReply;
      if (pUnit->getLayerCount() == 1) {
         strReply.Format(_T("%s@%s=%s/%s=%s/%s=%s#"), pszReply,
            PARAM_EQID, m_strName.c_str(),
            PARAM_UNIT, pUnit->getName().c_str(),
            PARAM_EVENT, EVENT_NOTREADY);
      }
      else {
         strReply.Format(_T("%s@%s=%s/%s=%s%d/%s=%s#"), pszReply,
            PARAM_EQID, m_strName.c_str(),
            PARAM_UNIT, pUnit->getName().c_str(), layer,
            PARAM_EVENT, EVENT_NOTREADY);
      }


      pClient->Send((LPTSTR)(LPCTSTR)strReply, strReply.GetLength());
   }

   void CEquipment::repLoad(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
   {
      ASSERT(pClient != nullptr);