Browse Source

#IQBX #comment 合并上线版本前的一次杂项提交

80374374 1 year ago
parent
commit
b2a376459e

+ 1 - 7
CMakeLists.txt

@@ -284,15 +284,9 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
-if(MSVC)
-conan_cmake_run(REQUIRES RvcFramework/1.10.0@LR04.02_FrameworkLib/testing
+conan_cmake_run(REQUIRES RvcFramework/1.10.0.3@LR04.02_FrameworkLib/testing
 	Audio/2023.0509.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.22@LR04.02_FrameworkLib/dev
-	Audio/2023.0509.01@LR04.02_MediaRes/testing
-BASIC_SETUP CMAKE_TARGETS)
-endif(MSVC)
 include(DependencyConanFiles)
 
 set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})

+ 3 - 0
DevAdapter/Note.md

@@ -8,4 +8,7 @@
 `conan upload  sogouime/2.6.4.593@LR04.02_MediaRes/testing --all -r=conan-cmb`
 # 注意事项
 
+`conan export-pkg . LR04.02_ThirdParty/testing -s arch=x86 -s os=Windows -s compiler="Visual Studio" -s compiler.version=16  -s build_type=Release`
+`conan export-pkg . LR04.02_ThirdParty/testing -s arch=x86 -s os=Windows -s compiler="Visual Studio" -s compiler.version=16  -s build_type=Debug`
+`conan upload CEFControl/1.0@LR04.02_ThirdParty/testing --all -r=conan-cmb`
 * 科堡适配器依赖:`sudo apt-get install libasound2-dev` (廖桂发,2021年2月5日)

+ 0 - 43
DevAdapter/include/BranchDeviceClass.h

@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-///	Copyright (c) 2017 China Merchants Bank, all rights reserved	       	  ///
-///	  Adapter Interface for Branch Device.                          	      ///
-///	                                                             	       	  ///
-///	                                                             	       	  ///
-/////////////////////////////////////////////////////////////////////////////////
-
-#ifndef __BRANCH_DEVICE_CLASS_H
-#define __BRANCH_DEVICE_CLASS_H
-
-#include "DeviceBaseClass.h"
-
-class BranchDeviceClass : public DeviceBaseClass
-{
-public:
-	//
-	//	打开设备
-	//	@param1: 配置在root.ini中,打开设备所需的参数字符串,比如说波特率端口,由实现子类进行字符串额分割和解析
-	//	@param2: 配置在CenterSetting.ini中,分行全行通用的字符串,作用暂未定义,由分行决定其使用功能
-	//	参数的配置方式见《可视化柜台分行特色硬件适配器开发说明.doc》
-	//
-	virtual ErrorCodeEnum DevOpen(const char *param1, const char *param2) = 0;	
-		
-	//
-	//	执行操作指令
-	//	@param:    指令内容
-	//	@retValue: 存储返回内容的字符串
-	//	@maxLen:   字符串的缓冲区长度
-	//
-	virtual ErrorCodeEnum ExecuteCmd(const char *param, char *&retValue, int maxLen) = 0;	
-	
-	//  
-	//	设备状态检测
-	//	@status: 在函数返回 Error_Succeed 的前提下定义为有效,其余情况不作任何处理
-	//	0:正常
-	//	1:警告,提示性信息,上层可不处理,原则上可通过GetLastErr接口可提取具体的原因
-	//	2:维护,设备可用,但需要上层发维护信息,分行通用实体将执行Reset接口函数
-	//	3:故障,设备不可用,原则上可通过GetLastErr接口可提取具体的原因,分行通道实体将执行适配器加载进程重启操作
-	//
-	virtual ErrorCodeEnum QueryDevice(unsigned int &status) = 0;
-};
-
-#endif //__BRANCH_DEVICE_CLASS_H

+ 0 - 68
DevAdapter/include/BranchDeviceHelper.h

