1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示

chenluhua1980

5 天以前 bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb

 SourceCode/Bond/Servo/CEquipment.h

@@ -59,6 +59,9 @@
   typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
   typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
   typedef std::function<void(void* pEiuipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORT;
   typedef std::function<void(void* pEiuipment, int port, CJobDataS* pJobDataS)> ONRECEIVEDJOB;
   typedef std::function<void(void* pEiuipment, int port, CJobDataS* pJobDataS)> ONSENTOUTJOB;
   typedef std::function<void(void* pEiuipment, int unitId, int status, int reason)> ONEQSTATUSCHANGED;
   
   typedef struct _EquipmentListener
   {
@@ -75,6 +78,9 @@
      ONVCREVENTREPORT   onSVDataReport;
      ONVCREVENTREPORT   onPanelDataReport;
      ONPROCESSDATAREPORT   onProcessDataReport;
      ONRECEIVEDJOB      onReceivedJob;
      ONSENTOUTJOB      onSentOutJob;
      ONEQSTATUSCHANGED   onEqStatusChanged;
   } EquipmentListener;


@@ -101,6 +107,8 @@
      std::string& getName();
      void setDescription(const char* pszDescription);
      std::string& getDescription();
      void setCurrentRecipe(const std::string& recipe);
      std::string getCurrentRecipe();
      void setStation(int network, int station);
      const StationIdentifier& getStation();
      virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -229,6 +237,8 @@
      // 字符串检测结果转换
      InspResult judgeStringToInspResult(std::string& strJudge);

      PROCESS_STATE getProcessState(int slotNo) const;

      // for test
      void fireSetProcessState(int nSlotNo, PROCESS_STATE state) { return setProcessState(nSlotNo, state); }

@@ -284,6 +294,7 @@
      int m_nID;
      std::string m_strName;
      std::string m_strDescription;
      std::string m_currentRecipe;
      CRITICAL_SECTION m_criticalSection;
      StationIdentifier m_station;
      MemoryBlock m_blockReadBit;