#IQBX #comment mod_PortableScanner 编译通过

Module/CMakeLists.txt

@@ -226,7 +226,7 @@ add_subdirectory(mod_vtmloader)
 
 #pad remove
 add_subdirectory(mod_cardswiper)
-
+add_subdirectory(mod_PortableScanner)
 else()
 
 add_subdirectory(mod_validityVertifier)

Module/mod_PortableScanner/CMakeLists.txt

@@ -0,0 +1,33 @@
+define_module("PortableScanner")
+
+set(${MODULE_PREFIX}_SRCS
+	DocScannerCap.cpp
+	mod_PortableScanner.cpp
+	PortableScannerFSM.cpp
+	)
+
+
+set(MOD_VERSION_STRING "0.0.1-dev1")
+add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
+
+#target_compile_options(${MODULE_NAME} PRIVATE  "$<$<CXX_COMPILER_ID:MSVC>:/source-charset:gbk>")
+#target_compile_options(${MODULE_NAME} PRIVATE  "$<$<C_COMPILER_ID:MSVC>:/source-charset:gbk>")
+
+target_include_directories(${MODULE_NAME} PRIVATE
+	${DevHeadPath}
+    ${CONAN_INCLUDE_DIRS_OPENCV}
+    ${CONAN_INCLUDE_DIRS_OPENCV}/opencv2
+	${OTHER_LIB_BASE_DIR}/libpublicFun
+)
+target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_BIN_DIRS_OPENCV} ${CONAN_LIB_DIRS_OPENCV}) #add all line
+
+message(STATUS "MODULE_BASE_ALL_LIBS ${MODULE_BASE_ALL_LIBS}")
+
+set(${MODULE_PREFIX}_SYSLIBS libpublicFun)
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS}) 
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${${MODULE_PREFIX}_SYSLIBS} ${CONAN_LIBS_OPENCV})
+
+
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_PortableScanner/Logger.cpp

@@ -538,11 +538,11 @@ void Logger::TraceTrace_f(const tchar* szFile, int line, const tchar* fmt, ...)
 }
 
 
-/*鑾峰彇褰撳墠璋冪敤璇ユ棩蹇楁枃浠剁殑绋嬪簭璺�緞鎴栫▼搴忓悕绉帮紙鏃犵被鍨嬪悗缂€锛夛紝涓荤敤浜庢棩蹇楀悕绉板０鏄�
- *@param: [out] outFilePath 鑾峰彇鍒扮▼搴忚矾寰勬垨绋嬪簭鍚嶇О鐨勫瓧绗︿覆
- *        [in] sizeLen outFilePath瀛楃�鏁扮粍鐨勫ぇ灏�
- *        [in] fetchKind FALSE琛ㄧず浠呰幏鍙栫▼搴忚矾寰勶紝TRUE琛ㄧず鑾峰彇绋嬪簭鍚嶇О
- *@return 濡傛灉鑾峰彇鎴愬姛鍒欒〃绀哄疄闄呭緱鍒扮殑瀛楃�涓查暱搴︼紝-1琛ㄧず澶辫触
+/*获取当前调用该日志文件的程序路径或程序名称（无类型后缀），主用于日志名称声明
+ *@param: [out] outFilePath 获取到程序路径或程序名称的字符串
+ *        [in] sizeLen outFilePath字符数组的大小
+ *        [in] fetchKind FALSE表示仅获取程序路径，TRUE表示获取程序名称
+ *@return 如果获取成功则表示实际得到的字符串长度，-1表示失败
  */
 DWORD Logger::GetCurExeNameOrPath(tchar* outFilePath, int sizeLen, int fetchKind)
 {
@@ -624,7 +624,7 @@ void Logger::DelayLoop(unsigned long usec)
 {
 	LOG_FUNCTION();
 	LARGE_INTEGER freq, start, now;
-	//杩斿洖纭�欢鏀�寔鐨勯珮绮惧害璁℃暟鍣ㄧ殑姣忕�閽熷榾鍡掔殑娆℃暟锛岄浂琛ㄧず纭�欢涓嶆敮鎸侊紝璇诲彇澶辫触
+	//返回硬件支持的高精度计数器的每秒钟嘀嗒的次数，零表示硬件不支持，读取失败
 	if (!QueryPerformanceFrequency(&freq))
 	{
 		Sleep(usec);

Module/mod_PortableScanner/PortableScanner_server_g.h

@@ -274,6 +274,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_BindCameraDevice_Req,PortableScannerService_BindCameraDevice_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_BindCameraDevice(ctx);
 					}
 					break;
@@ -283,6 +284,7 @@ public:
 						ctx.Attach(new SpOnewayCallContext<PortableScannerService_DropOffDevice_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_DropOffDevice(ctx);
 					}
 					break;
@@ -292,6 +294,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_StartPreview_Req,PortableScannerService_StartPreview_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_StartPreview(ctx);
 					}
 					break;
@@ -301,6 +304,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_CancelPreview_Req,PortableScannerService_CancelPreview_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_CancelPreview(ctx);
 					}
 					break;