@@ -1,68 +0,0 @@
-#ifndef __BRANCH_DEVICE_HLEPER_H
-#define __BRANCH_DEVICE_HLEPER_H
-#pragma once
-const int MAX_PATH_SIZE = 256;
-
-#include <strsafe.h>
-#include <Shlobj.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	int GetCurrentRunPath(char *pPath)
-	{
-		char *pBuf = new char[MAX_PATH_SIZE];
-		if (pBuf == NULL)
-			return -1;
-		ZeroMemory(pBuf,MAX_PATH_SIZE);
-		GetModuleFileName(NULL,pBuf,MAX_PATH_SIZE);
-		int len = strnlen_s(pBuf,MAX_PATH_SIZE);
-		if (len <= 0)
-		{
-			delete []pBuf;
-			return -2;
-		}
-		char *pch;
-		pch = strstr (pBuf,"bin");
-		if (pch == NULL)
-			return -3;
-		int lenDel = strnlen_s(pch,MAX_PATH_SIZE);
-		if (len <= 0)
-		{
-			delete []pBuf;
-			return -3;
-		}
-		strncpy_s(pPath,MAX_PATH_SIZE,pBuf,len-lenDel);
-		delete []pBuf;
-
-		return strnlen_s(pPath,MAX_PATH_SIZE);
-	}
-
-	// >0 means suc and set the path size
-	//	  pPath store directory path like "C:\Users\{UserName}\AppData\LocalLow"
-	// <0 means failed !!
-	int GetWriteAvailableDirPath(char *pPath)
-	{
-		char *pBuf = new char[MAX_PATH_SIZE];
-		if (pBuf == NULL)
-			return -1;
-		ZeroMemory(pBuf,MAX_PATH_SIZE);
-		PWSTR pszPath = NULL;
-		if(SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0, NULL, &pszPath) != S_OK)
-		{
-			delete[] pBuf;
-			return -2;
-		}
-		WideCharToMultiByte(CP_ACP, 0, pszPath, -1, pBuf, MAX_PATH_SIZE, NULL, NULL);
-		CoTaskMemFree((LPVOID)pszPath);
-		int len = strnlen_s(pBuf, MAX_PATH_SIZE);
-		strncpy_s(pPath, MAX_PATH_SIZE, pBuf, len);
-		delete []pBuf;
-		return strnlen_s(pPath, MAX_PATH_SIZE);
-	}
-
-#ifdef __cplusplus
-}
-#endif
-#endif //__BRANCH_DEVICE_HLEPER_H

+ 1 - 1
DevAdapter/include/CardIssuerClass.h

@@ -118,7 +118,7 @@ public:
 	//	Move card to specified position.
 	//	hopperNo:多卡箱发卡时指定发卡箱号(面对发卡机,从左往右依次是1,2,3,...号卡箱)
 	//		卡库:卡片从卡库加卡箱移动到读卡器,eCardPos为CI_MOVECARD_FROM_HOPPER,hopperNo固定传入99
-	//		卡库:卡片从卡库加卡箱移动到读卡器,若加卡箱已经无卡,返回Error_DevMedia
+	//		卡库:卡片从卡库加卡箱移动到读卡器,若加卡箱已经无卡,返回Error_Dev_HopperHasNoCard
 	//
 	virtual ErrorCodeEnum MoveCard(CardPosEnum eCardPos, int hopperNo = 1) = 0;
 	//

+ 9 - 9
DevAdapter/include/CardMix.h

@@ -30,15 +30,15 @@ enum CardStatusEnum
 {
 	CI_MEDIA_NOTPRESENT,	//卡机任何位置没有发现卡片
 	//以下仅供大机、便携发卡机CardIssuer使用
-			CI_MEDIA_PRESENT,		//卡机内部发现卡片
+	CI_MEDIA_PRESENT,		//卡机内部发现卡片
 	CI_MEDIA_JAMMED,		//卡片卡住
 	//仅供大机、便携卡机CardIssuer和吸入式卡机CardSwiper使用
-			CI_MEDIA_ENTERING,		//卡片在进卡口
+	CI_MEDIA_ENTERING,		//卡片在进卡口
 	//以下仅供多合一、壁挂式、吸入式卡机CardSwiper使用
-			CI_MEDIA_IC,		//在多合一、壁挂式的IC插卡位检测到IC卡 或者 在吸入式卡机卡槽内检测到IC卡
+	CI_MEDIA_IC,		//在多合一、壁挂式的IC插卡位检测到IC卡 或者 在吸入式卡机卡槽内检测到IC卡 
 	CI_MEDIA_NOT_IC,	//在多合一、壁挂式的IC插卡位检测到卡片但未能检测到IC芯片 或者 在吸入式卡机卡槽内检测到纯磁条卡
-	CI_MEDIA_RF,		//检测到非接卡片
-	CI_MEDIA_IDCARD,	//检测到身份证
+	CI_MEDIA_RF,		//检测到非接卡片(ContactlessCard借用)
+	CI_MEDIA_IDCARD,	//检测到身份证(ContactlessCard借用)
 };
 //retain bin state
 enum RtBinStatusEnum
