Merge branch 'clh' into liuyang

mrDarker

2026-01-30 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj.filters

@@ -16,6 +16,9 @@
    <Filter Include="DBManager">
      <UniqueIdentifier>{c5603403-bc3a-451f-b300-c56d9fe09307}</UniqueIdentifier>
    </Filter>
    <Filter Include="FileManager">
      <UniqueIdentifier>{d7763e1c-46cf-48f9-b0da-001138287bcd}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <Text Include="ReadMe.txt" />
@@ -114,14 +117,47 @@
    <ClInclude Include="DBManager\AlarmManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="DBManager\AxisManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="DBManager\SystemLogManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="DBManager\UserManager.h">
      <Filter>DBManager</Filter>
    </ClInclude>
    <ClInclude Include="CPageLogcat.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="LogEdit.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\IOManager.h">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\pugiconfig.hpp">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\pugixml.hpp">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="InputDialog.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="IOMonitoringDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="FileManager\AxisManager.h">
      <Filter>FileManager</Filter>
    </ClInclude>
    <ClInclude Include="AxisDetailSettingsDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="AxisSettingsDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="CBaseDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="AddPLCInfo.h">
      <Filter>头文件</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
@@ -209,15 +245,45 @@
    <ClCompile Include="DBManager\AlarmManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="DBManager\AxisManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="DBManager\SystemLogManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="DBManager\UserManager.cpp">
      <Filter>DBManager</Filter>
    </ClCompile>
    <ClCompile Include="CPageLogcat.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="LogEdit.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="FileManager\IOManager.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="FileManager\pugixml.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="InputDialog.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="IOMonitoringDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="FileManager\AxisManager.cpp">
      <Filter>FileManager</Filter>
    </ClCompile>
    <ClCompile Include="AxisDetailSettingsDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="AxisSettingsDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="CBaseDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="AddPLCInfo.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="BoounionPLC.rc">