Z991239-5384 #comment 删掉CardSwiper相关的公共部分

DevAdapter/cmbsz/cardswiper.1.1/CMakeLists.txt

@@ -1,24 +0,0 @@
-# 声明模块名称的前缀和名称
-rvc_dev_define_module("CardSwiper")
-
-# rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
-set(${MODULE_PREFIX}_VERSION "1")
-set(${MODULE_PREFIX}_BATCH "1")
-
-# 包含要编译的实现文件，rvc_dev_config_library 内使用
-set(${MODULE_PREFIX}_SRCS SHARED
-        cardswiper_impl.cpp
-        )
-
-# 适配器工程需要通过此宏替代 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/cardswiper.1.1/cardswiper_impl.cpp

@@ -1,212 +0,0 @@
-//
-// Created by LocalUser on 2019/1/7.
-//
-
-#include "cardswiper_impl.h"
-#include <cstring>
-#include "demo.h"
-
-CardSwiperImpl::CardSwiperImpl()
-    :m_mode(0)
-{
-
-}
-
-CardSwiperImpl::~CardSwiperImpl()
-{
-
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDevCategory(DevCategoryInfo &devCategory)
-{
-
-    ErrorCodeEnum err = Error_Succeed;
-    std::strcpy(devCategory.szModel, "szModel");
-    std::strcpy(devCategory.szType, "szCategory");
-    std::strcpy(devCategory.szVendor, "szVendor");
-    return err;
-}
-
-ErrorCodeEnum CardSwiperImpl::Reset()
-{
-    ErrorCodeEnum err = Error_Unexpect;
-    m_mode = 0;
-    return err;
-}
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-ErrorCodeEnum CardSwiperImpl::DevOpen(int argNum, char* argArray)
-#else
-ErrorCodeEnum CardSwiperImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
-#endif
-{
-    static int nums = 1;
-    ErrorCodeEnum err = Error_Succeed;
-    if (nums == 0)
-    {
-        err = Error_Unexpect;
-        nums = 1;
-    }
-    return err;
-}
-
-ErrorCodeEnum CardSwiperImpl::DevClose()
-{
-    ErrorCodeEnum err = Error_Succeed;
-    return err;
-}
-
-
-ErrorCodeEnum CardSwiperImpl::GetLastErr(DevErrorInfo &devErrInfo)
-{
-    strcpy(devErrInfo.szErrMsg, HelloDemo());
-    devErrInfo.dwErrMsgLen = strlen(HelloDemo());
-    return Error_Succeed;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDevStatus(CardSwiperStatus& devStatus)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::AbortRead()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::QueryCardStatus(const DWORD dwPos, int& iStatus, MagTracks& magTracks)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::MagRead(MagTracks& magTracks)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ActiveICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ContactIC()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ReleaseIC()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::DeactivateICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::DeactContactlessICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::WarmReset()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ICCommand(CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetKeyPair(char*& priKey, int& priSize, char*& pubKey, int& pubSize)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::LoadPrivateKey(const char* pKey, const int size)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SendRandomNum(const char* pRandomNum, const char* pRamChk, char*& pData)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SendWorkingKey(const char* pWorkingKey)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDeviceSN(char*& pDevSN)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SetR2(int& iStatus, BYTE* pCr2, int lenR2)
-{
-    return Error_NotImpl;
-}
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-DEVICEBASE_API ErrorCodeEnum  CreateDevComponent(DWORD dwDevClassID, DeviceBaseClass*& pOutDevAptObj)
-#else
-DEVICEBASE_API ErrorCodeEnum  CreateDevComponent(DeviceBaseClass*& pOutDevAptObj)
-#endif
-{
-    pOutDevAptObj = new CardSwiperImpl();
-    if(pOutDevAptObj == NULL)
-    {
-        return Error_Resource;
-    }
-    return Error_Succeed;
-}
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-DEVICEBASE_API ErrorCodeEnum  ReleaseDevComponent(DWORD dwDevClassID, DeviceBaseClass*& pInDevAptObj)
-#else
-DEVICEBASE_API ErrorCodeEnum  ReleaseDevComponent(DeviceBaseClass*& pInDevAptObj)
-#endif
-{
-    if(pInDevAptObj == NULL)
-    {
-        return Error_Param;
-    }
-    if(CardSwiperImpl* pTmp = dynamic_cast<CardSwiperImpl*>(pInDevAptObj))
-    {
-        delete pTmp;
-        pTmp = NULL;
-        return Error_Succeed;
-    }
-    return Error_Param;
-}
-
-#ifdef NEWER_COMPILER_WORKAROUNDS
-
-DEVICEBASE_API ErrorCodeEnum  GetDevAdapterVersion(DevSoftVersion& retVesion)
-{
-	retVesion.wMajor = retVesion.wMinor = retVesion.wBuild = retVesion.wRevision = 0;
-	return Error_Succeed;
-}
-
-#endif // NEWER_COMPILER_WORKAROUNDS

DevAdapter/cmbsz/cardswiper.1.1/cardswiper_impl.h

@@ -1,58 +0,0 @@
-//
-// Created by LocalUser on 2019/1/7.
-//
-
-#ifndef LIBFRAMEWORK_CARDSWIPER_IMPL_H
-#define LIBFRAMEWORK_CARDSWIPER_IMPL_H
-
-#include "CardSwiperClass.h"
-
-class CardSwiperImpl : public CardSwiperClass
-{
-public:
-    CardSwiperImpl();
-    ~CardSwiperImpl();
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-	ErrorCodeEnum DevOpen(int argNum, char* argArray);
-#else
-	ErrorCodeEnum DevOpen(DWORD dwPort, DWORD dwBaudRate);
-#endif
-
-    //DeviceBaseClass
-    ErrorCodeEnum GetDevCategory(DevCategoryInfo &devCategory);
-    ErrorCodeEnum Reset();
-    ErrorCodeEnum DevClose();
-    ErrorCodeEnum GetLastErr(DevErrorInfo &devErrInfo);
-
-    //CardSwiperClass
-    virtual ErrorCodeEnum GetDevStatus(CardSwiperStatus& devStatus);
-    virtual ErrorCodeEnum AbortRead();
-    virtual ErrorCodeEnum QueryCardStatus(const DWORD dwPos, int& iStatus, MagTracks& magTracks);
-	virtual ErrorCodeEnum MagRead(MagTracks& magTracks);
-	virtual ErrorCodeEnum ActiveICCard();
-	virtual ErrorCodeEnum ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType);
-	virtual ErrorCodeEnum ContactIC();
-	virtual ErrorCodeEnum ReleaseIC();
-	virtual ErrorCodeEnum DeactivateICCard();
-	virtual ErrorCodeEnum DeactContactlessICCard();
-	virtual ErrorCodeEnum WarmReset();
-	virtual ErrorCodeEnum ICCommand(CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum GetKeyPair(char*& priKey, int& priSize, char*& pubKey, int& pubSize);
-	virtual ErrorCodeEnum LoadPrivateKey(const char* pKey, const int size);
-	virtual ErrorCodeEnum SendRandomNum(const char* pRandomNum, const char* pRamChk, char*& pData);
-	virtual ErrorCodeEnum SendWorkingKey(const char* pWorkingKey);
-	virtual ErrorCodeEnum GetDeviceSN(char*& pDevSN);
-	virtual ErrorCodeEnum TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey);
-	virtual ErrorCodeEnum SetR2(int& iStatus, BYTE* pCr2, int lenR2);
-	virtual ErrorCodeEnum IfDevOnline(int& bOn) { bOn = 1; return Error_Succeed; }
-	virtual ErrorCodeEnum EjectCard(CardPosEnum ePos) { return Error_Succeed; }
-
-protected:
-	int m_mode;
-};
-
-
-#endif //LIBFRAMEWORK_CARDSWIPER_IMPL_H

DevAdapter/include/CardMix.h

@@ -29,14 +29,11 @@ enum CardInEnum
 enum CardStatusEnum
 {
 	CI_MEDIA_NOTPRESENT,	//卡机任何位置没有发现卡片
-	//以下仅供大机、便携发卡机CardIssuer使用
+	//以下仅供大机使用
 	CI_MEDIA_PRESENT,		//卡机内部发现卡片
 	CI_MEDIA_JAMMED,		//卡片卡住
-	//仅供大机、便携卡机CardIssuer和吸入式卡机CardSwiper使用
 	CI_MEDIA_ENTERING,		//卡片在进卡口
-	//以下仅供多合一、壁挂式、吸入式卡机CardSwiper使用
-	CI_MEDIA_IC,		//在多合一、壁挂式的IC插卡位检测到IC卡 或者 在吸入式卡机卡槽内检测到IC卡 
-	CI_MEDIA_NOT_IC,	//在多合一、壁挂式的IC插卡位检测到卡片但未能检测到IC芯片 或者 在吸入式卡机卡槽内检测到纯磁条卡
+	
 	CI_MEDIA_RF,		//检测到非接卡片（ContactlessCard借用）
 	CI_MEDIA_IDCARD,	//检测到身份证（ContactlessCard借用）
 };

DevAdapter/include/CardSwiperClass.h

@@ -1,186 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-///	Copyright (c) 2013 China Merchants Bank, all rights reserved	       	  ///
-///	  Adapter Interface for Card Swiper.                          	       	  ///
-///	                                                             	       	  ///
-///	                                                             	       	  ///
-/////////////////////////////////////////////////////////////////////////////////
-#ifndef __CARD_SWIPER_CLASS_H
-#define __CARD_SWIPER_CLASS_H
-#include "DeviceBaseClass.h"
-#include "CardMix.h"
-
-
-//retain bin and issue hopper state
-struct CardSwiperStatus 
-{ 
-	CardStatusEnum eMedia;	//state about card
-	//RtBinStatusEnum eRetainBin;
-	//DWORD dwRetainCount;	//number of card retained
-	//IssHopperStatusEnum eIssuerBin; 
-	//DWORD dwIssuerCount;	//number of card issued
-};
-struct FWBStatus
-{
-	DWORD BatteryCapacity;		//capacity of battery(by hour) 暂未使用
-	DWORD BatteryLeft;				//0~100,剩余电量
-};
-
-class CardSwiperClass : public DeviceBaseClass
-{
-public:
-	//
-	//	Connect to device and do initialization.
-	//	Make preparations for controlling the device.
-	//	Arguments:
-	//	- dwPort[in]		com port number
-	//	- dwBaudRate[in]	Baud rate
-	//
-	virtual ErrorCodeEnum DevOpen(DWORD dwPort,DWORD dwBaudRate) = 0;
-	//
-	//	Get card issuer status
-	//
-	virtual ErrorCodeEnum GetDevStatus(CardSwiperStatus &devStatus) = 0;
-	//
-	//	Abort current operation.
-	//
-	virtual ErrorCodeEnum AbortRead() = 0;
-	//
-	//	Get card status:swiping card  or inserted into ic slot or rf card in induction range
-	//
-	//	dwPos: light position
-	// 	CI_LIGHT_MAG = 0x1,   //the magnetic stripe light flicker
-	// 	CI_LIGHT_IC = 0x2,   //the IC card light flicker
-	// 	CI_LIGHT_CONTACTLESS = 0x4, //the contactless card light flicker
- 	//	magnetic and IC light flicker :set dwPos = （CI_LIGHT_MAG | CI_LIGHT_IC）
-	//	all light flicker:set dwPos = (CI_LIGHT_MAG | CI_LIGHT_IC | CI_LIGHT_CONTACTLESS）
-	//
-	//	iStatus:
-	//	<0 failed
-	//	0：timeout,cannot find any card or cancel read
-	//	1：magnetic card swiped
-	//	2：contact card found.If has no magnetic,ATR should been put in magTracks[0].data,also set magTracks[0].size
-	//	4：contactless card found.If has no magnetic,ATS should been put in magTracks[0].data,also set magTracks[0].size
-	//	5: detect card in IC slot,but can't active it. the card may be don't have ic part
-	//	6: detect ID Card
-	//	7: magnetic card swiped,but!!!the checkcode is wrong!
-	virtual ErrorCodeEnum QueryCardStatus(const DWORD dwPos,int &iStatus,MagTracks &magTracks) = 0;
-	//
-	//	Read data from magnetic track(don't use for currently).
-	//
-	virtual ErrorCodeEnum MagRead(MagTracks &magTracks) = 0;
-	//
-	//	Active contact IC card
-	//
-	virtual ErrorCodeEnum ActiveICCard() = 0;
-	//
-	//	Active contactless IC card(Type A,B,Mifare)
-	//	The first,second,third activation order decided by fstType,scdType,thdType respectively
-	//	fstType,scdType,thdType can be one of 'A','B','M','0'(30H,no type)
-	//	outType indicates the type of  activation result
-	//
-	virtual ErrorCodeEnum ActiveContactlessICCard(char fstType,char scdType,char thdType,char &outType) = 0;
-	//
-	//	Move IC card to contact position
-	//
-	virtual ErrorCodeEnum ContactIC() = 0;
-	//
-	//	Release IC contact
-	//
-	virtual ErrorCodeEnum ReleaseIC() = 0;
-	//
-	//	Deactivate contact IC card
-	//
-	virtual ErrorCodeEnum DeactivateICCard() = 0;
-	//
-	//	Deactivate contactless IC card
-	//
-	virtual ErrorCodeEnum DeactContactlessICCard() = 0;	
-	//
-	//	Warm reset card(IC)
-	//
-	virtual ErrorCodeEnum WarmReset() = 0;
-	//
-	//	APDU:Application Protocol Data Unit
-	//	CmdSend.lpCmd：Command-APDU
-	//	CmdRecv.lpData：Response-APDU
-	//
-	virtual ErrorCodeEnum ICCommand(CmdInfo sendBuf,CmdInfo &recvBuf) = 0;
-	//
-	//	Mifare operation
-	//	Arguments:
-	//	- eFunType:function type as load key,authentication and so on
-	//	- sendBuf:[parameter(hex)][data(hex)]
-	//	- recvBuf:[status(1byte)][return data(hex)]
-	//		-- [eFunType],[parameter,data],[status(1byte),return data]
-	//		-- [CI_MIFARE_LOAD_KEY],[key select(1byte),sector num(1byte),uncoded keys(6bytes)],[status(1byte)]
-	//		-- [CI_MIFARE_AUTH],[key select(1byte),sector num(1byte)],[status(1byte)]
-	//		-- [CI_MIFARE_READ],[block num(1byte)],[status(1byte),data(16bytes)]
-	//		-- [CI_MIFARE_WRITE],[block num(1byte),data(16bytes)],[status(1byte)] 
-	//		-- [CI_MIFARE_INC],[source block num(1byte),destination block num(1byte),inc value(4bytes)],[status(1byte)]
-	//		-- [CI_MIFARE_DEC],[source block num(1byte),destination block num(1byte),dec value(4bytes)],[status(1byte)]
-
-	virtual ErrorCodeEnum MifareCommand(MifareFuctionEnum eFunType,CmdInfo sendBuf,CmdInfo &recvBuf) = 0;
-	//
-	//	RF Type A,B command.
-	//	APDU:Application Protocol Data Unit
-	//	Arguments:
-	// 	- CmdSend.lpCmd:Command-APDU
-	// 	- CmdRecv.lpData:Response-APDU
-	//
-	virtual ErrorCodeEnum RFTypeABCommand(CmdInfo sendBuf,CmdInfo &recvBuf) = 0;
-	//
-	//	Get key pair.
-	//	Generate a pair of key to encrypt data(using SM2).
-	//	priKey:private key; priSize:size of private key; pubKey:public key; pubSize:size of public key
-	//	priKey&pubKey both in ASCII style of HEX. 0x123456FFAB  --> "123456FFAB"
-	//
-	virtual ErrorCodeEnum GetKeyPair(char *&priKey,int &priSize,char *&pubKey,int &pubSize) = 0;
-	//
-	//	Load private key to machine.
-	//
-	virtual ErrorCodeEnum LoadPrivateKey(const char *pKey,const int size) = 0;
-	//
-	//	Send random number to machine.
-	//	pRandomNum:random number(16 byte currently),in ASCII(32 byte of char)
-	//	pRamChk:first 16 byte of encrypted random number using SM3,in ASCII(32 byte of char)
-	//	pData:serial number(8 byte of char,ex:"14400001")
-	//
-	virtual ErrorCodeEnum SendRandomNum(const char *pRandomNum,const char *pRamChk,char *&pData) = 0;
-	//
-	//	Save working key to memory.
-	//	pWorkingKey:working key value,in ASCII style of HEX: 0x123456FFAB  --> "123456FFAB"
-	virtual ErrorCodeEnum SendWorkingKey(const char *pWorkingKey) = 0;
-	//
-	//	Get device serial number.
-	//	设备唯一标识，且需贴在设备外壳上
-	virtual ErrorCodeEnum GetDeviceSN(char *&pDevSN) = 0;
-	//	返回值Error_Succeed表示成功，其他值表示失败
-	//	iStatus   0:成功   -1:银行公钥不存在   -2:产生设备密钥故障  -x:其他厂商自定义故障
-	//	Cr1：随机数r1的密文； Cr3：随机数r3的密文，dKey：用银行公钥加密的设备公钥密文
-	//	r1，r3第16字节为数据完整性校验字节，例如r1为B1B2...B15B16,则B16=B1^B2^...^B15
-	virtual ErrorCodeEnum TransferEnInit(int &iStatus, BYTE *&Cr1, int &lenR1, BYTE *&Cr3, int &lenR3, BYTE *&dKey, int &lenKey) = 0;
-
-	//	返回值Error_Succeed表示成功，其他值表示失败
-	//	iStatus   0:成功   -x:厂商自定义故障
-	//	r2第16字节为数据完整性校验字节，例如r2为B1B2...B15B16,则B16=B1^B2^...^B15
-	virtual ErrorCodeEnum SetR2(int &iStatus, BYTE *pCr2, int lenR2) = 0;
-	//
-	//	查询设备是否掉线
-	//	bOn = 1表示设备在线，bOn = 0表示设备断开（掉线），返回Error_succeed
-	virtual ErrorCodeEnum IfDevOnline(int &bOn) = 0;
-	//
-	//	移动卡片，吐卡ePos取值为CI_MOVECARD_FRONT_GATE
-	//
-	virtual ErrorCodeEnum EjectCard(CardPosEnum ePos){return Error_Succeed;}
-	//	调用打开设备（蓝牙版）
-	//	1. btOpenType:设定通过哪种方式连接设备，由DevOpenType的枚举值组合。usb及蓝牙设备连接可忽略dwPort，dwBaudRate
-	//	2.通过pDevSN来指定连接对应设备号的蓝牙多合一
-	//		例如通过蓝牙或者usb连接设备，则btOpenType = (DEV_OPEN_TYPE_USB|DEV_OPEN_TYPE_BLUETOOTH)
-	//	3. btType返回设备实际通过哪种方式相连，返回值参考DevOpenType
-	virtual ErrorCodeEnum DevOpenEx(DWORD dwPort, DWORD dwBaudRate, BYTE btOpenType,const char *pDevSN, BYTE &btType){return Error_NotImpl;}
-	//	获取多合一剩余电量（蓝牙版）
-	//		--FWBStatus.BatteryLeft:剩余电量，取值为0~100
-	virtual ErrorCodeEnum GetBatteryStatus(FWBStatus &status){return Error_NotImpl;}
-};
-
-#endif //__CARD_SWIPER_CLASS_H

DevAdapter/simulator/cardswiper.1.1/CMakeLists.txt

@@ -1,47 +0,0 @@
-# 声明模块名称的前缀和名称
-rvc_dev_define_module("CardSwiper")
-
-# rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
-set(${MODULE_PREFIX}_VERSION "1")
-set(${MODULE_PREFIX}_BATCH "1")
-
-# 包含要编译的实现文件，rvc_dev_config_library 内使用
-set(${MODULE_PREFIX}_SRCS SHARED
-        cardswiper_impl.cpp
-        )
-
-# 适配器工程需要通过此宏替代 add_library
-rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
-
-#头文件地址
-target_include_directories(${MODULE_FULL_NAME} PRIVATE
-	${DevHeadPath}
-	${ModuleCommonHeadPath}
-	${RVC_FRAMEWORK_INCLUDES_DIR} 
-	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${OTHER_LIB_BASE_DIR}/liblog4vendor
-	${OTHER_LIB_BASE_DIR}/libRestfulFunc
-	${CONAN_INCLUDE_DIRS_JSONCPP}
-	${RVC_TOOLKIT_INCLUDE_DIR}
-)
-
-#库链接地址
-target_link_directories(${MODULE_FULL_NAME} PRIVATE
-    ${CONAN_LIB_DIRS_JSONCPP}
-	${RVC_FRAMEWORK_LIBRARIES_DIR}
-	${ThirdPartyLib}
-	${CONAN_RVCFRAMEWORK_ROOT}/lib
-)
-
-#需要链接的库
-set(${MODULE_PREFIX}_LIBS RestfulFunc ${CONAN_PKG_LIBS_JSONCPP} RVCComm ${VENDOR_LOG_LIB_NAME})
-if(MSVC)
-	list(APPEND ${MODULE_PREFIX}_LIBS Ws2_32 IPHLPAPI)
-endif(MSVC)
-target_link_libraries(
-	${MODULE_FULL_NAME} ${${MODULE_PREFIX}_LIBS} 
-)
-
-#  =-=-=-=-=-=-=-=-=-= {适配器工程}/CMakeLists.txt 文件最后必须声明如下内容=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=
-rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/simulator/cardswiper.1.1/cardswiper_impl.cpp

@@ -1,209 +0,0 @@
-//
-// Created by LocalUser on 2019/1/7.
-//
-
-#include "cardswiper_impl.h"
-#include <cstring>
-
-CardSwiperImpl::CardSwiperImpl()
-    :m_mode(0)
-{
-
-}
-
-CardSwiperImpl::~CardSwiperImpl()
-{
-
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDevCategory(DevCategoryInfo &devCategory)
-{
-
-    ErrorCodeEnum err = Error_Succeed;
-    std::strcpy(devCategory.szModel, "szModel");
-    std::strcpy(devCategory.szType, "szCategory");
-    std::strcpy(devCategory.szVendor, "szVendor");
-    return err;
-}
-
-ErrorCodeEnum CardSwiperImpl::Reset()
-{
-    ErrorCodeEnum err = Error_Unexpect;
-    m_mode = 0;
-    return err;
-}
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-ErrorCodeEnum CardSwiperImpl::DevOpen(int argNum, char* argArray)
-#else
-ErrorCodeEnum CardSwiperImpl::DevOpen(DWORD dwPort, DWORD dwBaudRate)
-#endif
-{
-    static int nums = 1;
-    ErrorCodeEnum err = Error_Succeed;
-    if (nums == 0)
-    {
-        err = Error_Unexpect;
-        nums = 1;
-    }
-    return err;
-}
-
-ErrorCodeEnum CardSwiperImpl::DevClose()
-{
-    ErrorCodeEnum err = Error_Succeed;
-    return err;
-}
-
-
-ErrorCodeEnum CardSwiperImpl::GetLastErr(DevErrorInfo &devErrInfo)
-{
-    return Error_Succeed;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDevStatus(CardSwiperStatus& devStatus)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::AbortRead()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::QueryCardStatus(const DWORD dwPos, int& iStatus, MagTracks& magTracks)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::MagRead(MagTracks& magTracks)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ActiveICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ContactIC()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ReleaseIC()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::DeactivateICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::DeactContactlessICCard()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::WarmReset()
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::ICCommand(CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetKeyPair(char*& priKey, int& priSize, char*& pubKey, int& pubSize)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::LoadPrivateKey(const char* pKey, const int size)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SendRandomNum(const char* pRandomNum, const char* pRamChk, char*& pData)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SendWorkingKey(const char* pWorkingKey)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::GetDeviceSN(char*& pDevSN)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey)
-{
-    return Error_NotImpl;
-}
-
-ErrorCodeEnum CardSwiperImpl::SetR2(int& iStatus, BYTE* pCr2, int lenR2)
-{
-    return Error_NotImpl;
-}
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-DEVICEBASE_API ErrorCodeEnum  CreateDevComponent(DWORD dwDevClassID, DeviceBaseClass*& pOutDevAptObj)
-#else
-DEVICEBASE_API ErrorCodeEnum  CreateDevComponent(DeviceBaseClass*& pOutDevAptObj)
-#endif
-{
-    pOutDevAptObj = new CardSwiperImpl();
-    if(pOutDevAptObj == NULL)
-    {
-        return Error_Resource;
-    }
-    return Error_Succeed;
-}
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-DEVICEBASE_API ErrorCodeEnum  ReleaseDevComponent(DWORD dwDevClassID, DeviceBaseClass*& pInDevAptObj)
-#else
-DEVICEBASE_API ErrorCodeEnum  ReleaseDevComponent(DeviceBaseClass*& pInDevAptObj)
-#endif
-{
-    if(pInDevAptObj == NULL)
-    {
-        return Error_Param;
-    }
-    if(CardSwiperImpl* pTmp = dynamic_cast<CardSwiperImpl*>(pInDevAptObj))
-    {
-        delete pTmp;
-        pTmp = NULL;
-        return Error_Succeed;
-    }
-    return Error_Param;
-}
-
-#ifdef NEWER_COMPILER_WORKAROUNDS
-
-DEVICEBASE_API ErrorCodeEnum  GetDevAdapterVersion(DevSoftVersion& retVesion)
-{
-    retVesion.wMajor = retVesion.wMinor = retVesion.wBuild = retVesion.wRevision = 0;
-    return Error_Succeed;
-}
-
-#endif // NEWER_COMPILER_WORKAROUNDS

DevAdapter/simulator/cardswiper.1.1/cardswiper_impl.h

@@ -1,58 +0,0 @@
-//
-// Created by LocalUser on 2019/1/7.
-//
-
-#ifndef LIBFRAMEWORK_CARDSWIPER_IMPL_H
-#define LIBFRAMEWORK_CARDSWIPER_IMPL_H
-
-#include "CardSwiperClass.h"
-
-class CardSwiperImpl : public CardSwiperClass
-{
-public:
-    CardSwiperImpl();
-    ~CardSwiperImpl();
-
-#if DEVICE_BASE_INTERFACE_FILE_VERSION == 2
-	ErrorCodeEnum DevOpen(int argNum, char* argArray);
-#else
-	ErrorCodeEnum DevOpen(DWORD dwPort, DWORD dwBaudRate);
-#endif
-
-    //DeviceBaseClass
-    ErrorCodeEnum GetDevCategory(DevCategoryInfo &devCategory);
-    ErrorCodeEnum Reset();
-    ErrorCodeEnum DevClose();
-    ErrorCodeEnum GetLastErr(DevErrorInfo &devErrInfo);
-
-    //CardSwiperClass
-    virtual ErrorCodeEnum GetDevStatus(CardSwiperStatus& devStatus);
-    virtual ErrorCodeEnum AbortRead();
-    virtual ErrorCodeEnum QueryCardStatus(const DWORD dwPos, int& iStatus, MagTracks& magTracks);
-	virtual ErrorCodeEnum MagRead(MagTracks& magTracks);
-	virtual ErrorCodeEnum ActiveICCard();
-	virtual ErrorCodeEnum ActiveContactlessICCard(char fstType, char scdType, char thdType, char& outType);
-	virtual ErrorCodeEnum ContactIC();
-	virtual ErrorCodeEnum ReleaseIC();
-	virtual ErrorCodeEnum DeactivateICCard();
-	virtual ErrorCodeEnum DeactContactlessICCard();
-	virtual ErrorCodeEnum WarmReset();
-	virtual ErrorCodeEnum ICCommand(CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum RFTypeABCommand(CmdInfo sendBuf, CmdInfo& recvBuf);
-	virtual ErrorCodeEnum GetKeyPair(char*& priKey, int& priSize, char*& pubKey, int& pubSize);
-	virtual ErrorCodeEnum LoadPrivateKey(const char* pKey, const int size);
-	virtual ErrorCodeEnum SendRandomNum(const char* pRandomNum, const char* pRamChk, char*& pData);
-	virtual ErrorCodeEnum SendWorkingKey(const char* pWorkingKey);
-	virtual ErrorCodeEnum GetDeviceSN(char*& pDevSN);
-	virtual ErrorCodeEnum TransferEnInit(int& iStatus, BYTE*& Cr1, int& lenR1, BYTE*& Cr3, int& lenR3, BYTE*& dKey, int& lenKey);
-	virtual ErrorCodeEnum SetR2(int& iStatus, BYTE* pCr2, int lenR2);
-	virtual ErrorCodeEnum IfDevOnline(int& bOn) { bOn = 1; return Error_Succeed; }
-	virtual ErrorCodeEnum EjectCard(CardPosEnum ePos) { return Error_Succeed; }
-
-protected:
-	int m_mode;
-};
-
-
-#endif //LIBFRAMEWORK_CARDSWIPER_IMPL_H

Framework/spshell/Widgets/mainwindow.cpp

@@ -1164,9 +1164,7 @@ void MainWindow::Test_EntityList()
     AddEntityEntry(EntityInfo{ "HelloService", Manual, Busy, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "PortbleScanner", Manual, Pause, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "HealthManager", Manual, UnLoading, 123, "V1.2.3" });
-    AddEntityEntry(EntityInfo{ "SelfChecker", Manual, Lost, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "MediaController", Manual, Close, 123, "V1.2.3" });
-    AddEntityEntry(EntityInfo{ "CardSwiper", Manual, Passed, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "GPIO", Manual, Killed, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "CardIssuer", Manual, Passed, 123, "V1.2.3" });
     AddEntityEntry(EntityInfo{ "DeviceSwitch", Manual, Failed, 123, "V1.2.3" });

Module/include/DevFSMCommBase.hpp

@@ -58,9 +58,6 @@ do {\
 #define LOG_CARDISSUER_ERROR_MSG_MACRO(errCode, MethodSig)\
 	LOG_ERROR_MSG_MACRO(errCode, MethodSig, CARDISSUER)
 
-#define LOG_CARDSWIPER_ERROR_MSG_MACRO(errCode, MethodSig)\
-	LOG_ERROR_MSG_MACRO(errCode, MethodSig, CARDSWIPER)
-
 #define LOG_THERMALPRINT_ERROR_MSG_MACRO(errCode, MethodSig)\
 	LOG_ERROR_MSG_MACRO(errCode, MethodSig, THERMALPRINT)
 
@@ -696,26 +693,20 @@ public:
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStand", 0x2030021f));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStore", 0x2200021f));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("ContactlessCard", 0x21300203));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardSwiper", 0x20200207));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("FingerPrint", 0x20400211));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("IDCertificate", 0x20100202));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("PinPad", 0x20600207));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("Gpio", 0x20900201));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("HSPScanner", 0x21700207));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("WatchDog", 0x20d00201));
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("Ups", 0x20e00201));
 
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStand", 0x20300299));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStore", 0x22000299));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("ContactlessCard", 0x21300224));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardSwiper", 0x20200238));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("FingerPrint", 0x20400229));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("IDCertificate", 0x2010021f));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("PinPad", 0x2060021f));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("Gpio", 0x20900203));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("HSPScanner", 0x2170020f));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("WatchDog", 0x20d00204));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("Ups", 0x20e00204));
 	}
 
 	ErrorCodeEnum GetAndSplitDevErrInfo(

Module/include/EventCode.h

@@ -395,121 +395,6 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 
 /*----End--UpgradeRun-------------------------------*/
 
-/*----Initializer--modify--by--LZM--at--2020/4/8----*/
-#define EVENT_MOD_INITIALIZER_MK_LOADED              0x50900001  //主密钥初始化成功
-#define EVENT_MOD_INITIALIZER_LOGIN_BY_GUICONSOLE    0x50900002  //从Guiconsole登录
-#define EVENT_MOD_INITIALIZER_LOGIN_BY_USERDESKTOP   0x50900003  //从用户桌面登录
-
-#define EVENT_MOD_INITIALIZER_MK_FAILED              0x50980002  //主密钥初始化失败
-#define ERROR_INITIALIZER_GETSTATICINFO              0x50980003  //获取配置信息失败
-#define ERROR_INITIALIZER_INITKMC                    0x50980004  //初始化KMC失败
-#define ERROR_INITIALIZER_CREATEINITMKREQ            0x50980005  //创建主密钥请求失败
-#define ERROR_INITIALIZER_PARSEINITMKRES             0x50980006  //解析主密钥响应失败
-#define ERROR_INITIALIZER_OPENCENTERSETTING          0x50980007  //打开集中配置失败
-#define ERROR_INITIALIZER_READCENTERSETTING          0x50980008  //读取集中配置失败
-
-#define ERROR_INITIALIZER_CREATEINITMKDATA           0x50980009  //创建主密钥初始化数据失败
-#define ERROR_INITIALIZER_GETDEVICES                 0x5098001a  //获取硬件信息失败
-#define ERROR_INITIALIZER_FINGERPINT                 0x5098001b  //获取指纹失败
-#define ERROR_INITIALIZER_GETPUBKEY                  0x5098001c  //获取公钥失败
-
-#define ERROR_INITIALIZER_INITCARDSWIPER             0x5098001d  //初始化刷卡器失败
-#define ERROR_INITIALIZER_SYNCPUBKEY                 0x5098001e  //同步公钥文件失败
-#define ERROR_INITIALIZER_SUBSCRIBEEVENT             0x50980020  //订阅事件失败
-
-#define ERR_INITIALIZER_SUBSCRIBE                    0x50910001  //订阅错误
-#define ERR_INITIALIZER_AUTH_SERVER                  0x50910002  //访问初始化以及准入服务错误,socket连接网络问题
-#define ERR_INITIALIZER_NET_CONNECT                  0x50910003  //网络连接错误，从集中配置连接失败
-#define ERR_INITIALIZER_GET_EKEY_FLG                 0x50910004  //获取SupportUkey错误
-#define ERR_INITIALIZER_GET_SYSTEM_STATIC_INFO       0x50910005  //获取系统静态信息错误
-#define ERR_INITIALIZER_READ_WRITE_FILE              0x50910006  //读写文件错误
-#define ERR_INITIALIZER_GET_TERMINAL_FINGERPRINT     0x50910007  //获取终端指纹错误
-#define ERR_INITIALIZER_UNKOWN                       0x50910008  //初始化（服务码）未知错误
-
-#define ERR_INITIALIZER_CONNECT_MAINTAINWATCHER					 0x50920001  //连接maintainwatcher错误
-#define ERR_INITIALIZER_FROM_MAINTAINWATCHER_GETUSERINFO         0x50920002  //来自maintainwatcher的调用错误(GetUserInfo)
-#define ERR_INITIALIZER_CONNECT_PINPAD							 0x50920003  //连接PinPad错误
-#define ERR_INITIALIZER_FROM_PINPAD								 0x50920004  //来自PinPad的调用错误
-#define ERR_INITIALIZER_CONNECT_CARDSWIPER						 0x50920005  //连接Cardswiper错误
-#define ERR_INITIALIZER_FROM_CARDSWIPER							 0x50920006  //来自Cardswiper的调用错误
-#define ERR_INITIALIZER_FROM_PINPAD_QUERY_FUNC				     0x50920007  //来自PinPad的调用错误(QueryFunc)
-#define ERR_INITIALIZER_FROM_PINPAD_GET_DEV_INFO				 0x50920008  //来自PinPad的调用错误(GetDevInfo)
-#define ERR_INITIALIZER_FROM_PINPAD_NO_STATE					 0x50920009  //pinpad的状态不正常
-#define ERR_INITIALIZER_FROM_CARDSWIPER_TRASF_INIT				 0x5092000a  //来自Cardswiper的调用错误(MagTransferInit)
-#define ERR_INITIALIZER_FROM_CARDSWIPER_NO_RET					 0x5092000b  //初始化cardswiper失败（返回值不正确）
-
-#define ERR_INITIALIZER_LOGIN						 0x50930001  //登录错误，具体错误码体现具体失败原因
-#define ERR_INITIALIZER_REPORT_STATE                 0x50930002  //上报状态错误
-#define ERR_INITIALIZER_SYNC_PUBKEY                  0x50930003  //同步公钥错误
-#define ERR_INITIALIZER_INIT_MK                      0x50930004  //初始化MK错误
-#define ERR_INITIALIZER_EXIT						 0x50930005  //退出错误
-
-#define ERR_INITIALIZER_GET_FILE_HASH                0x50940001  //获取文件Hash值错误
-#define ERR_INITIALIZER_GET_STR_HASH                 0x50940002  //获取字符串Hash值错误
-#define ERR_INITIALIZER_CHECK_HASH                   0x50940003  //比较，校验文件Hash值错误
-#define ERR_INITIALIZER_PUBKEY_FILE                  0x50940004  //公钥文件错误
-#define ERR_INITIALIZER_GET_TERMINAL_PUBKEY          0x50940005  //获取终端公钥错误
-#define ERR_INITIALIZER_PUBKEY_FILE_NO_EXIST         0x50940006  //公钥文件不存在
-#define ERR_INITIALIZER_LOAD_KEYS_TO_PINPAD          0x50940007  //加载密钥至PinPad错误
-#define ERR_INITIALIZER_MD5_HASH                     0x50940008  //MD5 hash错误
-
-#define ERR_INITIALIZER_INIT_KMC                     0x50950001  //调用KMC接口初始化KMC错误
-#define ERR_INITIALIZER_CREATE_INIT_MK               0x50950002  //调用KMC接口创建初始化MK错误
-#define ERR_INITIALIZER_PARSE_INIT_MK                0x50950003  //调用KMC接口分析初始化MK错误
-#define ERR_INITIALIZER_GET_PROCCESSOR_ID            0x50950004  //获取CPU ID错误
-#define ERR_INITIALIZER_GET_BASEBOARD_ID             0x50950005  //获取主板ID错误
-#define ERR_INITIALIZER_GET_DISKDRIVE_ID             0x50950006  //获取硬盘ID错误
-#define ERR_INITIALIZER_RVC_GET_KEY                  0x50950007  //调用KMC接口RvcGetKey错误
-#define ERR_INITIALIZER_GET_KEY                      0x50950008  //调用KMC接口GetKey错误
-
-#define ERR_INITIALIZER_FAILED                       0x50960001  //初始化失败
-#define ERR_INITIALIZER_LOGIN_SEND_PKG				 0x50960002  //初始化发送登录包失败
-#define ERR_INITIALIZER_LOGIN_TIME_OUT				 0x50960003  //初始化登录超时
-
-#define ERR_INITIALIZER_SYNC_PUBKEY_TIME_OUT		 0x50960004  //初始化同步公钥超时
-#define ERR_INITIALIZER_SYNC_PUBKEY_SEND_PKG         0x50960005  //发送同步公钥数据包错误
-#define ERR_INITIALIZER_SYNC_PUBKEY_RSA_BUF_NO_EXIST 0x50960006  //找不到RSA公钥缓存
-#define ERR_INITIALIZER_SYNC_PUBKEY_SM2_BUF_NO_EXIST 0x50960007  //找不到SM2公钥缓存
-#define ERR_INITIALIZER_SYNC_PUBKEY_RSA_FIL_NO_EXIST 0x50960008  //找不到RSA公钥文件
-#define ERR_INITIALIZER_SYNC_PUBKEY_SM2_FIL_NO_EXIST 0x50960009  //找不到SM2公钥文件
-#define ERR_INITIALIZER_INIT_MK_TIME_OUT			 0x5096000a  //初始化密钥超时
-#define ERR_INITIALIZER_INIT_MK_SEND_PKG		     0x5096000b  //初始化发送初始化包失败
-/*国产化新增开始*/
-#define ERR_INITIALIZER_GET_KMC_KEY_SEND_PKG		 0x5096000c  //初始化发送获取KMC密钥包失败
-#define ERR_INITIALIZER_GET_KMC_KEY_TIME_OUT		 0x5096000a  //获取KMC密钥超时
-#define ERR_INITIALIZER_GET_KMC_KEY_NULL             0x5096000b  //获取KMC密钥失败
-/*国产化新增结束*/
-#define ERR_INITIALIZER_DATA_COLLECT                 0x50970000  //初始化数据上收
-//分行服务返回的错误以9为类别
-#define ERR_INITIALIZER_LOGIN_TERMINAL_NO_EXIST		 0x50990001  //初始化登录时查询终端号不存在
-#define ERR_INITIALIZER_LOGIN_FROM_MICRO_SERVER      0x50990002  //初始化登录时总微服务查询错误
-#define ERR_INITIALIZER_LOGIN_CHECK_POST_AND_TASK	 0x50990003	 //初始化登录时查询岗位和任务抛出异常
-#define ERR_INITIALIZER_LOGIN_NO_HAVE_TASK           0x50990004  //没有查询到在线任务，登录失败
-#define ERR_INITIALIZER_INIT_INVALID_REQ_PKG		 0x50990005  //无效的请求包，可能是终端号为空，或其它重要信息为空不正确  
-#define ERR_INITIALIZER_INIT_UPDATE_EXTEND			 0x50990007  //向总行服务更新extend表失败
-#define ERR_INITIALIZER_INIT_UPDATE_STAGE			 0x50990008  //向总行服务更新stage表失败
-#define ERR_INITIALIZER_INIT_UPDATE_DEVICES			 0x50990009  //向总行服务更新devices表失败
-#define ERR_INITIALIZER_INIT_GET_REGIST				 0x5099000a  //向总行服务获取regist表失败
-#define ERR_INITIALIZER_INIT_GET_EXTEND				 0x5099000b  //向总行服务获取extend表失败
-#define ERR_INITIALIZER_INIT_GET_STAGE				 0x5099000c  //向总行服务获取stage表失败
-#define ERR_INITIALIZER_INIT_GET_DEVICES			 0x5099000d  //向总行服务获取devices表失败
-#define ERR_INITIALIZER_INIT_IP_NO_MATCH			 0x5099000e  //IP地址不匹配
-#define ERR_INITIALIZER_INIT_MACHINE_TYPE_NO_MATCH   0x5099000f	 //机器类型不匹配
-#define ERR_INITIALIZER_INIT_SITE_NO_MATCH			 0x50990010  //场所不匹配
-#define ERR_INITIALIZER_INIT_PINPAD_ID_NO_MATCH				    0x50990011  //密码键盘ID不匹配
-#define ERR_INITIALIZER_INIT_PAD_DEVICE_ID_NO_MATCH			    0x50990012  //设备ID不匹配
-#define ERR_INITIALIZER_INIT_FINGERPRINT_NO_MATCH				0x50990013  //终端指纹信息不匹配
-#define ERR_INITIALIZER_INIT_PINPADID_BIND_ANOTHER_TERMINALNO   0x50990014  //密码键盘ID绑定了另外一台终端
-#define ERR_INITIALIZER_INIT_EXCEPTION       					0x50990015  //初始化抛出异常
-#define ERR_INITIALIZER_INIT_KMC_DES_TMK						0x50990016  //初始化DES TMK失败
-#define ERR_INITIALIZER_INIT_KMC_SM_TMK							0x50990017  //初始化SM TMK失败
-#define ERR_INITIALIZER_CONN_STR_IS_NULL                        0x50990018  //数据库连接字符串为空
-#define ERR_INITIALIZER_EXEC_PTR                                0x50990019  //数据库存储过程执行失败
-/*国产化新增开始*/
-#define ERR_INITIALIZER_GEN_KMC_KEY								0x5099001a  //产生KMC密钥失败
-/*国产化新增结束*/
-/*----End--Initializer------------------------------*/
-
 #define IDCertificate_Public_Start                  	0x20190000
 #define LOG_EVT_IDCERTIFICATE_GREEN_ON					(IDCertificate_Public_Start + 1)
 #define LOG_EVT_IDCERTIFICATE_GREEN_OFF					(IDCertificate_Public_Start + 2)
@@ -517,27 +402,6 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define LOG_EVT_IDCERTIFICATE_RED_OFF					(IDCertificate_Public_Start + 4)
 #define	LOG_EVT_IDCERTIFICATE_OP						(IDCertificate_Public_Start + 5)
 
-
-#define CardSwiper_Public_Start                  		0x20290000
-#define LOG_EVT_CARDREADER_GREEN_ON						(CardSwiper_Public_Start + 1)
-#define LOG_EVT_CARDREADER_GREEN_OFF					(CardSwiper_Public_Start + 2)
-#define LOG_EVT_CARDREADER_RED_ON						(CardSwiper_Public_Start + 3)
-#define LOG_EVT_CARDREADER_RED_OFF						(CardSwiper_Public_Start + 4)
-#define LOG_ERR_CARDSWIPER_BUILT_CHANNELV1_FAILED		(CardSwiper_Public_Start + 5)//传输加密通道V1建立失败
-#define LOG_ERR_CARDSWIPER_BUILT_CHANNELV2_FAILED		(CardSwiper_Public_Start + 6)//传输加密通道V2建立失败
-#define	LOG_EVT_CARDREADER_OP							(CardSwiper_Public_Start + 7)
-#define	LOG_EVT_CARDREADER_OPEN_SUC_FWB					(CardSwiper_Public_Start + 8)
-//FWB
-#define LOG_EVT_CARDSWIPER_CARDSWIPER_RESTART			(CardSwiper_Public_Start + 9)
-#define LOG_EVT_CARDSWIPER_PINPAD_RESTART				(CardSwiper_Public_Start + 10)
-#define LOG_EVT_CARDSWIPER_IDCERTIFICATE_RESTART		(CardSwiper_Public_Start + 11)
-#define LOG_EVT_CARDSWIPER_DEVICECONTROL_RESTART		(CardSwiper_Public_Start + 12)
-#define LOG_EVT_CARDSWIPER_SENSORS_RESTART				(CardSwiper_Public_Start + 13)
-#define LOG_EVT_CARDSWIPER_FINGERPRINT_RESTART			(CardSwiper_Public_Start + 14)
-#define LOG_EVT_BATTERY_LEFT							(CardSwiper_Public_Start + 15)//多合一外设电量剩余
-#define LOG_EVT_CARDSWIPER_DISCONNECTED					(CardSwiper_Public_Start + 16)//多合一断开
-
-
 #define CardIssuer_Public_Start                  		0x20390000
 #define LOG_EVT_CARDISSUER_GREEN_ON 					(CardIssuer_Public_Start + 1)
 #define LOG_EVT_CARDISSUER_GREEN_OFF 					(CardIssuer_Public_Start + 2)
@@ -578,8 +442,6 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define LOG_EVT_PINPAD_CK_ZERO		            0x2069000D
 #define LOG_EVT_PINPAD_SM_SN_REFRESH		0x2069000E
 
-//#define LOG_EVT_CARDSWIPER_RESTART	0x20700001
-//#define LOG_ERR_CARDSWIPER_FAILED	0x20780001
 
 #define LOG_EVT_HEADLIGHT_GREEN_ON 0x30800001
 #define LOG_EVT_HEADLIGHT_GREEN_OFF 0x30800002

Module/include/ModuleMix.h

@@ -3,88 +3,6 @@
 
 #pragma once
 
-enum UserDefEntityState
-{
-	USER_ENTITY_STATE_START = 0,
-	USER_CARDISSUER_IDLE,
-	USER_CARDISSUER_HOLD,
-	USER_CARDISSUER_READING,
-	USER_CARDISSUER_WAITFETCHING,
-	USER_CARDISSUER_FAILED,
-	USER_CARDSWIPER_IDLE,
-	USER_CARDSWIPER_HOLD,
-	USER_CARDSWIPER_READING,
-	USER_CARDSWIPER_WAITFETCHING,
-	USER_CARDSWIPER_MAGDATA_TRANS_INIT,
-	USER_CARDSWIPER_FAILED,
-	USER_CONTACTLESSCARD_IDLE,
-	USER_CONTACTLESSCARD_HOLD,
-	USER_CONTACTLESSCARD_READING,
-	USER_CONTACTLESSCARD_WAITFETCHING,
-	USER_CONTACTLESSCARD_FAILED,
-	USER_IDCERTIFICATE_IDLE,
-	USER_IDCERTIFICATE_READING,
-	USER_IDCERTIFICATE_FAILED,
-	USER_PINPAD_IDLE,
-	USER_PINPAD_PININPUT,
-	USER_PINPAD_PARAM_ENCRYPTE,
-	USER_PINPAD_FAILED,
-	USER_PINPAD_FAILED_RECOVERING,
-	USER_MEDIA_IDLE,
-	USER_MEDIA_ENVERRROR,
-	USER_MEDIA_OPTERROR,
-	USER_MEDIA_ALLERROR,
-	USER_SIP_OFFLINE,	
-	USER_SIP_CONNECTING,	
-	USER_SIP_HANDFREE,	
-	USER_SIP_PICKUP,	
-	USER_SIP_BROKEN,	
-	USER_SIP_FAIL,	
-	USER_SIP_RELEASING,	
-	USER_SURVEILLANCE_IDLE,
-	USER_SURVEILLANCE_EWSERROR,
-	USER_ENTITY_STATE_END
-};
-static char *UserDefEntityMsg[USER_ENTITY_STATE_END][1] =
-{
-	"",
-	"发卡机--空闲",
-	"发卡机--持卡",
-	"发卡机--读卡中",
-	"发卡机--等待客户取卡",
-	"发卡机--故障",
-	"刷卡机--空闲",
-	"刷卡机--持卡",
-	"刷卡机--读卡中",
-	"刷卡机--等待客户取卡",
-	"刷卡机--加密传输初始化",
-	"刷卡机--故障",
-	"非接卡机--空闲",
-	"非接卡机--持卡",
-	"非接卡机--读卡中",
-	"非接卡机--等待客户取卡",
-	"非接卡机--故障",
-	"二代证阅读器--空闲",
-	"二代证阅读器--读取中",
-	"二代证阅读器--故障",
-	"密码键盘--空闲",
-	"密码键盘--密码输入中",
-	"密码键盘--参数设置加密中",
-	"密码键盘--故障",
-	"密码键盘--故障恢复中",
-	"摄像头正常",
-	"上摄像头故障",
-	"下摄像头故障",
-	"摄像头全部故障",
-	"离线",
-	"正在连接",
-	"免提通话",
-	"话筒通话",
-	"话机故障",
-	"连线失败",
-	"话机注销"
-};
-
 /*MediaController有用到*/
 enum CapTypeEnum
 {

addin/cfg/shell.ini.in

@@ -21,7 +21,7 @@ HolderContext=0,@LIB_PREFIX@mod_HolderContext@LIB_SUFFIX@,0x315
 UpLog=0,@LIB_PREFIX@mod_uplog@LIB_SUFFIX@,0x10D
 
 IDCertificate=0,@LIB_PREFIX@mod_IDCertificate@LIB_SUFFIX@,0x201
-CardSwiper=0,@LIB_PREFIX@mod_CardSwiper@LIB_SUFFIX@,0x202
+;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
 ;Printer=0,@LIB_PREFIX@mod_printer@LIB_SUFFIX@,0x205
@@ -120,10 +120,6 @@ FirstLaunchSinceSysBoot=ResourceWatcher,"N"
 UpdateState=UpgradeManager,"0"
 WKSyncSuccTime=AccessAuthorization,""
 WKSyncFailCount=AccessAuthorization,"0"
-FWBVendor=CardSwiper,""
-FWBDevSN=CardSwiper,""
-FWBVersion=CardSwiper,""
-FWBReConn=CardSwiper,""
 NetState=HealthManager,"N"
 zssInfo=ContactlessCard,"ZSS"
 kxdInfo=IDCertificate,"KXD"