@@ -46,7 +46,7 @@ enum RtBinStatusEnum
 	CI_RETAINBIN_OK,	//number of retained card less than half of retain bin's capacity
 	CI_RETAIN_NOTSUPP,	//no retain bin
 	CI_RETAINBIN_FULL,	//retain bin is full
-	CI_RETAINBIN_HIGH,	//retain bin is almost full,number of retain card more
+	CI_RETAINBIN_HIGH,	//retain bin is almost full,number of retain card more 
 	//than half of retain bin's capacity
 };
 //issue hopper state
@@ -55,7 +55,7 @@ enum IssHopperStatusEnum
 	CI_ISSUEHOPPER_OK,	//number of issued card more than half of issue hopper's capacity
 	CI_ISSUEHOPPER_NOTSUPP,	//no issue hopper
 	CI_ISSUEHOPPER_EMPTY,	//issue hopper is empty
-	CI_ISSUEHOPPER_LOW,		//issue hopper is almost empty,number of card less
+	CI_ISSUEHOPPER_LOW,		//issue hopper is almost empty,number of card less 
 	//than half of issue hopper's capacity
 };
 enum LightPosEnum
@@ -63,7 +63,7 @@ enum LightPosEnum
 	CI_LIGHT_MAG = 0x1,			//the magnetic stripe light flicker
 	CI_LIGHT_IC = 0x2,			//the IC card light flicker
 	//CI_LIGHT_MAG_IC,		//both the magnetic and IC light flicker
-			CI_LIGHT_CONTACTLESS = 0x4,	//the contactless card light flicker
+	CI_LIGHT_CONTACTLESS = 0x4,	//the contactless card light flicker
 	CI_LIGHT_IDCERTIFICATE = 0x8,	//the IDCertificate card light flicker
 };
 enum TrackSrcEnum
@@ -127,7 +127,7 @@ struct TrackInfo
 };
 struct MagTracks
 {
-	TrackRange eRange;
+	TrackRange eRange;	
 	TrackInfo track[MAX_MAG_TRACK_NUM];
 };
 struct CardNo

+ 0 - 1
DevAdapter/include/DevErrorCode.h

@@ -1547,7 +1547,6 @@ typedef short DECRESULT;
 #define MAKE_SLV_ERRORCODE(eid,vendor,ec)	\
 	( (DWORD) (((unsigned long)(eid)<<20) | ((((unsigned long)(vendor & 0x1F)))<<15) | (((unsigned long)(ec)) & 0x7FFF)) )
 
-//ec: device original errorcode, remote the deivce identity through & 0x1FF
 #define MAKE_SLV_ERRORCODE_TO_BUSINESS(eid,ec,reserved)	\
 	( (DWORD) (((unsigned long)(eid)<<20) | (((unsigned long)(reserved)) << 14) | (((unsigned long)(ec)) & 0x1FF)) )
 //

+ 25 - 14
DevAdapter/include/DeviceBaseClass.h

@@ -6,6 +6,17 @@
 ///																			  ///
 /////////////////////////////////////////////////////////////////////////////////
 
+//	Return code(ErrorCodeEnum):
+//	Error code that adapters returned mainly in the following list:
+//	Error_Hardware=0x800,
+//	Error_DevLoadFileFailed,	//load dll or config file failed
+//	Error_DevNotAvailable,		//device not connected
+//	Error_DevAlreadyConnected,	//device already connected
+//	Error_DevConnFailed,		//connect to device failed
+//	Error_DevCommFailed,		//Communication failed between HOST and Device
+//	Error_DevMedia,				//Media error(Data lack,unrecognized and so on)
+//	Adapters can also return error code which included in the file ErrorCode.h
+
 //	The "Optional." in front of method's comment means this method to implement depends on device.
 //	If the device don't have the function ,just return Error_Succeed simply,but must declare in the 
 //	implementation document. 
