From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/Servo.vcxproj |   82 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 1b2bcc9..f1eff4a 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -200,6 +200,19 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\DAQBridge\buffer\BufferManager.h" />
+    <ClInclude Include="..\DAQBridge\buffer\BufferRegistry.h" />
+    <ClInclude Include="..\DAQBridge\buffer\SampleBuffer.h" />
+    <ClInclude Include="..\DAQBridge\core\Collector.h" />
+    <ClInclude Include="..\DAQBridge\core\CommBase.h" />
+    <ClInclude Include="..\DAQBridge\core\ConnEvents.h" />
+    <ClInclude Include="..\DAQBridge\core\DataTypes.h" />
+    <ClInclude Include="..\DAQBridge\core\Display.h" />
+    <ClInclude Include="..\DAQBridge\DAQConfig.h" />
+    <ClInclude Include="..\DAQBridge\net\FrameAssembler.h" />
+    <ClInclude Include="..\DAQBridge\net\SocketComm.h" />
+    <ClInclude Include="..\DAQBridge\proto\Protocol.h" />
+    <ClInclude Include="..\DAQBridge\proto\ProtocolCodec.h" />
     <ClInclude Include="..\jsoncpp\include\json\autolink.h" />
     <ClInclude Include="..\jsoncpp\include\json\config.h" />
     <ClInclude Include="..\jsoncpp\include\json\features.h" />
@@ -209,7 +222,11 @@
     <ClInclude Include="..\jsoncpp\include\json\value.h" />
     <ClInclude Include="..\jsoncpp\include\json\writer.h" />
     <ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h" />
+    <ClInclude Include="AccordionWnd.h" />
+    <ClInclude Include="AlarmPopupDlg.h" />
     <ClInclude Include="CBaseDlg.h" />
+    <ClInclude Include="CCarrierSlotGrid.h" />
+    <ClInclude Include="CCarrierSlotSelector.h" />
     <ClInclude Include="CCjPage2.h" />
     <ClInclude Include="CCjPage3.h" />
     <ClInclude Include="CCjPageBase.h" />
@@ -218,20 +235,29 @@
     <ClInclude Include="CControlJobManagerDlg.h" />
     <ClInclude Include="CCustomCheckBox.h" />
     <ClInclude Include="CCollectionEvent.h" />
+    <ClInclude Include="CEventEditDlg.h" />
     <ClInclude Include="CEquipmentPage3.h" />
     <ClInclude Include="CExpandableListCtrl.h" />
     <ClInclude Include="CGlassPool.h" />
     <ClInclude Include="ChangePasswordDlg.h" />
+    <ClInclude Include="ClientListDlg.h" />
     <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CPageCollectionEvent.h" />
+    <ClInclude Include="CPageCtrlState.h" />
     <ClInclude Include="CPageGlassList.h" />
     <ClInclude Include="CPageLinkSignal.h" />
+    <ClInclude Include="CPageProdOverview.h" />
     <ClInclude Include="CPageReport.h" />
     <ClInclude Include="CPageVarialbles.h" />
+    <ClInclude Include="CPageDataVarialbles.h" />
+    <ClInclude Include="CPanelProduction.h" />
+    <ClInclude Include="HmLabel.h" />
+    <ClInclude Include="ProductionStats.h" />
     <ClInclude Include="CParam.h" />
     <ClInclude Include="CCjPage1.h" />
     <ClInclude Include="CProcessDataListDlg.h" />
     <ClInclude Include="CReport.h" />
+    <ClInclude Include="CReportEditDlg.h" />
     <ClInclude Include="CRobotCmdContainerDlg.h" />
     <ClInclude Include="CRobotCmdTestDlg.h" />
     <ClInclude Include="CPagePortStatus.h" />
@@ -239,7 +265,12 @@
     <ClInclude Include="CRobotTaskDlg.h" />
     <ClInclude Include="CSVData.h" />
     <ClInclude Include="CServoUtilsTool.h" />
+    <ClInclude Include="CUserManager2.h" />
+    <ClInclude Include="CUserManager2Dlg.h" />
+    <ClInclude Include="CUserEdit2Dlg.h" />
+    <ClInclude Include="CUserXLogDlg.h" />
     <ClInclude Include="CVariable.h" />
