Merge branch 'clh' into liuyang

mrDarker

2025-09-08 6dc80508b1c0f431007f8a8c947c152ec00c3d15

 SourceCode/Bond/Servo/CRecipesManager.cpp

@@ -232,7 +232,7 @@

      // 找到对应CRecipeList, 找不到则返回NG
      lock();
      CRecipeList* pRecipeList = getRecipeListFromTemp(unitNo);
      CRecipeList* pRecipeList = getRecipeList(unitNo);
      if (pRecipeList == nullptr) {
         unlock();
         return MRLRC_NG;
@@ -262,6 +262,11 @@
            lock();
            m_nSyncStatus = SS_PARAMS_COMPLETE;
            unlock();

            if (m_onSyncingStateChanged != nullptr) {
               m_onSyncingStateChanged(m_nSyncStatus);
            }

            return MRLRC_OK;
         }

@@ -286,6 +291,23 @@
      return iter->second;
   }

   bool CRecipesManager::saveRecipeList(int unitNo, std::string& strFilepath)
   {
      CRecipeList* pRecipeList = getRecipeList(unitNo);
      if (pRecipeList == nullptr) return false;
      return pRecipeList->serialize(strFilepath);
   }

   bool CRecipesManager::readRecipeList(int unitNo, std::string& strFilepath)
   {
      CRecipeList* pRecipeList = getRecipeList(unitNo);
      if (pRecipeList == nullptr) {
         pRecipeList = new CRecipeList();
         m_mapRecipes[unitNo] = pRecipeList;
      }
      return pRecipeList->deserialize(strFilepath);
   }

   void CRecipesManager::setOnSyncingStateChanged(ONSYNCINGSTATECHANGED block)
   {
      m_onSyncingStateChanged = block;