Merge branch 'master' into liuyang

LAPTOP-T815PCOQ\25526

2024-11-15 f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60

 SourceCode/Bond/BEQLibrary/Unit.h

@@ -6,8 +6,9 @@


#define LAYER_LOAD_INIT      0
#define LAYER_LOAD_REQ      1
#define LAYER_UNLOAD_REQ   2
#define LAYER_NOT_READY      1
#define LAYER_LOAD_REQ      2
#define LAYER_UNLOAD_REQ   3

namespace BEQ {
   typedef std::function<void(void* pUnit, EQ_STATE)> ONSTATECHANGED;
@@ -25,6 +26,7 @@
      ONALARM            onRemoveAlarm;
      ONSTEPCHANGED      onStepChanged;
      ONDATACHANGED      onDataChanged;
      ONREQLOAD         onReqNotReady;
      ONREQLOAD         onReqLoad;
      ONREQLOAD         onReqUnload;
   } UnitListener;
@@ -63,6 +65,7 @@
      virtual unsigned long long getDataTime();
      virtual void addData(const char* pszName, const char* pszDataText, bool bComplete);
      virtual void addRecipe(int id, const char* pszName, bool bComplete);
      virtual int reqNotReady(int layer);
      virtual int reqLoad(int layer);
      virtual int reqUnload(int layer);