From f090299f8a21282054c41449c98b512f0cd25876 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Mon, 20 Nov 2023 14:32:21 +0800
Subject: [PATCH] re-construct

---
 device/scannerqd.vcxproj         |  46 +++-----
 device/scannerqd.vcxproj.filters | 180 +++++++++++--------------------
 sln/hgscanner.sln                |  11 --
 twain/twain.vcxproj              |   8 +-
 4 files changed, 78 insertions(+), 167 deletions(-)

diff --git a/device/scannerqd.vcxproj b/device/scannerqd.vcxproj
index c4491f7..60db23e 100644
--- a/device/scannerqd.vcxproj
+++ b/device/scannerqd.vcxproj
@@ -211,22 +211,12 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\common_setting.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" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_239.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_300.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_302.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\image_process.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\multi_out.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\PaperSize.cpp" />
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_fs.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner\async_usb_host.cpp" />
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner\scanner_handler.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\usb_manager.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp" />
@@ -268,8 +258,10 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageMultiOutputRed.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.cpp" />
-    <ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp" />
-    <ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\base\data.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\base\encrypt.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\base\ini_file.cpp" />
+    <ClCompile Include="..\..\code_device\sdk\base\utils.cpp" />
     <ClCompile Include="..\..\code_device\sdk\imgprc\imgprc_mgr.cpp" />
     <ClCompile Include="..\..\code_device\sdk\imgprc\img_processor.cpp" />
     <ClCompile Include="..\..\code_device\sdk\json\cJSON.c" />
@@ -277,31 +269,18 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClCompile Include="..\..\code_device\sdk\sane_opt_json\base_opt.cpp" />
     <ClCompile Include="..\..\code_device\sdk\sane_opt_json\device_opt.cpp" />
     <ClCompile Include="..\..\code_device\sdk\sane_opt_json\simple_logic.cpp" />
-    <ClCompile Include="scanner_io\scanner_io.cpp" />
     <ClCompile Include="win_usb\usbview\devnode.c" />
     <ClCompile Include="win_usb\usbview\enum.c" />
     <ClCompile Include="win_usb\win_usb.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\BlockingQueue.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\common_setting.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" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_200.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_239.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_300.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_302.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\image_process.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\fill_hole.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\multi_out.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\PaperSize.h" />
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_fs.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner\async_usb_host.h" />
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner\scanner_handler.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\threadpool.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\offline_opt.h" />
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h" />
@@ -345,9 +324,13 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\imgprocdefs.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\IMulti.h" />
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\MatEx.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\data.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\encrypt.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\huagaoxxx_warraper_ex.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\ini_file.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\packet.h" />
+    <ClInclude Include="..\..\code_device\sdk\base\utils.h" />
     <ClInclude Include="..\..\code_device\sdk\hginclude\huagaoxxx_warraper_ex.h" />
-    <ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h" />
-    <ClInclude Include="..\..\code_device\sdk\hginclude\utils.h" />
     <ClInclude Include="..\..\code_device\sdk\imgprc\imgprc_mgr.h" />
     <ClInclude Include="..\..\code_device\sdk\imgprc\img_processor.h" />
     <ClInclude Include="..\..\code_device\sdk\json\cJSON.h" />
@@ -369,7 +352,6 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <ClInclude Include="..\..\sdk\include\sane\sane_ex.h" />
     <ClInclude Include="..\..\sdk\include\sane\sane_option_definitions.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="scanner_io\scanner_io.h" />
     <ClInclude Include="win_usb\usbview\enum.h" />
     <ClInclude Include="win_usb\usbview\usbdesc.h" />
     <ClInclude Include="win_usb\usbview\uvcdesc.h" />
diff --git a/device/scannerqd.vcxproj.filters b/device/scannerqd.vcxproj.filters
index d7a59b8..08765a3 100644
--- a/device/scannerqd.vcxproj.filters
+++ b/device/scannerqd.vcxproj.filters
@@ -25,12 +25,6 @@
     <Filter Include="usb\usbview">
       <UniqueIdentifier>{06629bf8-5d3e-4855-916b-260169824839}</UniqueIdentifier>
     </Filter>
