feat<etadeclient>:替换硬件接口

替换原有硬件接口，采用新接口，支持so库的版本。

feat<etadeclient>:替换硬件接口
替换原有硬件接口，采用新接口，支持so库的版本。
liuye
1 parent 0344002f
Showing 5 changed files with 104 additions and 19 deletions
etrade_card_client/Config/application_config.json
etrade_card_client/ETradeClient.vcxproj
etrade_card_client/ETradeClient/hardware/DLCardManager.h
etrade_card_client/ETradeClient/hardware/dili_card_device.cpp
etrade_card_client/ETradeClient/mfc_ui/ConfigDialog.cpp
@@ -9,7 +9,7 @@
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
 	"client_cert_password": "",
-	"security_level": 2,
+	"security_level": 0,
 	"encrypt_type": 1,
 	"id_reader": 1
 }
 \ No newline at end of file
@@ -45,6 +45,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <LibraryPath>$(ProjectDir)\ExLib\hardware\id_card_reader;$(ProjectDir)\ExLib\hardware\dili_card_device;D:\GitProject\etradeclient\etrade_card_client;$(LibraryPath)</LibraryPath>
+    <LibraryWPath>$(LibraryWPath)</LibraryWPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+//  作者：刘野
+//  卡片硬件操作库导出接口。
+//  包含dll导出接口和so库导出接口
+
 #ifndef DL_CARD_MANAGER_H
 #define DL_CARD_MANAGER_H
 #define DL_DLL_API extern "C" __declspec(dllexport) 
-DL_DLL_API int __stdcall ConnectDLDevice();
-DL_DLL_API int __stdcall FindDLCard();
-DL_DLL_API int __stdcall AuthenticationDLKey(unsigned char* pKey);
-DL_DLL_API int __stdcall ReadDLCardData(unsigned char* pDirID, unsigned char cFileID, short u16Offset, int u32DateLen, unsigned char* pData, unsigned char* pKey = 0);
-DL_DLL_API int __stdcall WriteDLCardData(unsigned char* pDirID, unsigned char cFileID, unsigned char cOffset, unsigned short cDateLen, unsigned char* pData, unsigned char* pKey);
-DL_DLL_API int __stdcall InstallDLKey(unsigned char* pDirID, unsigned char cKeyID, unsigned char* pNewKey, int iKeyType, unsigned char* pMainKey);
-DL_DLL_API int __stdcall DisconnectDLDevice();
-#endif
 \ No newline at end of file
+/* 连接读卡器 */
+DL_DLL_API int __stdcall DLCConnectDevice();
+
+/* 关闭读卡器 */
+DL_DLL_API int __stdcall DLCDisconnectDevice();
+
+/* 寻卡 */
+DL_DLL_API int __stdcall DLCFindCard();
+
+/* 
+ * 验证秘钥
+ * 输入16字节秘钥key_。
+ * 返回值返回结果
+ * */
+DL_DLL_API int __stdcall DLCAuthenticationKey(const unsigned char* dir, const unsigned char key_id, const unsigned char* key);
+
+/* 
+ * 读取数据 
+ * 输入dir2字节目录标识、file_id1字节文件标识、read_offset2字节、
+ * data_len2字节、read_key16字节读秘钥（没有置空）和read_data（长度依据读取长度而定）。
+ * 输出结果填入read_data。
+ * */
+DL_DLL_API int __stdcall DLCReadCardData(const unsigned char* dir, const unsigned char file_id, const unsigned int data_offset, const unsigned int data_len, const unsigned char* read_key, unsigned char* read_data);
+
+/*
+* 写入数据
+* 输入dir2字节目录标识、file_id2字节文件标识、read_offset2字节、
+* data_len2字节、read_key16字节读秘钥（没有置空）和read_data（长度依据读取长度而定）。
+* 输出结果填入read_data。
+* */
+DL_DLL_API int __stdcall DLCWriteCardData(const unsigned char* dir, const unsigned char file_id, const unsigned int data_offset, const unsigned int data_len, const unsigned char* write_key, const unsigned char* write_data);
+
+/*
+ * 安装/更新秘钥
+ * 输入dir2字节目录标识、key_id1字节文件标识、key_type32位秘钥类型、
+ * main_key16字节主控秘钥（没有置空）、new_key16字节新秘钥。
+ **/
+DL_DLL_API int __stdcall DLCInstallKey(const unsigned char* dir, const unsigned char key_id, const int key_type, const unsigned char* main_key, const unsigned char* new_key);
+
+/*
+ * 建立文件
+ * 输入parent_dir2字节父目录、parent_key2字节父目录主控秘钥、file_name2字节文件标识、
+ * file_size2字节文件大小、safe_type4字节安全类型和file_type4字节文件类型
+ **/
+DL_DLL_API int __stdcall DLCCreateFile(const unsigned char* parent_dir, const unsigned char* parent_key, const unsigned char* file_name, const unsigned char* file_size, const int file_type);
+
+
+DL_DLL_API int __stdcall DLCSelectFile(const unsigned char* dir);
+
+//SO库API
+// 
+/* 
+ * 该函数用以获取8字节随机数
+ * 输入5字节的无符号字符型数组指针，函数将更改数组内容，输出5字节指令。
+ * 返回值返回错误码。
+ */
+int __stdcall DLCSOGetRandom(unsigned char* get_randam_cmd);
+
+/* 
+ * 该函数用于验证秘钥。
+ * 输入key_id1字节秘钥标识、key16字节16进制秘钥值和random8字节16进制随机数，返回cmd13字节16进制指令。
+ * 返回值返回结果。
+ */
+int __stdcall DLCSOAuthenticationKey(const unsigned char key_id, const unsigned char* key, const unsigned char* random, unsigned char* cmd);
+
+/*
+ * 该函数用于读取数据。
+ * 输入data_offfset数据初始偏移，data_offfset最大为ffff，data_len数据长度，data_len最大为ff，返回16进制cmd指令，cmd数组长度 = data_len + 5。
+ * 读出的数据将存在data_中。
+ * 返回值返回错误码。
+ */
+int __stdcall DLCSOReadData(const unsigned int data_offfset, const unsigned int data_len, unsigned char* cmd);
+
+/*
+* 该函数用于写入数据。
+* 输入write_key字节16进制读秘钥（没有置空）、random8字节16进制随机数(没有置空)、data_offfset2字节数据初始偏移、data_len2字节数据长度和data16进制数据，cmd数组长度 = data_len + 9。
+* 返回值返回错误码。
+*/
+int __stdcall DLCSOWriteData(const unsigned char* write_key, const unsigned char* random, const unsigned int data_offfset, const unsigned int data_len, const unsigned char* data, unsigned char* cmd);
+
+
+/*该函数用于选择目录
+ *输入dir两字节16进制目录标识，返回cmd7字节16进制指令
+ **/
+int __stdcall DLCSOSelectDir(const unsigned char* dir, unsigned char* cmd);
+
+#endif //end DL_CARD_MANAGER_H
 \ No newline at end of file
