From fc75b1f37cdbf2f9ad96fb1a1ebb0712d1cf4a39 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 22 Sep 2023 09:42:57 +0800
Subject: [PATCH] =?UTF-8?q?SANE=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6=E5=88=B0=E7=8B=AC=E7=AB=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 device/scanner.vcxproj         | 12 ++++++------
 device/scanner.vcxproj.filters | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index 39c1b7a..178f68f 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -212,7 +212,6 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\common_setting.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\device_opt.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_ipc.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_200.cpp" />
@@ -226,9 +225,10 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_fs.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_manager.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_setting.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp" />
@@ -279,7 +279,6 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\BlockingQueue.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\common_setting.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\device_opt.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\filetools.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_ipc.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner.h" />
@@ -295,10 +294,11 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_fs.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_manager.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_setting.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h" />
diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters
index 55f69ba..31b4cae 100644
--- a/device/scanner.vcxproj.filters
+++ b/device/scanner.vcxproj.filters
@@ -34,6 +34,9 @@
     <Filter Include="utils">
       <UniqueIdentifier>{9e729376-6047-4153-b0b8-dda8f8f722f6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="dev\user-opt">
+      <UniqueIdentifier>{0a1c6e85-c047-40a6-8791-eb35ea41492b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp">
@@ -219,14 +222,14 @@
     <ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\device_opt.cpp">
-      <Filter>dev</Filter>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp">
+      <Filter>dev\user-opt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp">
-      <Filter>dev</Filter>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp">
+      <Filter>dev\user-opt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user.cpp">
-      <Filter>dev</Filter>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp">
+      <Filter>dev\user-opt</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -479,14 +482,14 @@
     <ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\device_opt.h">
-      <Filter>dev</Filter>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h">
+      <Filter>dev\user-opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h">
-      <Filter>dev</Filter>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h">
+      <Filter>dev\user-opt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user.h">
-      <Filter>dev</Filter>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h">
+      <Filter>dev\user-opt</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>