@@ -310,6 +314,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_ScanImage_Req,PortableScannerService_ScanImage_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_ScanImage(ctx);
 					}
 					break;
@@ -319,6 +324,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_ScanImageEx_Req,PortableScannerService_ScanImageEx_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_ScanImageEx(ctx);
 					}
 					break;
@@ -328,6 +334,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_SetProperty_Req,PortableScannerService_SetProperty_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_SetProperty(ctx);
 					}
 					break;
@@ -337,6 +344,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_SetWinPos_Req,PortableScannerService_SetWinPos_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_SetWinPos(ctx);
 					}
 					break;
@@ -346,6 +354,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_ShowProperty_Req,PortableScannerService_ShowProperty_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_ShowProperty(ctx);
 					}
 					break;
@@ -355,6 +364,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_GetDevStatus_Req,PortableScannerService_GetDevStatus_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_GetDevStatus(ctx);
 					}
 					break;
@@ -364,6 +374,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<PortableScannerService_GetDevInfo_Req,PortableScannerService_GetDevInfo_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_GetDevInfo(ctx);
 					}
 					break;
@@ -373,6 +384,7 @@ public:
 						ctx.Attach(new SpOnewayCallContext<PortableScannerService_Exit_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_Exit(ctx);
 					}
 					break;

Module/mod_PortableScanner/mod_PortableScanner.vcxproj

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3F0A7498-026E-4738-8B54-56639B0D121F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mod_PortableScanner</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Create</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_PORTABLESCANNER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(DevHeadPath);$(ModuleCommonHeadPath);$(FrameworkHeadRoot)\libtoolkit;$(ThirdPartyHeadRoot)\opencv31v10;$(ThirdPartyHeadRoot)\opencv31v10\opencv;$(ThirdPartyHeadRoot)\opencv31v10\opencv2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FrameworkLib)\SpBase.lib;$(FrameworkLib)\libtoolkit.lib;$(ThirdPartyLib)\opencv_highgui310d.lib;$(ThirdPartyLib)\opencv_video310d.lib;$(ThirdPartyLib)\opencv_core310d.lib;$(ThirdPartyLib)\opencv_imgproc310d.lib;$(ThirdPartyLib)\opencv_videoio310d.lib;$(ThirdPartyLib)\opencv_imgcodecs310d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_PORTABLESCANNER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DocScannerCap.h" />
-    <ClInclude Include="mod_PortableScanner.h" />
-    <ClInclude Include="PortableScannerFSM.h" />
-    <ClInclude Include="PortableScanner_def_g.h" />
-    <ClInclude Include="PortableScanner_msg_g.h" />
-    <ClInclude Include="PortableScanner_server_g.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="UserEventCode.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="DocScannerCap.cpp" />
-    <ClCompile Include="mod_PortableScanner.cpp" />
-    <ClCompile Include="PortableScannerFSM.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_PortableScanner/mod_PortableScanner.vcxproj.filters

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="targetver.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="PortableScanner_def_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="PortableScanner_msg_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="PortableScanner_server_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="PortableScannerFSM.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="mod_PortableScanner.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="DocScannerCap.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="UserEventCode.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_PortableScanner.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="PortableScannerFSM.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="DocScannerCap.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc">
-      <Filter>资源文件</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

Module/mod_PortableScanner/targetver.h

@@ -1,8 +1,8 @@
 #pragma once
 
-// 鍖呮嫭 SDKDDKVer.h 灏嗗畾涔夊彲鐢ㄧ殑鏈€楂樼増鏈�殑 Windows 骞冲彴銆�
+// 包括 SDKDDKVer.h 将定义可用的最高版本的 Windows 平台。
 
-// 濡傛灉瑕佷负浠ュ墠鐨� Windows 骞冲彴鐢熸垚搴旂敤绋嬪簭锛岃�鍖呮嫭 WinSDKVer.h锛屽苟灏�
-// WIN32_WINNT 瀹忚�缃�负瑕佹敮鎸佺殑骞冲彴锛岀劧鍚庡啀鍖呮嫭 SDKDDKVer.h銆�
+// 如果要为以前的 Windows 平台生成应用程序，请包括 WinSDKVer.h，并将
+// WIN32_WINNT 宏设置为要支持的平台，然后再包括 SDKDDKVer.h。
 
 #include <SDKDDKVer.h>