@@ -113,7 +113,7 @@ namespace DILICard
 	{
 		bool bResult = true;
-		int iResult = ConnectDLDevice();
+		int iResult = DLCConnectDevice();
 		if (0 != iResult)
 		{
 			bResult = false;
@@ -124,7 +124,7 @@ namespace DILICard
 	}
 	void RWDevice::Disconnect() const
 	{
-		DisconnectDLDevice();
+		DLCDisconnectDevice();
 	}
 	void RWDevice::Beep(uint32_t time) const
 	{
@@ -134,7 +134,7 @@ namespace DILICard
 	{
 		bool bResult = true;
-		int iResult = FindDLCard();
+		int iResult = DLCFindCard();
 		if (0 != iResult)
 		{
 			bResult = false;
@@ -457,11 +457,11 @@ namespace DILICard
 		if (NULL != key_id)
 		{
 			memcpy(aucKey, key.c_str(), 32);
-			iResult = ReadDLCardData(aucDir, file_id, offset, length, aucData, aucKey);
+			iResult = DLCReadCardData(aucDir, file_id, offset, length, aucData, aucKey);
 		}
 		else
 		{
-			iResult = ReadDLCardData(aucDir, file_id, offset, length, aucData);
+			iResult = DLCReadCardData(aucDir, file_id, offset, length, NULL, aucData);
 		}
@@ -499,7 +499,7 @@ namespace DILICard
 			{
 				unsigned char aucDataBlock[DATA_MAX_LEN] = { 0 };
 				memcpy(aucDataBlock, data.substr(iStartIndex, DATA_MAX_LEN).c_str(), DATA_MAX_LEN);
-				iResult = WriteDLCardData(aucDir, file_id, iOffset, DATA_MAX_LEN, aucDataBlock, aucKey);
+				iResult = DLCWriteCardData(aucDir, file_id, iOffset, DATA_MAX_LEN, aucKey, aucDataBlock);
 				if (0 != iResult)
 				{
 					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
@@ -514,7 +514,7 @@ namespace DILICard
 			{
 				unsigned char aucData[DATA_MAX_LEN] = { 0 };
 				memcpy(aucData, data.substr(iStartIndex, iDataLength).c_str(), iDataLength);
-				iResult = WriteDLCardData(aucDir, file_id, iOffset, iDataLength, aucData, aucKey);
+				iResult = DLCWriteCardData(aucDir, file_id, iOffset, iDataLength, aucKey, aucData);
 				if (0 != iResult)
 				{
 					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
@@ -536,7 +536,7 @@ namespace DILICard
 		memcpy(aucDir, dir.c_str(), 4);
 		memcpy(aucMainKey, main_key.c_str(), 32);
 		memcpy(aucNewKey, install_key.c_str(), 32);
-		int iResult = InstallDLKey(aucDir, key_id, aucNewKey, emKeyType, aucMainKey);
+		int iResult = DLCInstallKey(aucDir, key_id, emKeyType, aucMainKey, aucNewKey);
 		if (0 != iResult)
 		{
 			err_msg << "Update key failed, key to be updated: " << install_key << ", ErrorCode: " << iResult;
@@ -549,7 +549,7 @@ namespace DILICard
 		bool bResult = true;
 		unsigned char aucKey[32] = { 0 };
 		memcpy(aucKey, sKey.c_str(), 32);
-		int iResult = AuthenticationDLKey(aucKey);
+		int iResult = DLCAuthenticationKey((const unsigned char*)"3f00", 0, aucKey);
 		if (iResult)
 		{
 			bResult = false;
@@ -53,7 +53,7 @@ void CConfigDialog::DoDataExchange(CDataExchange* pDX)
 	DDV_MinMaxInt(pDX, m_pin_pad_pwd_len, kMinPwdLen, kMaxPwdLen);
 	DDX_Text(pDX, IDC_EDIT_PIN_PAD_TIMEOUT, m_pin_pad_timeout);
-	DDV_MinMaxInt(pDX, m_pin_pad_timeout, kMinTimeoutSeconds, kMaxTimeoutSeconds);
+	//DDV_MinMaxInt(pDX, m_pin_pad_timeout, kMinTimeoutSeconds, kMaxTimeoutSeconds);
 	DDX_Radio(pDX, IDC_RADIO_HUASHIDIANZI, m_id_reader_type);
 }