-    <Filter Include="IO">
-      <UniqueIdentifier>{3d22771d-a2cc-4972-ab37-f1979d973a4f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="dev\fs">
-      <UniqueIdentifier>{ab2dd2e9-f5d1-40f8-ad1d-67b97a60e547}</UniqueIdentifier>
-    </Filter>
     <Filter Include="utils">
       <UniqueIdentifier>{9e729376-6047-4153-b0b8-dda8f8f722f6}</UniqueIdentifier>
     </Filter>
@@ -135,33 +129,6 @@
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.cpp">
       <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\common_setting.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_ipc.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_200.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_239.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\image_process.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\PaperSize.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_manager.cpp">
       <Filter>dev</Filter>
     </ClCompile>
@@ -177,9 +144,6 @@
     <ClCompile Include="win_usb\usbview\devnode.c">
       <Filter>usb\usbview</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_300.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplySizeDetection.cpp">
       <Filter>image</Filter>
     </ClCompile>
@@ -195,36 +159,12 @@
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.cpp">
       <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="scanner_io\scanner_io.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_setting.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_302.cpp">
-      <Filter>dev</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp">
       <Filter>image</Filter>
     </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp">
       <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_fs.cpp">
-      <Filter>dev\fs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\sdk\json\cJSON.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\user-opt\user.cpp">
       <Filter>dev\user-opt</Filter>
     </ClCompile>
@@ -252,6 +192,33 @@
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\multi_out.cpp">
       <Filter>dev\imgproc</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner.cpp">
+      <Filter>dev</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\base\data.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\base\ini_file.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\base\utils.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\base\encrypt.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner\async_usb_host.cpp">
+      <Filter>dev</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner\scanner_handler.cpp">
+      <Filter>dev</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\json\cJSON.c">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code_device\sdk\json\gb_json.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@@ -356,42 +323,9 @@
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\BlockingQueue.h">
       <Filter>dev</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\common_setting.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\filetools.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_ipc.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_200.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_239.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\image_process.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMatQueue.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\ImageMultiOutput.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\PaperSize.h">
-      <Filter>dev</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_manager.h">
       <Filter>dev</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h">
-      <Filter>dev</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h">
       <Filter>dev</Filter>
     </ClInclude>
@@ -407,9 +341,6 @@
     <ClInclude Include="win_usb\usbview\uvcdesc.h">
       <Filter>usb\usbview</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_300.h">
-      <Filter>dev</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\sdk\include\sane\sane.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -449,15 +380,6 @@
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyUVMerge.h">
       <Filter>image</Filter>
     </ClInclude>
-    <ClInclude Include="scanner_io\scanner_io.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_setting.h">
-      <Filter>dev</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_302.h">
-      <Filter>dev</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h">
       <Filter>image</Filter>
     </ClInclude>
@@ -485,21 +407,6 @@
     <ClInclude Include="..\..\sdk\include\huagao\brand_zj.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner_fs.h">
-      <Filter>dev\fs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\sdk\hginclude\utils.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\sdk\json\cJSON.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
-      <Filter>utils</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\user-opt\user.h">
       <Filter>dev\user-opt</Filter>
     </ClInclude>
@@ -527,6 +434,39 @@
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\imgproc-pak\multi_out.h">
       <Filter>dev\imgproc</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner.h">
+      <Filter>dev</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\data.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\huagaoxxx_warraper_ex.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\ini_file.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\packet.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\utils.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\base\encrypt.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner\async_usb_host.h">
+      <Filter>dev</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\hgdriver\hgdev\scanner\scanner_handler.h">
+      <Filter>dev</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\json\cJSON.h">
+      <Filter>utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code_device\sdk\json\gb_json.h">
+      <Filter>utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="device.def">
diff --git a/sln/hgscanner.sln b/sln/hgscanner.sln
index 797ab69..8d1268d 100644
--- a/sln/hgscanner.sln
+++ b/sln/hgscanner.sln
@@ -26,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{53E5EDD9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgjson", "..\..\doc_and_tools\tools\apps\hgjson\hgjson.vcxproj", "{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_TWAIN_App", "..\..\doc_and_tools\tools\apps\test_TWAIN_App\test_TWAIN_App.vcxproj", "{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -74,14 +72,6 @@ Global
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x64.ActiveCfg = Release|Win32
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.ActiveCfg = Release|Win32
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.Build.0 = Release|Win32
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x64.ActiveCfg = Debug|x64
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x64.Build.0 = Debug|x64
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x86.ActiveCfg = Debug|Win32
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Debug|x86.Build.0 = Debug|Win32
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x64.ActiveCfg = Release|x64
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x64.Build.0 = Release|x64
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x86.ActiveCfg = Release|Win32
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,7 +82,6 @@ Global
 		{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
 		{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
 		{D3579C48-F5AB-4F15-9B49-A2970FBA76C5} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
-		{8C3DEF78-4DF1-4C26-A11E-7031FF773E7D} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A89068FF-95C4-3C1E-B126-70B66C9824BB}
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index e617ca3..c24f1fb 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -74,7 +74,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\hginclude\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <LibraryPath>$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
@@ -85,14 +85,14 @@
     <LibraryPath>$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
     <TargetName>huagaotwain200.ds</TargetName>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\hginclude\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\hginclude\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <LibraryPath>$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
@@ -103,7 +103,7 @@
     <LibraryPath>$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath)</LibraryPath>
     <TargetName>huagaotwain400.ds</TargetName>
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\hginclude\;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\sdk\include\twain\;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
     <IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\</IntDir>
     <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>