1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志

LAPTOP-SNT8I5JK\Boounion

2025-06-28 6747bc043d0af20d6fa02a6cf385d81eb44643d0

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -1409,11 +1409,8 @@

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      CAttributeVector attrubutes;
      CAttributeVector& attrubutes = pStep->attributeVector();
      processData.getAttributeVector(attrubutes, weight);
      pStep->addAttributeVector(attrubutes);


      onProcessData(&processData);

      return nRet;
@@ -1427,11 +1424,8 @@

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      CAttributeVector attrubutes;
      CAttributeVector& attrubutes = pStep->attributeVector();
      jobDataS.getAttributeVector(attrubutes, weight);
      pStep->addAttributeVector(attrubutes);


      onReceivedJob(port, &jobDataS);

      return nRet;
@@ -1451,11 +1445,8 @@

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      CAttributeVector attrubutes;
      CAttributeVector& attrubutes = pStep->attributeVector();
      jobDataS.getAttributeVector(attrubutes, weight);
      pStep->addAttributeVector(attrubutes);


      onSentOutJob(port, &jobDataS);

      return nRet;
@@ -1601,9 +1592,8 @@

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      CAttributeVector attrubutes;
      CAttributeVector& attrubutes = pStep->attributeVector();
      vcrEventReport.getAttributeVector(attrubutes, weight);
      pStep->addAttributeVector(attrubutes);

      // 0426, 先固定返回1(OK)
      ((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
@@ -1728,6 +1718,10 @@
         );


      if (m_processState != PROCESS_STATE::Processing) {
         setProcessState(PROCESS_STATE::Processing);
      }


      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
@@ -1792,6 +1786,10 @@
      );


      if (m_processState != PROCESS_STATE::Complete) {
         setProcessState(PROCESS_STATE::Complete);
      }

      // 缓存Attribute，用于调试时显示信息
      unsigned int weight = 201;
      pStep->addAttribute(new CAttribute("CassetteNo",
@@ -1827,7 +1825,7 @@
      CJobDataS* pJobDataS = pGlass->getJobDataS();
      ASSERT(pJobDataS);
      if (!compareJobData(pJobDataB, pJobDataS)) {
         LOGE("<CEquipemnt-%s>onPreFetchedOutJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
         LOGE("<CEquipemnt-%s>onPreStoredJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
            pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
            pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
         return FALSE;
@@ -1888,7 +1886,6 @@
   int CEquipment::onSendAble()
   {
      LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());

      if (m_processState != PROCESS_STATE::Complete) {
         setProcessState(PROCESS_STATE::Complete);
      }