@@ -83,27 +94,27 @@ struct DevSoftVersion
 {
 	WORD wMajor;		//release major version
 	WORD wMinor;		//release minor version
-	WORD wRevision;   //bug repair version with the major and minor version remains the same
-	WORD wBuild;		   //compile version
+	WORD wRevision;		//bug repair version with the major and minor version remains the same
+	WORD wBuild;		//compile version
 };
 enum DevStateEnum
 {
-	DEVICE_STATUS_NOT_READY,	 //uninit
-	DEVICE_STATUS_NORMAL,		     //normal
-	DEVICE_STATUS_MAINTAINCE,	 //need to maintaince
-								                         //ex:paper tray is empty,retain bin is full
-	DEVICE_STATUS_FAULT,		         //cannot work
-	DEVICE_STATUS_CONNECTING,	 //device connecting
-	DEVICE_STATUS_NOCFG,		     //the vtm has no such device
-	DEVICE_STATUS_CROSS_USING,	 //the device is in cross calling
+	DEVICE_STATUS_NOT_READY,	//uninit
+	DEVICE_STATUS_NORMAL,		//normal
+	DEVICE_STATUS_MAINTAINCE,	//need to maintaince
+								//ex:paper tray is empty,retain bin is full
+	DEVICE_STATUS_FAULT,		//cannot work
+	DEVICE_STATUS_CONNECTING,	//device connecting
+	DEVICE_STATUS_NOCFG,		//the vtm has no such device
+	DEVICE_STATUS_CROSS_USING,	//the device is in cross calling
 };
 struct DevCategoryInfo
 {
-	char szType[MAX_DEV_TYPE_LEN];             	//device type sth like "CMB.Printer.HP1234"
-	char szModel[MAX_DEV_MODEL_LEN];	        //device model
+	char szType[MAX_DEV_TYPE_LEN];	//device type sth like "CMB.Printer.HP1234"
+	char szModel[MAX_DEV_MODEL_LEN];	//device model
 	char szVendor[MAX_DEV_VENDOR_LEN];		//device vendor
-	DevStateEnum eState;		                                //device status
-	DevSoftVersion version;	                                //software version
+	DevStateEnum eState;		//device status
+	DevSoftVersion version;	//software version
 };
 struct DevErrorInfo
 {

+ 30 - 40
Module/CMakeLists.txt

@@ -1,12 +1,10 @@
 
-#霈曄蔭摰硺��滨妍 ${MODULE_NAME}嚗��摰硺��滨�摰帋� ${MODULE_PREFIX}
 macro(define_module _module_name)
 	set(MODULE_NAME "mod_${_module_name}")
     set(ENTITY_NAME "${_module_name}")
 	string(TOUPPER "${MODULE_NAME}" MODULE_PREFIX)
 endmacro(define_module)
 
-# 雿輻鍂 libRestfulFunc�踵揢獢�沲��ttp蝏�辣
 set(REPLACE_HTTPCLIENT_WITH_CPPRESTSDK TRUE)
 
 if(RVC_DEBUG_MODE)
@@ -45,8 +43,6 @@ if(SIMULATE_ON)
     rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
 endif(SIMULATE_ON)
 
-#撖嫣� Windows 霈曄蔭摰硺�����?靽⊥�
-#摰帋��曹澈摨栞��?
 macro(add_module_libraries _module_prefix _module_name _module_version)
     
     string(STRIP ${_module_version} RAW_VERSION_STRING)
@@ -85,7 +81,6 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif(BUILD_MOUDLE_TEST)
 
     add_library(${_module_name} SHARED ${${_module_prefix}_SRCS} ${${_module_name}_TEST_SRCS})
-        # 霈曄蔭撌亦�颲枏枂頝?敺��餈蹱�雿𨅯銁 Linux �齿�����? Windows �蠘?㗇𡂝憌𦒘�嚗峕?餅暑銝滩?䕘��?�賡�朞��典���䲮撘讛�銵諹?曄蔭
     if(SIMULATE_ON)
         set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_PATH "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
         set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
@@ -94,9 +89,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         # etc for the other available configuration types (MinSizeRel, RelWithDebInfo)
     endif()
 
-    # 瘛餃�撖澆枂摰誩�銋?
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
-    # ���曄略頞�&霈方����CJSON憭湔�隞嗅��函�敹�?��? --gifur
     target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES} ${THIRD_PARTY_BASE_DIR}/Include/CJson ${OTHER_LIB_BASE_DIR}/libpublicFun)
     if(BUILD_MOUDLE_TEST)
         target_compile_definitions(${_module_name} PRIVATE "WITH_BUILD_MODULE_TEST")
@@ -124,8 +117,6 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
 
 endmacro(add_module_libraries)
 
-# 霈曄蔭摰硺����鋆�鼧韐肽楝敺?
-# 撖嫣� Windows 霈曄蔭摰硺�憿寧𤌍撌亦��刻圾�單䲮獢�����
 macro(deploy_module _module_prefix _module_name)
 
     if(MSVC)
@@ -150,7 +141,7 @@ macro(deploy_module _module_prefix _module_name)
 endmacro(deploy_module)
 
 if(BUILD_TESTING)