+    <ClInclude Include="CVariableEditDlg2.h" />
     <ClInclude Include="DeviceRecipeParamDlg.h" />
     <ClInclude Include="GlassJson.h" />
     <ClInclude Include="GlassLogDb.h" />
@@ -264,6 +295,7 @@
     <ClInclude Include="InputDialog.h" />
     <ClInclude Include="JobSlotGrid.h" />
     <ClInclude Include="LoginDlg.h" />
+    <ClInclude Include="LoginDlg2.h" />
     <ClInclude Include="MsgDlg.h" />
     <ClInclude Include="PageRecipe.h" />
     <ClInclude Include="CDoubleGlass.h" />
@@ -379,6 +411,34 @@
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\DAQBridge\buffer\BufferManager.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\buffer\BufferRegistry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\buffer\SampleBuffer.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\core\Collector.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\core\Display.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\net\SocketComm.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
@@ -391,7 +451,11 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="AccordionWnd.cpp" />
+    <ClCompile Include="AlarmPopupDlg.cpp" />
     <ClCompile Include="CBaseDlg.cpp" />
+    <ClCompile Include="CCarrierSlotGrid.cpp" />
+    <ClCompile Include="CCarrierSlotSelector.cpp" />
     <ClCompile Include="CCjPage2.cpp" />
     <ClCompile Include="CCjPage3.cpp" />
     <ClCompile Include="CCjPageBase.cpp" />
@@ -400,20 +464,30 @@
     <ClCompile Include="CControlJobManagerDlg.cpp" />
     <ClCompile Include="CCustomCheckBox.cpp" />
     <ClCompile Include="CCollectionEvent.cpp" />
+    <ClCompile Include="CEventEditDlg.cpp" />
     <ClCompile Include="CEquipmentPage3.cpp" />
     <ClCompile Include="CExpandableListCtrl.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
     <ClCompile Include="ChangePasswordDlg.cpp" />
+    <ClCompile Include="ClientListDlg.cpp" />
     <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CPageCollectionEvent.cpp" />
+    <ClCompile Include="CPageCtrlState.cpp" />
     <ClCompile Include="CPageGlassList.cpp" />
     <ClCompile Include="CPageLinkSignal.cpp" />
+    <ClCompile Include="CPageProdOverview.cpp" />
     <ClCompile Include="CPageReport.cpp" />
     <ClCompile Include="CPageVarialbles.cpp" />
+    <ClCompile Include="CPageDataVarialbles.cpp" />
+    <ClCompile Include="ConfigurationProduction.cpp" />
+    <ClCompile Include="CPanelProduction.cpp" />
+    <ClCompile Include="HmLabel.cpp" />
+    <ClCompile Include="ProductionStats.cpp" />
     <ClCompile Include="CParam.cpp" />
     <ClCompile Include="CCjPage1.cpp" />
     <ClCompile Include="CProcessDataListDlg.cpp" />
     <ClCompile Include="CReport.cpp" />
+    <ClCompile Include="CReportEditDlg.cpp" />
     <ClCompile Include="CRobotCmdContainerDlg.cpp" />
     <ClCompile Include="CRobotCmdTestDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
@@ -421,7 +495,12 @@
     <ClCompile Include="CRobotTaskDlg.cpp" />
     <ClCompile Include="CSVData.cpp" />
     <ClCompile Include="CServoUtilsTool.cpp" />
+    <ClCompile Include="CUserManager2.cpp" />
+    <ClCompile Include="CUserManager2Dlg.cpp" />
+    <ClCompile Include="CUserEdit2Dlg.cpp" />
+    <ClCompile Include="CUserXLogDlg.cpp" />
     <ClCompile Include="CVariable.cpp" />
+    <ClCompile Include="CVariableEditDlg2.cpp" />
     <ClCompile Include="DeviceRecipeParamDlg.cpp" />
     <ClCompile Include="GlassJson.cpp" />
     <ClCompile Include="GlassLogDb.cpp" />
@@ -444,6 +523,7 @@
     <ClCompile Include="InputDialog.cpp" />
     <ClCompile Include="JobSlotGrid.cpp" />
     <ClCompile Include="LoginDlg.cpp" />
+    <ClCompile Include="LoginDlg2.cpp" />
     <ClCompile Include="MsgDlg.cpp" />
     <ClCompile Include="PageRecipe.cpp" />
     <ClCompile Include="CDoubleGlass.cpp" />
@@ -594,4 +674,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

--
Gitblit v1.9.3