Merge branch 'clh' into liuyang

mrDarker

2025-09-12 0fb528df2c1f05ef7d52827432bd934ce6f9d8cd

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -5,6 +5,7 @@
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"
#include "GlassJson.h"


namespace SERVO {
@@ -336,10 +337,15 @@
            m_slot[i].serialize(ar);
            CGlass* pGlass = (CGlass *)m_slot[i].getContext();
            if (pGlass != nullptr) {               
               pGlass->serialize(ar);
               const std::string pretty = GlassJson::ToPrettyString(*pGlass);
               CString strPretty = CString(pretty.c_str());
               ar << strPretty;

               CGlass* pBuddy = pGlass->getBuddy();
               if (pBuddy != nullptr) {
                  pBuddy->serialize(ar);
                  const std::string prettyBuddy = GlassJson::ToPrettyString(*pBuddy);
                  CString strPrettyBuddy = CString(prettyBuddy.c_str());
                  ar << strPrettyBuddy;
               }
            }
         }
@@ -349,14 +355,26 @@
         for (int i = 0; i < SLOT_MAX; i++) {
            m_slot[i].serialize(ar);
            if (m_slot[i].getTempContext() != nullptr) {
               CString strPretty;
               std::string pretty;
               ar >> strPretty;
               pretty = (LPTSTR)(LPCTSTR)strPretty;
               if (!pretty.empty()) {
               CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
               pGlass->serialize(ar);
                  GlassJson::FromString(pretty, *pGlass);
               m_slot[i].setContext(pGlass);
               if (pGlass->getBuddy() != nullptr) {

                  if (!pGlass->getBuddyId().empty()) {
                  CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
                  pBuddy->serialize(ar);
                     CString strPrettyBuddy;
                     std::string prettyBuddy;
                     ar >> strPrettyBuddy;
                     prettyBuddy = (LPTSTR)(LPCTSTR)strPrettyBuddy;
                     GlassJson::FromString(prettyBuddy, *pBuddy);
                  pGlass->forceSetBuddy(pBuddy);
               }
               }

            }
         }
         
@@ -1568,7 +1586,9 @@
      
      // 关联的Glass也要更新
      CGlass* pBuddy = pGlass->getBuddy();
      LOGI("<Equipment-%s>decodeProcessDataReport pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
      if (pBuddy != nullptr) {
         LOGI("<Equipment-%s>decodeProcessDataReport addParams pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
         pBuddy->addParams(params);
      }