-	add_subdirectory(include/test)
+	#add_subdirectory(include/test)
 endif()
 
 if(BUILD_MOUDLE_TEST)
@@ -164,7 +155,6 @@ if(MSVC)
     set(MODULE_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_MISC})
 endif(MSVC)
 
-# �滚�摰硺�
 # rvc_add_all_cmake_subdirectory()
 add_subdirectory(mod_validityVertifier)
 add_subdirectory(mod_CardReadAdapter)
@@ -173,53 +163,53 @@ add_subdirectory(mod_pinpad)
 add_subdirectory(mod_IDCertificate)
 add_subdirectory(mod_CustMngrAuth)
 add_subdirectory(mod_FingerPrint)
-add_subdirectory(mod_customeraware)
-add_subdirectory(mod_localmediaplay)
-add_subdirectory(mod_interactivecontrol)
-add_subdirectory(mod_assistantchannel)
+#add_subdirectory(mod_customeraware)
+#add_subdirectory(mod_localmediaplay)
+#add_subdirectory(mod_interactivecontrol)
+#add_subdirectory(mod_assistantchannel)
 add_subdirectory(mod_UpgradeMgr)
 add_subdirectory(mod_upload)
-add_subdirectory(mod_healthmanager)
-add_subdirectory(mod_accessauth)
-add_subdirectory(mod_guiconsole)
-add_subdirectory(mod_CenterSetting)
-add_subdirectory(mod_tokenmgr)
-add_subdirectory(mod_evtconverter)
-add_subdirectory(mod_interactivelog)
+#add_subdirectory(mod_healthmanager)
+#add_subdirectory(mod_accessauth)
+#add_subdirectory(mod_guiconsole)
+#add_subdirectory(mod_CenterSetting)
+#add_subdirectory(mod_tokenmgr)
+#add_subdirectory(mod_evtconverter)
+#add_subdirectory(mod_interactivelog)
 add_subdirectory(mod_chromium)
 
-add_subdirectory(mod_ups)
 add_subdirectory(mod_ScannerSet)
 add_subdirectory(mod_HSPScanner)
 add_subdirectory(mod_ContactlessCard)
 add_subdirectory(mod_gpio)
-add_subdirectory(mod_watchdog)
+
 add_subdirectory(mod_DeviceControl)
-add_subdirectory(mod_facetracking)
-add_subdirectory(mod_initiativetransfer)
-add_subdirectory(mod_interactioncontext)
-add_subdirectory(mod_agentip)
-add_subdirectory(mod_counterconnector)
-add_subdirectory(mod_countercontext)
-add_subdirectory(mod_mediacontroller)
-add_subdirectory(mod_recorder)
-add_subdirectory(mod_snapshot)
-add_subdirectory(mod_screenshot)
+#add_subdirectory(mod_facetracking)
+#add_subdirectory(mod_initiativetransfer)
+#add_subdirectory(mod_interactioncontext)
+#add_subdirectory(mod_agentip)
+#add_subdirectory(mod_counterconnector)
+#add_subdirectory(mod_countercontext)
+#add_subdirectory(mod_mediacontroller)
+#add_subdirectory(mod_recorder)
+#add_subdirectory(mod_snapshot)
+#add_subdirectory(mod_screenshot)
 add_subdirectory(mod_selfchecker)
 add_subdirectory(mod_heartbeat)
 add_subdirectory(mod_alarm)
 add_subdirectory(mod_RomoteController)
 add_subdirectory(mod_ResourceWatcher)
-add_subdirectory(mod_livenessdetection)
+#add_subdirectory(mod_livenessdetection)
 
 #below should be compiled succesufully.
-add_subdirectory(mod_SalesRecorder)
-add_subdirectory(mod_sipphone)
-
-add_subdirectory(mod_CameraConfigManage)
+#add_subdirectory(mod_SalesRecorder)
+#add_subdirectory(mod_sipphone)
 
+if(NOT MSVC)
+#todo to remove since the install procedure has been castrated
+    add_subdirectory(mod_CameraConfigManage)
+endif(NOT MSVC)
 
-# 瘙��餉?��韏𡝗鼧韐萘�蝚?銝㗇䲮摨?
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 
 

+ 2 - 1
Other/win/CMakeLists.txt

@@ -2,7 +2,8 @@ if(SIMULATE_ON)
 	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
 endif(SIMULATE_ON)
 
-add_subdirectory(showdev)
+# add_subdirectory(showdev)
+add_subdirectory(libfilecryption)
 
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${OTHER_CONAN_DEP_LIBS} PARENT_SCOPE)