Z991239-1084 #comment other: 将指纹实体启动起来

DevAdapter/cmbsz/FingerPrint.1.1/CMakeLists.txt

@@ -14,11 +14,5 @@ set(${MODULE_PREFIX}_SRCS SHARED
 # 适配器工程需要通过此宏替代 add_library
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
-# ${MODULE_FULL_NAME} 是 TAGET 名称，在 rvc_dev_config_library 中定义
-target_include_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_INCLUDE_DIR}")
-target_link_directories(${MODULE_FULL_NAME} PRIVATE "${VENDOR_CURRENT_LIB_DIR}")
-
-target_link_libraries(${MODULE_FULL_NAME} demo)
-
 #  =-=-=-=-=-=-=-=-=-= {适配器工程}/CMakeLists.txt 文件最后必须声明如下内容=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/FingerPrint.1.1/FingerPrint_Impl.cpp

@@ -3,6 +3,8 @@
 */
 
 #include "FingerPrint_Impl.h"
+#include<cstring>
+#include <cstdio>
 
 FingerPrintImpl::FingerPrintImpl()
 {
@@ -32,12 +34,8 @@ ErrorCodeEnum FingerPrintImpl::Reset()
 
 ErrorCodeEnum FingerPrintImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
 {
-	static int nums = 0;
 	ErrorCodeEnum err = Error_Succeed;
-	if (nums == 0) {
-		err = Error_Unexpect;
-		nums = 1;
-	}
+	
 	return err;
 }
 
@@ -70,4 +68,28 @@ ErrorCodeEnum FingerPrintImpl::DevClose()
 ErrorCodeEnum FingerPrintImpl::GetLastErr(DevErrorInfo& devErrInfo)
 {
 	return Error_Succeed;
+}
+
+DEVICEBASE_API ErrorCodeEnum CreateDevComponent(DeviceBaseClass*& baseObj)
+{
+	baseObj = new FingerPrintImpl();
+	if (baseObj == NULL) {
+		return Error_Resource;
+	}
+	else {
+		return Error_Succeed;
+	}
+}
+DEVICEBASE_API ErrorCodeEnum  ReleaseDevComponent(DeviceBaseClass*& pBaseObj)
+{
+	if (pBaseObj == NULL) {
+		return Error_Param;
+	}
+	if (FingerPrintImpl * pTmp = dynamic_cast<FingerPrintImpl*>(pBaseObj))
+	{
+		delete pTmp;
+		pTmp = NULL;
+		return Error_Succeed;
+	}
+	return Error_Param;
 }

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -3,7 +3,6 @@
 #include "FingerPrint_UserErrorCode.h"
 #include "GetDevInfoHelper.h"
 #include "path.h"
-#include "DevEntityCommBase.hpp"
 #include <thread>
 #include <chrono>
 #include <fstream>
@@ -189,14 +188,19 @@ unsigned CFingerPrintFSM::s3_on_event(FSMEvent* e)
 
 ErrorCodeEnum CFingerPrintFSM::OnInit()
 {
-	CSimpleStringA strLibFullPath;
-	CDevAdptEntityBase *pEntity = GET_DEV_ENTITY_BASE_POINTER();
-	ErrorCodeEnum errDev = pEntity->ExtractVendorLibFullPath(strLibFullPath);
-	Dbg("Extract Vendor lib name: %s", (const char*)strLibFullPath);	
+	LOG_FUNCTION();
+
+	GET_DEV_ENTITY_BASE_POINTER()->InitializeVendorLogSwitch();
+
+	CSimpleStringA strLibFullPath(true);
+	auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
+	auto errDev = pEntity->ExtractVendorLibFullPath(strLibFullPath);
+	
+	Dbg("Extract Vendor lib name: %s", strLibFullPath.GetData());	
 
 	if (errDev != Error_Succeed)
 	{
-		Dbg("Get vendor libname(%s) failed.", (const char*)strLibFullPath);
+		Dbg("Get vendor libname(%s) failed.", strLibFullPath.GetData());
 		LogError(Severity_High, Error_DevLoadFileFailed
 				, LOG_ERR_FINGERPRINT_GET_DLLNAME_FAILED_ONINIT
 				, "get dllname failed while init");
@@ -843,9 +847,9 @@ ErrorCodeEnum CFingerPrintFSM::DoGetDevInfo()
 	errDev = m_pFingerPrint->GetDevCategory(m_devCatInfo);
 	if (errDev == Error_Succeed)
 	{
-		Dbg("%d, %d, %d", strlen(m_devCatInfo.szModel)
-						, strlen(m_devCatInfo.szType)
-						, strlen(m_devCatInfo.szVendor));
+		Dbg("szMode = %s", m_devCatInfo.szModel);
+		Dbg("szType = %s", m_devCatInfo.szType);
+		Dbg("szVendor = %s", m_devCatInfo.szVendor);
 
 		if (strlen(m_devCatInfo.szModel) < 256)
 			Dbg("szMode=%s", m_devCatInfo.szModel);

Module/mod_FingerPrint/mod_FingerPrint.h

@@ -24,7 +24,7 @@ private:
 	CFingerPrintEntity* m_pEntity;
 };
 
-class CFingerPrintEntity : public CEntityBase
+class CFingerPrintEntity : public CDevAdptEntityBase
 {
 public:
 	CFingerPrintEntity(){}

addin/cfg/shell.ini.in

@@ -24,7 +24,7 @@ BootManager=1,@LIB_PREFIX@mod_BootManager@LIB_SUFFIX@,0x10D
 IDCertificate=0,@LIB_PREFIX@mod_IDCertificate@LIB_SUFFIX@,0x201
 CardSwiper=0,@LIB_PREFIX@mod_CardSwiper@LIB_SUFFIX@,0x202
 ;CardIssuer=0,@LIB_PREFIX@mod_CardIssuer@LIB_SUFFIX@,0x203
-;FingerPrint=0,@LIB_PREFIX@mod_FingerPrint@LIB_SUFFIX@,0x204
+FingerPrint=0,@LIB_PREFIX@mod_FingerPrint@LIB_SUFFIX@,0x204
 ;Printer=0,@LIB_PREFIX@mod_printer@LIB_SUFFIX@,0x205
 PinPad=0,@LIB_PREFIX@mod_PinPad@LIB_SUFFIX@,0x206
 ;MediaController=0,@LIB_PREFIX@mod_mediacontroller@LIB_SUFFIX@,0x208