Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CArm.cpp

@@ -102,4 +102,33 @@

      return 0;
   }

   int CArm::glassUpdateJobDataS(CJobDataS* pJobDataS)
   {
      ASSERT(pJobDataS);

      Lock();
      CGlass* pGlass = (CGlass*)m_slot[0].getContext();
      if (pGlass == nullptr) {
         Unlock();
         LOGE("<CArm>glassUpdateJobDataS失败，找不到对应的Glass");
         return -1;
      }

      CJobDataS* pSrcJs = pGlass->getJobDataS();
      if (pSrcJs->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo()
         || pSrcJs->getJobSequenceNo() != pJobDataS->getJobSequenceNo()) {
         Unlock();
         LOGE("<CArm>glassUpdateJobDataS失败，CassetteNo不匹配([%d,%d] != [%d,%d])",
            pSrcJs->getCassetteSequenceNo(),
            pJobDataS->getCassetteSequenceNo(),
            pSrcJs->getJobSequenceNo(),
            pJobDataS->getJobSequenceNo());
         return -2;
      }

      pGlass->updateJobDataS(pJobDataS);
      Unlock();
      return 0;
   }
}