Merge branch 'master' into clh

LAPTOP-SNT8I5JK\Boounion

2025-02-19 69d1e03745175dadece54b1dfce0738d5b5d8961

Merge branch 'master' into clh

# Conflicts:
#	SourceCode/Bond/Servo/CEquipment.cpp
#	SourceCode/Bond/Servo/CEquipment.h
#	SourceCode/Bond/Servo/DevicePropertyDlg.cpp

 SourceCode/Bond/Servo/CEquipment.cpp

@@ -34,6 +34,15 @@
        m_listener.onCimStateChanged = listener.onCimStateChanged;
    }

    void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
    {
        container.clear();
        // 示例：将一些属性添加到容器
        container.push_back(std::make_pair("DeviceName", "ServoMotor"));
        container.push_back(std::make_pair("SerialNumber", "123456789"));
        container.push_back(std::make_pair("Version", "1.0"));
    }

    CStep* CEquipment::getStep(unsigned int addr)
    {
        auto iter = m_mapStep.find(addr);

 SourceCode/Bond/Servo/CEquipment.h

@@ -55,6 +55,7 @@
        MemoryBlock& getReadBitBlock();
        void setWriteBitBlock(unsigned int start, unsigned int end);
        MemoryBlock& getWriteBitBlock();
        void getProperties(std::vector<std::pair<std::string, std::string>>& container);
        int addStep(unsigned int addr, CStep* pStep);
        CStep* getStep(unsigned int addr);
        virtual void init();

 SourceCode/Bond/Servo/DevicePropertyDlg.cpp

@@ -51,7 +51,7 @@

    // 获取所有设备属性
    std::vector<std::pair<std::string, std::string>> properties;
    //pEquipment->getProperties(properties);
    pEquipment->getProperties(properties);

    // 获取ListCtrl的客户区域
    CRect rect;