feat(etrade_card_client):提交卡务客户端只读卡号版本、

提交卡务客户端只读卡号版本。

feat(etrade_card_client):提交卡务客户端只读卡号版本、
提交卡务客户端只读卡号版本。
liuye
1 parent e454f69f
Showing 27 changed files with 603 additions and 1529 deletions
etrade_card_client/Config/application_config.json
etrade_card_client/Config/url_cfg.json
etrade_card_client/ETradeClient.rc
etrade_card_client/ETradeClient.vcxproj
etrade_card_client/ETradeClient.vcxproj.filters
etrade_card_client/ETradeClient/browser/async_js_callback_handler.cpp
etrade_card_client/ETradeClient/hardware/DLCamCardManager.cpp
etrade_card_client/ETradeClient/hardware/DLCamCardManager.h
etrade_card_client/ETradeClient/hardware/dili_card_device.cpp
etrade_card_client/ETradeClient/hardware/dili_card_device.h
etrade_card_client/ETradeClient/hardware/hardware_cmd.cpp
etrade_card_client/ETradeClient/hardware/hardware_cmd.h
etrade_card_client/ETradeClient/hardware/id_card_reader.cpp
etrade_card_client/ETradeClient/hardware/id_card_reader.h
etrade_card_client/ETradeClient/mfc_ui/ConfigDialog.cpp
etrade_card_client/ETradeClient/mfc_ui/ConfigDialog.h
etrade_card_client/ETradeClient/mfc_ui/MainFrm.cpp
etrade_card_client/ETradeClient/mfc_ui/MainFrm.h
etrade_card_client/ETradeClient/utility/application_config.cpp
etrade_card_client/ETradeClient/utility/application_config.h
@@ -8,8 +8,5 @@
 	"client_cert_store": "MY",
 	"client_cert_subject": "*.diligrp.com",
 	"client_cert_filename": "",
-	"client_cert_password": "",
-	"security_level": 0,
-	"encrypt_type": 1,
-	"id_reader": 1
+	"client_cert_password": ""
 }
 \ No newline at end of file
@@ -8,6 +8,5 @@
 	"menu_auth_path":"/counter/loadPermission.do", 
 	"user_msg_count_path":"/message/countUserMessage.do", 
 	"user_msg_path":"/message/userMessageInit.page",
-	"modify_pwd_path":"/employee/client/initModifyPassword.page",
-	"server_time_path":"/system/getSystemTime.do"
+	"modify_pwd_path":"/employee/client/initModifyPassword.page"
 }
 \ No newline at end of file
@@ -77,7 +77,7 @@ IDR_MAINFRAME           ICON                    &quot;res\\ETradeClient.ico&quot;
  
 IDR_MAINFRAME MENU
 BEGIN
-    POPUP "文件(&t)"
+    POPUP "文件(&F)"
     BEGIN
         MENUITEM "退出(&X)",                      ID_EXIT
     END
@@ -196,7 +196,7 @@ FONT 8, &quot;MS Shell Dlg&quot;, 400, 0, 0x1
 BEGIN
 END
  
-IDD_MODIFY_CONFIG DIALOGEX 0, 0, 324, 257
+IDD_MODIFY_CONFIG DIALOGEX 0, 0, 324, 207
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "客户端配置"
 FONT 9, "MS Shell Dlg", 0, 0, 0x0
@@ -224,11 +224,8 @@ BEGIN
     LTEXT           "操作超时",IDC_STATIC,185,140,28,8
     EDITTEXT        IDC_EDIT_PIN_PAD_TIMEOUT,224,139,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "秒",IDC_STATIC,266,140,14,8
-    DEFPUSHBUTTON   "确定",IDOK,102,228,50,14
-    PUSHBUTTON      "取消",IDCANCEL,165,228,50,14
-    GROUPBOX        "身份证读卡器",IDC_STATIC_IDREADER,18,168,288,42
-    CONTROL         "华视电子读卡器",IDC_RADIO_HUASHIDIANZI,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,186,64,10
-    CONTROL         "新中新电子读卡器",IDC_RADIO_XINZHONGXIN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,174,186,71,10
+    DEFPUSHBUTTON   "确定",IDOK,103,174,50,14
+    PUSHBUTTON      "取消",IDCANCEL,165,174,50,14
 END
  
  
@@ -296,7 +293,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 317
         TOPMARGIN, 7
-        BOTTOMMARGIN, 248
+        BOTTOMMARGIN, 198
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -346,7 +343,6 @@ BEGIN
     ID_INDICATOR_SCRL       "SCRL"
     ID_INDICATOR_OVR        "OVR"
     ID_INDICATOR_REC        "REC"
-    ID_INDICATOR_TIME       "00:00:00"
 END
  
 STRINGTABLE
@@ -60,7 +60,6 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dlcm.lib;SynIDCardAPI.lib;DesDLL.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -87,7 +86,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dlcm.lib;SynIDCardAPI.lib;DesDLL.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -121,12 +119,11 @@
     <ClInclude Include="ETradeClient\browser\popup_browser_handler.h" />
     <ClInclude Include="ETradeClient\hardware\bank_card_reader.h" />
     <ClInclude Include="ETradeClient\hardware\dili_card_device.h" />
-    <ClInclude Include="ETradeClient\hardware\DLCardManager.h" />
+    <ClInclude Include="ETradeClient\hardware\DLCamCardManager.h" />
     <ClInclude Include="ETradeClient\hardware\hardware_cmd.h" />
     <ClInclude Include="ETradeClient\hardware\id_card_reader.h" />
     <ClInclude Include="ETradeClient\hardware\password_machine.h" />
     <ClInclude Include="ETradeClient\hardware\pin_pad.h" />
-    <ClInclude Include="ETradeClient\hardware\SynPublic.h" />
     <ClInclude Include="ETradeClient\mfc_ui\ETradeClient.h" />
     <ClInclude Include="ETradeClient\mfc_ui\ETradeClientView.h" />
     <ClInclude Include="ETradeClient\mfc_ui\LoginDialog.h" />
@@ -135,9 +132,6 @@
     <ClInclude Include="ETradeClient\mfc_ui\PopupBrowserDlgView.h" />
     <ClInclude Include="ETradeClient\mfc_ui\ConfigDialog.h" />
     <ClInclude Include="ETradeClient\utility\application_config.h" />
-    <ClInclude Include="ETradeClient\utility\DLBmpManager.h" />
-    <ClInclude Include="ETradeClient\utility\DLDes.h" />
-    <ClInclude Include="ETradeClient\utility\ETTimeManage.h" />
     <ClInclude Include="ETradeClient\utility\logging.h" />
     <ClInclude Include="ETradeClient\utility\menu_res_auth_mgr.h" />
     <ClInclude Include="ETradeClient\utility\openssl_aes_cbc.h" />
@@ -165,6 +159,7 @@
     <ClCompile Include="ETradeClient\browser\popup_browser_handler.cpp" />
     <ClCompile Include="ETradeClient\hardware\bank_card_reader.cpp" />
     <ClCompile Include="ETradeClient\hardware\dili_card_device.cpp" />
+    <ClCompile Include="ETradeClient\hardware\DLCamCardManager.cpp" />
     <ClCompile Include="ETradeClient\hardware\hardware_cmd.cpp" />
     <ClCompile Include="ETradeClient\hardware\id_card_reader.cpp" />
     <ClCompile Include="ETradeClient\hardware\password_machine.cpp" />
@@ -177,8 +172,6 @@
     <ClCompile Include="ETradeClient\mfc_ui\PopupBrowserDlgView.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\ConfigDialog.cpp" />
     <ClCompile Include="ETradeClient\utility\application_config.cpp" />
-    <ClCompile Include="ETradeClient\utility\DLBmpManager.cpp" />
-    <ClCompile Include="ETradeClient\utility\ETTimeManage.cpp" />
     <ClCompile Include="ETradeClient\utility\logging.cpp" />
     <ClCompile Include="ETradeClient\utility\menu_res_auth_mgr.cpp" />
     <ClCompile Include="ETradeClient\utility\openssl_aes_cbc.cpp" />
@@ -168,21 +168,9 @@
     <ClInclude Include="ETradeClient\browser\error_page.h">
       <Filter>Header Files\browser</Filter>
     </ClInclude>
-    <ClInclude Include="ETradeClient\hardware\SynPublic.h">
+    <ClInclude Include="ETradeClient\hardware\DLCamCardManager.h">
       <Filter>Header Files\hardware</Filter>
     </ClInclude>
-    <ClInclude Include="ETradeClient\hardware\DLCardManager.h">
-      <Filter>Header Files\hardware</Filter>
-    </ClInclude>
-    <ClInclude Include="ETradeClient\utility\DLBmpManager.h">
-      <Filter>Header Files\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="ETradeClient\utility\DLDes.h">
-      <Filter>Header Files\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="ETradeClient\utility\ETTimeManage.h">
-      <Filter>Header Files\utility</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -248,6 +236,9 @@
     <ClCompile Include="ETradeClient\browser\popup_browser_handler.cpp">
       <Filter>Source Files\browser</Filter>
     </ClCompile>
+    <ClCompile Include="ETradeClient\mfc_ui\PopupBrowserDlgView.cpp">
+      <Filter>Source Files\mfc_ui</Filter>
+    </ClCompile>
     <ClCompile Include="ETradeClient\mfc_ui\LoginEdit.cpp">
       <Filter>Source Files\mfc_ui</Filter>
     </ClCompile>
@@ -281,14 +272,8 @@
     <ClCompile Include="ETradeClient\browser\error_page.cpp">
       <Filter>Source Files\browser</Filter>
     </ClCompile>
-    <ClCompile Include="ETradeClient\mfc_ui\PopupBrowserDlgView.cpp">
-      <Filter>Source Files\mfc_ui</Filter>
-    </ClCompile>
-    <ClCompile Include="ETradeClient\utility\DLBmpManager.cpp">
-      <Filter>Source Files\utility</Filter>
-    </ClCompile>
-    <ClCompile Include="ETradeClient\utility\ETTimeManage.cpp">
-      <Filter>Source Files\utility</Filter>
+    <ClCompile Include="ETradeClient\hardware\DLCamCardManager.cpp">
+      <Filter>Source Files\hardware</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -109,10 +109,10 @@ namespace HW
  
  
 				LOG_TRACE(L"Ö´ÐÐÓ²¼þµ÷ÓÃÇëÇó:" + str_2_wstr("[" + hw_req.cmd + "," +hw_req.file_id + "," + hw_req.seq + "]"));
-
+		
 				HardwareCmd::Reply reply = m_hw_cmd_map.at(hw_req.cmd + hw_req.file_id).Execute(hw_req.data);
 				std::string answer = "";
-				if (boost::iequals(OK, reply.error_code) || boost::iequals("309", reply.error_code)) // Succeed.
+				if (boost::iequals(OK, reply.error_code)) // Succeed.
 					answer = hw_req.cmd + "_ack";
 				else
 					answer = hw_req.cmd + "_failed";
+#include "stdafx.h"
+#include <exception>
+#include <cstdint>
+#include <sstream>
+#include <iomanip> // hex conversion.
+#include <intrin.h>
+#include "etradeclient/hardware/DLCamCardManager.h"
+#include "etradeclient/hardware/ex_reference/bank_card_reader/dcrf32.h"
+#include "ETradeClient/hardware/dili_card_device.h"
+ // Endian conversion.
+
+static const uint8_t CARD_CHIP_NUM_LEN = 12; // 卡面号
+static const uint8_t CARD_TYPE_CODE_LEN = 16; // 卡片类型码（卡类型编码）
+static const uint8_t CARD_ISSUER_CODE_LEN = 20; // 发卡机构编码
+static const uint8_t CARD_VERIFY_CODE_LEN = 8; // 校验码（安全码编码(3位数)）
+static const uint8_t CARD_SN_LEN = 32; // 卡片内码, 卡序列号SN
+
+static const uint8_t CARD_TYPE_CODE_LEN_USE = 6;
+static const uint8_t CARD_ISSUER_CODE_LEN_USE = 4;
+static const uint8_t CARD_VERIFY_CODE_LEN_USE = 3;
+
+static const char PADDING_CHAR = 'f';
+
+template <typename T>
+std::string DecToHex(T d, bool show_base = false)
+{
+	std::stringstream ss;
+	if (show_base)
+		ss << "0x";
+	ss << std::setfill('0') << std::setw(sizeof(T) * 2) << std::hex << static_cast<int>(d);
+	return ss.str();
+}
+
+DLCamCardManager::DLCamCardManager() :
+m_icdev(NULL)
+{}
+
+DLCamCardManager::~DLCamCardManager()
+{
+	DisConnect();
+}
+
+std::string DLCamCardManager::HexToChar(unsigned char* pHex, int iLen)
+{
+	std::string sResult;
+	if (pHex && iLen)
+	{
+		for (int index = 0; index < iLen; ++index)
+		{
+			char cNum[3] = { 0 };
+			sprintf_s(cNum, "%2X", pHex[index]);
+			sResult.append(cNum, 2);
+		}
+	}
+	return sResult;
+}
+
+bool DLCamCardManager::CheckOrderResult(unsigned char* pResult, unsigned char cLen)
+{
+	bool bResult = false;
+	if (pResult[(int)cLen - 2] == 0x90 &&
+		pResult[(int)cLen - 1] == 0x00)
+	{
+		bResult = true;
+	}
+	return bResult;
+}
+
+bool DLCamCardManager::Connect()
+{
+	static const uint8_t RETRY_COUNT = 10;
+
+	const int kUSBPort = 100, kBaudRate = 0; // port 为 100时，表示使用USB接口通讯，则波特率无效，因此设置为0.
+	const int kBeepMs = 10;
+	uint8_t conn_count = 0;
+	do
+	{
+		m_icdev = dc_init(kUSBPort, kBaudRate);
+		if (0 < (int)m_icdev)
+		{
+			dc_beep(m_icdev, kBeepMs);
+			return true;
+		}
+		++conn_count;
+	} while (conn_count < RETRY_COUNT);
+	return false;
+}
+
+bool DLCamCardManager::DisConnect()
+{
+	bool bResult = false;
+	if (m_icdev)
+	{
+		int iResult = dc_exit(m_icdev);
+		if (iResult)
+		{
+			bResult = false;
+		}
+		else
+		{
+			bResult = true;
+		}
+	}
+	return bResult;
+}
+
+bool DLCamCardManager::SelectMF()
+{
+	bool bResult = true;
+
+	const int kOK = 0;
+	const unsigned int kTimeout = 7; // 延迟时间，单位为：10ms, 7 来自与官方示例，该值如果设过大会导致操作失败.
+	const unsigned int kMaxDataSize = 512;
+	const unsigned char kSendDataLen = 7; // 发送的信息长度
+	unsigned char recv_data_len = 0; // 读取信息的长度
+	unsigned char send_data[kMaxDataSize] = { 0 }, recv_data[kMaxDataSize] = { 0 };
+
+	send_data[0] = 0x00; // CLA
+	send_data[1] = 0xA4; // INS
+	send_data[2] = 0x00; // P1，按文件名选择DF
+	send_data[3] = 0x00; // P2
+	send_data[4] = 0x02; // Lc 数据长度
+	// Data：DF文件名
+	send_data[5] = 0x3F;
+	send_data[6] = 0x00;
+
+	__int16 iResult = 0;
+	if (m_icdev)
+	{
+		iResult = dc_pro_command(m_icdev, kSendDataLen, send_data, &recv_data_len, recv_data, kTimeout);
+	}
+	else
+	{
+		bResult = false;
+		throw std::exception("Card reader handle is empty!");
+	}
+	
+	
+	if (iResult != kOK || !CheckOrderResult(recv_data, recv_data_len))
+	{
+		bResult = false;
+		throw std::exception("Select MF failed!");
+	}
+
+	return bResult;
+}
+
+bool DLCamCardManager::SelectFile()
+{
+	bool bResult = false;
+	
+	const int kOK = 0;
+	const unsigned int kTimeout = 7; // 延迟时间，单位为：10ms, 7 来自与官方示例，该值如果设过大会导致操作失败.
+	const unsigned int kMaxDataSize = 512;
+	const unsigned char kSendDataLen = 7; // 发送的信息长度
+	unsigned char recv_data_len = 0; // 读取信息的长度
+	unsigned char send_data[kMaxDataSize] = { 0 }, recv_data[kMaxDataSize] = { 0 };
+
+	send_data[0] = 0x00; // CLA
+	send_data[1] = 0xA4; // INS
+	send_data[2] = 0x00; // P1，按文件名选择DF
+	send_data[3] = 0x00; // P2
+	send_data[4] = 0x02; // Lc 数据长度
+	// Data：DF文件名
+	send_data[5] = 0x00;
+	send_data[6] = 0x05;
+
+	__int16 iResult = 0;
+	if (m_icdev)
+	{
+		iResult = dc_pro_command(m_icdev, kSendDataLen, send_data, &recv_data_len, recv_data, kTimeout);
+	}
+	else
+	{
+		bResult = false;
+		throw std::exception("Card reader handle is empty!");
+	}
+	if (iResult != kOK || !CheckOrderResult(recv_data, recv_data_len))
+	{
+		bResult = false;
+		throw std::exception("Select 0x05 file failed!");
+	}
+
+	return bResult;
+}
+
+
+std::string DLCamCardManager::ReadCardBasicFile()
+{
+	std::string sResult;
+	const int kOK = 0;
+	const unsigned int kTimeout = 7; // 延迟时间，单位为：10ms, 7 来自与官方示例，该值如果设过大会导致操作失败.
+	const unsigned int kMaxDataSize = 512;
+	const unsigned char kSendDataLen = 5; // 发送的信息长度
+	unsigned char recv_data_len = 0; // 读取信息的长度
+	unsigned char send_data[kMaxDataSize] = { 0 }, recv_data[kMaxDataSize] = { 0 };
+
+
+	send_data[0] = 0x00; // CLA
+	send_data[1] = 0xB0; // INS
+	send_data[2] = 0x85; // P1
+	send_data[3] = 0x00; // P2，按文件记录号访问
+	send_data[4] = 0x2C; // Le
+
+	bool bResult = true;
+	__int16 iResult = 0;
+	if (m_icdev)
+	{
+		iResult = dc_pro_command(m_icdev, kSendDataLen, send_data, &recv_data_len, recv_data, kTimeout);
+	}
+	else
+	{
+		bResult = false;
+		throw std::exception("Card reader handle is empty!");
+	}
+	if (iResult != kOK || !CheckOrderResult(recv_data, recv_data_len))
+	{
+		bResult = false;
+		throw std::exception("Read data at 0x05 file failed!");
+	}
+
+	if (bResult)
+	{
+		RecordDataT sTemp = RecordDataT(recv_data, recv_data_len);
+		for (int index = 0; index < (int)recv_data_len - 2; ++index)
+			sResult.append(DecToHex(sTemp.at(index)));
+	}
+	return sResult;
+}
+
+DILICard::BasicInfo DLCamCardManager::ReadCardBasicInfo()
+{
+	std::string basic_info_str = ReadCardBasicFile();
+	int iTotalLength = basic_info_str.size();
+	if (basic_info_str.size() < iTotalLength)
+	{
+		throw std::exception("Card basic info error!");
+	}
+	DILICard::BasicInfo basic_info;
+
+	uint32_t offset = 0;
+	basic_info.chip_num = basic_info_str.substr(offset, CARD_CHIP_NUM_LEN);
+	offset += CARD_CHIP_NUM_LEN;
+
+	std::string field;
+	field = basic_info_str.substr(offset, CARD_TYPE_CODE_LEN);
+	basic_info.type_code = field.substr(0, CARD_TYPE_CODE_LEN_USE);
+	offset += CARD_TYPE_CODE_LEN;
+
+	field = basic_info_str.substr(offset, CARD_ISSUER_CODE_LEN);
+	basic_info.issuer_code = field.substr(0, CARD_ISSUER_CODE_LEN_USE);
+	offset += CARD_ISSUER_CODE_LEN;
+
+	field = basic_info_str.substr(offset, CARD_VERIFY_CODE_LEN);
+	basic_info.verify_code = field.substr(0, CARD_VERIFY_CODE_LEN_USE);
+	offset += CARD_VERIFY_CODE_LEN;
+
+	//sn号全为f或者全为0时，入库会有问题，暂时用卡面号替代sn号 add by liuye 2017.7.27
+	//basic_info.device_id = basic_info_str.substr(offset, CARD_SN_LEN);
+	basic_info.device_id = basic_info.chip_num;
+	//
+
+	return basic_info;
+}
+
+void DLCamCardManager::FindAndResetCard()  // 寻卡并复位卡片
+{
+	unsigned long snr = 0;
+	unsigned char lenth[128] = { 0 };
+	unsigned char data[128] = { 0 };
+	int st = 0;
+
+	if (m_icdev)
+	{
+		st = dc_card(m_icdev, 0, &snr); // 一定要先寻卡
+		if (0 != st)
+			throw std::exception("Find dili card failed!");
+		st = dc_pro_reset(m_icdev, lenth, data);
+		if (0 != st)
+			throw std::exception("Reset dili card failed!");
+	}
+	else
+	{
+		throw std::exception("Card reader handle is empty!");
+	}
+	
+}
 \ No newline at end of file
+#ifndef ETRADECLIENT_DL_CAM_CARD_MANAGER_H_INCLUDED
+#define ETRADECLIENT_DL_CAM_CARD_MANAGER_H_INCLUDED
+
+#include <string>
+#include "ETradeClient/hardware/dili_card_device.h"
+
+class DLCamCardManager
+{
+	typedef std::basic_string<unsigned char> RecordDataT;
+public:
+	DLCamCardManager();
+	~DLCamCardManager();
+
+	bool Connect();
+	bool DisConnect();
+	void FindAndResetCard();
+	bool SelectMF();
+	bool SelectFile();
+	DILICard::BasicInfo ReadCardBasicInfo();
+
+private:
+	std::string HexToChar(unsigned char* pHex, int iLen);
+	bool CheckOrderResult(unsigned char* pResult, unsigned char cLen);
+	std::string ReadCardBasicFile();
+
+	HANDLE m_icdev;
+};
+
+#endif
 \ No newline at end of file
@@ -10,7 +10,6 @@
 #include <intrin.h> // Endian conversion.
  
 #include "etradeclient/utility/string_converter.h"
-#include "ETradeClient/hardware/DLCardManager.h"
  
 template <typename T>
 std::string DecToHex(T d, bool show_base = false)
@@ -111,37 +110,35 @@ namespace DILICard
 	}
 	bool RWDevice::Connect() const
 	{
-		bool bResult = true;
-
-		int iResult = DLCConnectDevice();
-		if (0 != iResult)
+		static const uint8_t RETRY_COUNT = 10;
+		uint8_t conn_count = 0;
+		do
 		{
-			bResult = false;
-			throw std::exception(std::to_string(iResult).c_str());
-		}
-
-		return bResult;
+			if (m_fn_open())
+				return true;
+			++conn_count;
+		} while (conn_count < RETRY_COUNT);
+		return false;
 	}
 	void RWDevice::Disconnect() const
 	{
-		DLCDisconnectDevice();
+		m_fn_close();
 	}
 	void RWDevice::Beep(uint32_t time) const
 	{
 		m_fn_beep(time);
 	}
-	bool RWDevice::FindCard() const
+	std::string RWDevice::FindCard() const
 	{
-		bool bResult = true;
-
-		int iResult = DLCFindCard();
-		if (0 != iResult)
-		{
-			bResult = false;
-			throw std::exception(std::to_string(iResult).c_str());
-		}
-
-		return bResult;
+		static const uint8_t OK = 0;
+		char sn[CARD_SN_LEN + 1] = { 0x0 };
+		// 仅仅检查‘m_fn_find_card’的返回值不够，因为该函数有BUG：即使未能正确读到卡序列号，
+		// 该函数依然可能返回0. 例如在每次正确读到卡片后，如果把卡拿走并马上再次读卡，此时该函数
+		// 会返回0，但并没有读到卡序列号。
+		if (OK == m_fn_find_card(sn) && sn[0] != 0x0)
+			return sn;
+		else
+			throw std::exception("Card not found!");
 	}
  
 	// 卡基本信息文件包括：卡面号，卡片硬件标识（卡片内码, 卡序列号SN），卡片类型码，发卡机构编码，校验码。
@@ -209,26 +206,14 @@ namespace DILICard
 		*/
  
 		// 设置密码
-		//九方元通的卡，damk的秘钥标示为0
-		std::string sCardType = chip_num_str.substr(4, 1);
-		if (sCardType == "1")
-		{
-			SetPassword(DF01_DIR, 0, K_F0015_DACK_DV, key_F0015_DAMK1.c_str(), KT_DAMK);
-			SetPassword(MF_FILE_DIR, 0, K_DCCK_DV, key_F0015_DAMK1.c_str(), KT_DAMK);
-		}
-		else
-		{
-			SetPassword(DF01_DIR, 1, K_F0015_DACK_DV, key_F0015_DAMK1.c_str(), KT_DAMK);
-			SetPassword(MF_FILE_DIR, 1, K_DCCK_DV, key_F0015_DAMK1.c_str(), KT_DAMK);
-		}
-		//
-		SetPassword(DF01_DIR, 1, K_F0015_DACK_DV, key_F0015_DEAK.c_str(), KT_DEAK);
-		SetPassword(DF01_DIR, 0, K_F0015_DACK_DV, key_F0015_DACK.c_str(), KT_DCCK);
-		SetPassword(MF_FILE_DIR, 0, K_DCCK_DV, key_DCCK.c_str(), KT_DCCK);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, K_F0015_DACK_DV, K_F0015_DAMK1_CMD_HEAD, key_F0015_DAMK1.c_str(), false);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, K_F0015_DACK_DV, K_F0015_DEAK_CMD_HEAD, key_F0015_DEAK.c_str(), false);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, K_F0015_DACK_DV, K_F0015_DACK_CMD_HEAD, key_F0015_DACK.c_str(), true);
+		SetPassword(MF_FILE_DIR, ACTIVATE_KEY_ID, K_DCCK_DV, K_DCCK_CMD_HEAD, key_DCCK.c_str(), true);
  
 		// 写卡片硬件标识（卡片内码, 卡序列号SN）
 		// 注意这里offset计算不需要进行“/2”转换，因为这个API层面操作的都是HEX字符串格式，在“WriteCardFile”内部会自动进行“/2”转换。
-		WriteCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, CARD_SN_DATA_OFFSET, ACTIVATE_KEY_ID, key_F0015_DAMK1.c_str(), card_sn);
+		WriteCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, CARD_SN_DATA_OFFSET, ACTIVATE_KEY_ID, K_F0005_DCMK1, card_sn);
  
 		// 读发卡机构
 		uint8_t issuer_code_len = CARD_ISSUER_CODE_HAERBIN_HADA.size();
@@ -289,24 +274,16 @@ namespace DILICard
 			//need_write_code_type = true;
 			// 
 		}
-
-		//卡类型码纠错仅针对于智信融创的老卡 add by daxiong 2017.10.19
-		if (sCardType != "0")
-		{
-			need_write_code_type = false;
-		}
-		//
-		
 		// 注意这里offset计算不需要进行“/2”转换，因为这个API层面操作的都是HEX字符串格式，在“WriteCardFile”内部会自动进行“/2”转换。
 		if (need_write_code_type) // 根据需要重新写入卡片类型编码.
 		{
 			static const uint32_t TYPE_CODE_DATA_OFFSET = CARD_CHIP_NUM_LEN;
-			WriteCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, TYPE_CODE_DATA_OFFSET, ACTIVATE_KEY_ID, key_F0015_DAMK1, card_type_str);
+			WriteCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, TYPE_CODE_DATA_OFFSET, ACTIVATE_KEY_ID, K_F0005_DCMK1, card_type_str);
 		}
  
 		//将业务信息文件中的数据长度设置为0.
 		WriteCardFile(DF01_DIR, SERVICE_INFO_FILE_ID, 0/*offset*/, ACTIVATE_KEY_ID, key_F0015_DAMK1, DecToHex(0)); // Default length is 0.
-}
+	}
  
 	void RWDevice::ResetCard(const std::string& key_DCCK, const std::string& key_F0015_DACK) const
 	{
@@ -327,26 +304,10 @@ namespace DILICard
  
  
 		// 设置密码
-		static const uint32_t CHIP_NUM_DATA_OFFSET = 0;
-		const char kKeyID = NULL; // No need to do authentication.
-		const std::string kKey = "";
-		std::string chip_num_str = ReadCardFile(MF_FILE_DIR, BASIC_INFO_FILE_ID, CHIP_NUM_DATA_OFFSET, CARD_CHIP_NUM_LEN, kKeyID, kKey);
-		//九方元通的卡，damk的秘钥标示为0
-		std::string sCardType = chip_num_str.substr(4, 1);
-		if (sCardType == "1")
-		{
-			SetPassword(DF01_DIR, 0, key_F0015_DACK.c_str(), K_F0015_DAMK1_DV, KT_DAMK);
-			SetPassword(MF_FILE_DIR, 0, key_DCCK.c_str(), K_F0005_DCMK1, KT_DAMK);
-		}
-		else
-		{
-			SetPassword(DF01_DIR, 1, key_F0015_DACK.c_str(), K_F0015_DAMK1_DV, KT_DAMK);
-			SetPassword(MF_FILE_DIR, 1, key_DCCK.c_str(), K_F0005_DCMK1, KT_DAMK);
-		}
-		//
-		SetPassword(DF01_DIR, 1, key_F0015_DACK, K_F0015_DEAK_DV, KT_DEAK);
-		SetPassword(DF01_DIR, 0, key_F0015_DACK, K_F0015_DACK_DV, KT_DCCK);
-		SetPassword(MF_FILE_DIR, 0, key_DCCK.c_str(), K_DCCK_DV, KT_DCCK);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, key_F0015_DACK.c_str(), K_F0015_DAMK1_CMD_HEAD, K_F0015_DAMK1_DV, false);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, key_F0015_DACK, K_F0015_DEAK_CMD_HEAD, K_F0015_DEAK_DV, false);
+		SetPassword(DF01_DIR, ACTIVATE_KEY_ID, key_F0015_DACK, K_F0015_DACK_CMD_HEAD, K_F0015_DACK_DV, true);
+		SetPassword(MF_FILE_DIR, ACTIVATE_KEY_ID, key_DCCK.c_str(), K_DCCK_CMD_HEAD, K_DCCK_DV, true);
  
 		// 充值卡片内码
 		// 注意这里offset计算不需要进行“/2”转换，因为这个API层面操作的都是HEX字符串格式，在“WriteCardFile”内部会自动进行“/2”转换。
@@ -417,23 +378,23 @@ namespace DILICard
 	//------Private Implementations----------------
 	void RWDevice::Init()
 	{
-		//const std::wstring kDLLFile = L"./dyn.dll";
-		//HINSTANCE dll_handle = LoadLibrary(kDLLFile.c_str());
-		//if (NULL != dll_handle)
-		//{
-		//	m_fn_open = (OpenFn)GetProcAddress(dll_handle, "open");
-		//	m_fn_beep = (BeepFn)GetProcAddress(dll_handle, "beep");
-		//	m_fn_close = (CloseFn)GetProcAddress(dll_handle, "close");
-		//	m_fn_find_card = (FindCardFn)GetProcAddress(dll_handle, "findCard");
-		//	m_fn_write_bin_data = (WriteBinaryDataFn)GetProcAddress(dll_handle, "write_bin_file");
-		//	m_fn_get_value = (GetValueFn)GetProcAddress(dll_handle, "get_value_char"); // Don't use "get_value" version!!!
-		//	m_fn_ch_dir = (ChangeDirFn)GetProcAddress(dll_handle, "chang_dir");
-		//	m_fn_read_bin_data = (ReadBinaryDataFn)GetProcAddress(dll_handle, "read_bin_file");
-		//	m_fn_ex_auth = (ExternalAuthFn)GetProcAddress(dll_handle, "External_Authentication");
-		//	m_fn_install_key = (InstallKeyFn)GetProcAddress(dll_handle, "InstallKey");
-		//}
-		//else
-		//	throw std::exception(("Fail to load the DILI card device DLL from path : " + wstr_2_str(kDLLFile)).c_str());
+		const std::wstring kDLLFile = L"./dyn.dll";
+		HINSTANCE dll_handle = LoadLibrary(kDLLFile.c_str());
+		if (NULL != dll_handle)
+		{
+			m_fn_open = (OpenFn)GetProcAddress(dll_handle, "open");
+			m_fn_beep = (BeepFn)GetProcAddress(dll_handle, "beep");
+			m_fn_close = (CloseFn)GetProcAddress(dll_handle, "close");
+			m_fn_find_card = (FindCardFn)GetProcAddress(dll_handle, "findCard");
+			m_fn_write_bin_data = (WriteBinaryDataFn)GetProcAddress(dll_handle, "write_bin_file");
+			m_fn_get_value = (GetValueFn)GetProcAddress(dll_handle, "get_value_char"); // Don't use "get_value" version!!!
+			m_fn_ch_dir = (ChangeDirFn)GetProcAddress(dll_handle, "chang_dir");
+			m_fn_read_bin_data = (ReadBinaryDataFn)GetProcAddress(dll_handle, "read_bin_file");
+			m_fn_ex_auth = (ExternalAuthFn)GetProcAddress(dll_handle, "External_Authentication");
+			m_fn_install_key = (InstallKeyFn)GetProcAddress(dll_handle, "InstallKey");
+		}
+		else
+			throw std::exception(("Fail to load the DILI card device DLL from path : " + wstr_2_str(kDLLFile)).c_str());
 	}
  
 	std::string RWDevice::GetValue() const
@@ -451,29 +412,27 @@ namespace DILICard
 									   const std::string&	key) const
 	{
 		std::stringstream err_msg;
-		unsigned char aucDir[4] = { 0 }, aucKey[32] = { 0 }, aucData[500] = { 0 };
-		memcpy(aucDir, dir.c_str(), 4);
-		int iResult = 0;
-		if (NULL != key_id)
+		if (!m_fn_ch_dir(dir.c_str())) // First change to specified directory.
 		{
-			memcpy(aucKey, key.c_str(), 32);
-			iResult = DLCReadCardData(aucDir, file_id, offset, length, aucKey, aucData);
+			err_msg << "Change directory failed, DIR: " << dir << ", ErrorCode: " << GetValue();
+			throw std::exception(err_msg.str().c_str());
 		}
-		else
+		if (NULL != key_id) // If authentication is needed.
 		{
-			iResult = DLCReadCardData(aucDir, file_id, offset, length, NULL, aucData);
+			if (!m_fn_ex_auth(key_id, key.c_str()))
+			{
+				err_msg << "Authenticate file failed, FILE: " << file_id << ", ErrorCode: " << GetValue();
+				throw std::exception(err_msg.str().c_str());
+			}
 		}
-
-		
-		if (0 != iResult)
+		// Read binary data from card.  
+		if (!m_fn_read_bin_data(file_id, offset / 2, length / 2)) // Why "/ 2"? refer to the comment at the front of this file.
 		{
-			err_msg << "Read DL card data failed, dir:" << dir << ", file:" << file_id << ", ErrorCode:" << iResult;
+			err_msg << "Read file failed, FILE: " << file_id << ", ErrorCode: " << GetValue();
 			throw std::exception(err_msg.str().c_str());
 		}
  
-		std::string sData = (char*)aucData;
-		return sData;
-
+		return GetValue();
 	}
  
 	void RWDevice::WriteCardFile(const std::string& dir, 
@@ -484,102 +443,60 @@ namespace DILICard
 								 const std::string& data) const
 	{
 		std::stringstream err_msg;
-		int iResult = 0;
-		const int DATA_MAX_LEN = 500;
-
-		unsigned char aucDir[4] = { 0 }, aucKey[32] = { 0 };
-		memcpy(aucDir, dir.c_str(), 4);
-		memcpy(aucKey, key.c_str(), 32);
+		if (!m_fn_ch_dir(dir.c_str())) // First change to specified directory.
+		{
+			err_msg << "Change directory failed, DIR: " << dir << ", ErrorCode: " << GetValue();
+			throw std::exception(err_msg.str().c_str());
+		}
  
-		int iDataLength = data.size();
-		int iStartIndex = 0, iOffset = offset;
-		do 
+		uint32_t length = data.size();
+		uint32_t written_data_size = 0;
+		while (written_data_size < length)
 		{
-			while (iDataLength - DATA_MAX_LEN > 0)
+			if (NULL != key_id) // If authentication is needed.
 			{
-				unsigned char aucDataBlock[DATA_MAX_LEN] = { 0 };
-				memcpy(aucDataBlock, data.substr(iStartIndex, DATA_MAX_LEN).c_str(), DATA_MAX_LEN);
-				iResult = DLCWriteCardData(aucDir, file_id, iOffset, DATA_MAX_LEN, aucDataBlock, aucKey);
-				if (0 != iResult)
+				if (!m_fn_ex_auth(key_id, key.c_str()))
 				{
-					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
+					err_msg << "Authenticate file failed, FILE: " << file_id << ", ErrorCode: " << GetValue();
 					throw std::exception(err_msg.str().c_str());
-					break;
 				}
-				iStartIndex += DATA_MAX_LEN;
-				iDataLength -= DATA_MAX_LEN;
-				iOffset += DATA_MAX_LEN;
 			}
-			if (0 == iResult)
+			std::string data_block = data.substr(written_data_size, WRITE_DATA_BLOCK_LEN * 2); // Why "* 2"? refer to the comment at the front of this file.
+			uint32_t block_size = data_block.size();
+			
+
+			if (!m_fn_write_bin_data(file_id, (offset + written_data_size) / 2, block_size / 2, key.c_str(), data_block.c_str())) // Why "/ 2"? refer to the comment at the front of this file.
 			{
-				unsigned char aucData[DATA_MAX_LEN] = { 0 };
-				memcpy(aucData, data.substr(iStartIndex, iDataLength).c_str(), iDataLength);
-				iResult = DLCWriteCardData(aucDir, file_id, iOffset, iDataLength, aucData, aucKey);
-				if (0 != iResult)
-				{
-					err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << iResult;
-					throw std::exception(err_msg.str().c_str());
-					break;
-				}
+				err_msg << "Write data to file failed, FILE: " << file_id << ", ErrorCode: " << GetValue();
+				throw std::exception(err_msg.str().c_str());
 			}
-		} while (0);
+
+			written_data_size += block_size;
+		}
 	}
  
 	void RWDevice::SetPassword(const std::string&	dir, 
 							   char					key_id, 
 							   const std::string&	main_key, 
+							   const std::string&	cmd_head, 
 							   const std::string&	install_key, 
-							   KeyType				emKeyType) const
+							   bool					is_main_key) const
 	{
 		std::stringstream err_msg;
-		unsigned char aucDir[4] = { 0 }, aucMainKey[32] = { 0 }, aucNewKey[32] = { 0 };
-		memcpy(aucDir, dir.c_str(), 4);
-		memcpy(aucMainKey, main_key.c_str(), 32);
-		memcpy(aucNewKey, install_key.c_str(), 32);
-		int iResult = DLCInstallKey(aucDir, key_id, emKeyType, aucNewKey, aucMainKey);
-		if (0 != iResult)
+		if (!m_fn_ch_dir(dir.c_str())) // First change to specified directory.
 		{
-			err_msg << "Update key failed, key to be updated: " << install_key << ", ErrorCode: " << iResult;
+			err_msg << "Change directory failed, DIR: " << dir << ", ErrorCode: " << GetValue();
 			throw std::exception(err_msg.str().c_str());
 		}
-	}
-
-	void RWDevice::CreateCardFile(const std::string dir, const std::string dir_key, const std::string file_name, const std::string file_size, const int file_type) const
-	{
-		std::stringstream err_msg;
-		unsigned char aucDir[4] = { 0 }, aucKey[32] = { 0 }, aucFileName[4] = { 0 }, aucFileSize[4] = { 0 };
-		memcpy(aucDir, dir.c_str(), 4);
-		memcpy(aucKey, dir_key.c_str(), 32);
-		memcpy(aucFileName, file_name.c_str(), 4);
-		memcpy(aucFileSize, file_size.c_str(), 4);
-		int iResult = DLCCreateFile(aucDir, aucKey, aucFileName, aucFileSize, file_type);
-		if (0 != iResult)
+		if (!m_fn_ex_auth(key_id, main_key.c_str()))
 		{
-			err_msg << "Create file failed, ErrorCode: " << iResult;
+			err_msg << "Authenticate key failed, original key: " << main_key << ", ErrorCode: " << GetValue();
 			throw std::exception(err_msg.str().c_str());
 		}
-	}
-
-	bool RWDevice::NeedCreateFile() const
-	{
-		return DLCSelectFile((const unsigned char*)"df20") == 0 ? false : true;
-	}
-
-	bool RWDevice::AuthenticationKey(const std::string sKey) const
-	{
-		bool bResult = true;
-		unsigned char aucKey[32] = { 0 };
-		memcpy(aucKey, sKey.c_str(), 32);
-		int iResult = DLCAuthenticationKey((const unsigned char*)"3f00", 0, aucKey);
-		if (iResult)
+		if (!m_fn_install_key(main_key.c_str(), cmd_head.c_str(), install_key.c_str(), is_main_key, true))
 		{
-			bResult = false;
-		}
-		else
-		{
-			bResult = true;
+			err_msg << "Update key failed, key to be updated: " << install_key << ", ErrorCode: " << GetValue();
+			throw std::exception(err_msg.str().c_str());
 		}
-
-		return bResult;
 	}
 } // DILICard
 \ No newline at end of file
@@ -58,7 +58,7 @@ namespace DILICard
 		bool Connect() const;
 		void Disconnect() const;
 		void Beep(uint32_t time) const; // Unit: 10ms.
-		bool FindCard() const; // If card found, card's serial number will be returned.
+		std::string FindCard() const; // If card found, card's serial number will be returned.
 		void ActivateCard(const std::string& card_sn, 
 						  const std::string& key_DCCK, 
 						  const std::string& key_F0015_DACK,
@@ -68,23 +68,6 @@ namespace DILICard
 		BasicInfo ReadCardBasicInfo() const;
 		std::string ReadCardServiceInfo(const std::string& key_F0015_DEAK) const;
 		void WriteCardServiceInfo(const std::string& key_F0015_DAMK1, const std::string& data) const;
-		bool AuthenticationKey(const std::string sKey) const;
-
-		//´´½¨ÍÑ»ú½»Ò×ËùÐèÎÄ¼þ add by liuye
-		void CreateCardFile(const std::string dir,
-			const std::string dir_key,
-			const std::string file_name,
-			const std::string file_size,
-			const int file_type) const; 
-
-		bool NeedCreateFile() const;
-		
-		enum KeyType
-		{
-			KT_DCCK = 0,
-			KT_DEAK,
-			KT_DAMK,
-		};
 	private:
 		void Init();
 		std::string GetValue() const;
@@ -103,8 +86,9 @@ namespace DILICard
 		void SetPassword(const std::string& dir, 
 						 char				key_id, 
 						 const std::string& main_key, 
+						 const std::string& cmd_head, 
 						 const std::string& install_key, 
-						 KeyType			emKeyType) const;
+						 bool				is_main_key) const;
  
 	private:
 		OpenFn				m_fn_open;
@@ -16,10 +16,7 @@
 #include "etradeclient/hardware/dili_card_device.h"
 #include "etradeclient/hardware/bank_card_reader.h"
 #include "etradeclient/hardware/password_machine.h"
-#include "ETradeClient/utility/openssl_aes_cbc.h"
-#include "ETradeClient/utility/DLBmpManager.h"
-#include "ETradeClient/utility/string_converter.h"
-#include "ETradeClient/utility/DLDes.h"
+#include "etradeclient/hardware/DLCamCardManager.h"
  
 namespace StatusCode
 {
@@ -43,8 +40,6 @@ namespace StatusCode
 	static const std::string DILI_CARD_DEVICE_READ_SERVICE_INFO_FAILED = "305"; // 读取卡片业务信息失败.
 	static const std::string DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED = "306"; // 写入卡片业务信息失败.
 	static const std::string DILI_CARD_DEVICE_WRITE_UNMATCHED_CARD = "307"; // 写卡卡片的序列号不匹配.
-	static const std::string DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE = "308"; //卡片需要升级，请升级后继续使用。
-	static const std::string DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE = "309"; //卡片需要升级。
  
 	static const std::string PWD_MACHINE_CONNECT_FAILED = "401"; // 连接加密机失败.
 	static const std::string PWD_MACHINE_GET_KEY_FAILED = "402"; // 从加密机读取密钥失败.
@@ -52,182 +47,6 @@ namespace StatusCode
 	static const std::string BANK_CARD_READ_CARD_NUM_FAILED = "501"; // 读取银行卡卡号失败.
 }
  
-namespace EncryptTools
-{
-	int Encrypt(unsigned char* pSrc, unsigned char u8Len, unsigned char* pKey, unsigned char* pCiphertText)
-	{
-		int iResult = 0;
-
-		uint8_t au8DataBlock[50][8] = { 0 };
-
-		int iBlockCount = 0, iCoverPos = 0, iBlockNum = 0;
-		iBlockCount = u8Len / 8;
-		iCoverPos = u8Len % 8;
-
-		while (iBlockCount > 0)
-		{
-			memcpy(au8DataBlock[iBlockNum], pSrc, 8);
-			pSrc += 8;
-			--iBlockCount;
-			++iBlockNum;
-		}
-
-		if (iCoverPos)
-		{
-			memcpy(au8DataBlock[iBlockNum], pSrc, iCoverPos);
-			au8DataBlock[iBlockNum][iCoverPos] = 0x80;
-			++iCoverPos;
-			for (int index = iCoverPos; iCoverPos < 8; ++iCoverPos)
-			{
-				au8DataBlock[iBlockNum][iCoverPos] = 0x00;
-			}
-		}
-		else
-		{
-			--iBlockNum;
-		}
-
-		uint8_t au8KeyL[8] = { 0 }, au8KeyR[8] = { 0 };
-		memcpy(au8KeyL, pKey, 8);
-		memcpy(au8KeyR, pKey, 8);
-		for (int index = 0; index <= iBlockNum; ++index)
-		{
-			uint8_t au8Cipher1[8] = { 0 }, au8Cipher2[8] = { 0 };
-			DES(au8KeyL, au8DataBlock[index], au8Cipher1);
-			_DES(au8KeyR, au8Cipher1, au8Cipher2);
-			DES(au8KeyL, au8Cipher2, &pCiphertText[index * 8]);
-		}
-
-		return iResult;
-	}
-
-	bool HexToChar(unsigned char* pHex, int iHexLen, unsigned char* pChar)
-	{
-		bool bResult = true;
-		if (pHex && iHexLen && pChar)
-		{
-			int iCharCount = 0;
-			for (int index = 0; index < iHexLen; ++index)
-			{
-				char cNum[3] = { 0 };
-				if (pHex[index] <= 0x0f)
-				{
-					pChar[iCharCount] = '0';
-					++iCharCount;
-					sprintf_s(cNum, "%X", pHex[index]);
-					pChar[iCharCount] = cNum[0];
-					++iCharCount;
-				}
-				else
-				{
-					sprintf_s(cNum, "%2X", pHex[index]);
-					pChar[iCharCount] = cNum[0];
-					++iCharCount;
-					pChar[iCharCount] = cNum[1];
-					++iCharCount;
-				}
-			}
-		}
-		return bResult;
-	}
-
-	bool CharToHex(unsigned char* pStr, unsigned char& cHex)
-	{
-		bool bResult = true;
-
-		unsigned char aHex[2] = { 0 }, cTemp = 0;
-		if (pStr)
-		{
-			int iCount = 2;
-			do
-			{
-				char cStr = tolower(pStr[iCount - 1]);
-				switch (cStr)
-				{
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-				case '8':
-				case '9':
-				{
-					cTemp = atoi(&cStr);
-					break;
-				}
-				case 'a':
-				{
-					cTemp = 10;
-					break;
-				}
-				case 'b':
-				{
-					cTemp = 11;
-					break;
-				}
-				case 'c':
-				{
-					cTemp = 12;
-					break;
-				}
-				case 'd':
-				{
-					cTemp = 13;
-					break;
-				}
-				case 'e':
-				{
-					cTemp = 14;
-					break;
-				}
-				case 'f':
-				{
-					cTemp = 15;
-					break;
-				}
-				}
-				aHex[iCount - 1] = cTemp;
-				--iCount;
-			} while (iCount);
-
-			cHex = (aHex[0] << 4) + aHex[1];
-		}
-		else
-		{
-			bResult = false;
-		}
-		return bResult;
-	}
-
-	bool StringToHex(unsigned char* pStr, int iLen, unsigned char* pHex)
-	{
-		bool bResult = true;
-
-		int iStrIndex = 0;
-		int index = 0;
-		while (bResult && iStrIndex < iLen)
-		{
-			bResult = CharToHex(&pStr[iStrIndex], pHex[index]);
-			++index;
-			iStrIndex += 2;
-		}
-
-		if (!bResult)
-		{
-			throw std::exception("9999");
-		}
-		/*for (int index = 0, iStrIndex = 0; iStrIndex < iLen; ++index, iStrIndex += 2)
-		{
-		CharToHex(&pStr[iStrIndex], pHex[index]);
-		}*/
-
-		return bResult;
-	}
-}
-
 namespace 
 {
 	const PINPad& PINPad_()
@@ -236,7 +55,7 @@ namespace
 		return pin_pad;
 	}
  
-	IDCardReader& IDCardReader_()
+	const IDCardReader& IDCardReader_()
 	{
 		static IDCardReader id_card_reader;
 		return id_card_reader;
@@ -260,7 +79,11 @@ namespace
 		return bank_card_reader;
 	}
  
-	std::string g_sCardNum;//用于办卡时，保证操作的卡片是同一张
+	const DLCamCardManager& DLCamCardManager_()
+	{
+		static DLCamCardManager CamCardManager;
+		return CamCardManager;
+	}
 }
  
 ReadPINPadCmd::Reply ReadPINPadCmd::Execute(const std::string& input)
@@ -322,95 +145,34 @@ ReadPINPadCmd::Reply ReadIDCardCmd::Execute(const std::string&amp; input)
 	auto& id_card_reader = IDCardReader_();
 	Reply reply;
 	IDCardInfo id_card_info;
-
-	uint8_t u8IDReaderType = ApplicationConfig::Instance().IDReaderType();
-
-	switch (u8IDReaderType)
-	{
-	case 0:
+	do
 	{
-		do
+		try
 		{
-			try
+			if (!id_card_reader.Connect())
 			{
-				if (!id_card_reader.Connect())
-				{
-					LOG_ERROR(L"建立身份证读卡器连接失败！");
-					reply.error_code = StatusCode::ID_CARD_READER_CONNECT_FAILED;
-					break;
-				}
-				if (!id_card_reader.VerifyCard())
-				{
-					LOG_ERROR(L"未找到身份证或身份证验证失败！");
-					reply.error_code = StatusCode::ID_CARD_READER_VERIFY_FAILED;
-					break;
-				}
-				id_card_info = id_card_reader.ReadCard();
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"读取身份证信息失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::ID_CARD_READER_READ_FAILED;
+				LOG_ERROR(L"建立身份证读卡器连接失败！");
+				reply.error_code = StatusCode::ID_CARD_READER_CONNECT_FAILED;
 				break;
 			}
-		} while (0);
-		id_card_reader.Disconnect();
-	}
-	break;
-	case 1:
-	{
-		do
-		{
-			try
-			{
-				if (!id_card_reader.SynConnect())
-				{
-					LOG_ERROR(L"建立身份证读卡器连接失败！");
-					reply.error_code = StatusCode::ID_CARD_READER_CONNECT_FAILED;
-					break;
-				}
-				if (!id_card_reader.SynFindCard())
-				{
-					LOG_ERROR(L"未找到身份证或身份证验证失败！");
-					reply.error_code = StatusCode::ID_CARD_READER_VERIFY_FAILED;
-					break;
-				}
-				id_card_info = id_card_reader.SynReadCard();
-			}
-			catch (std::exception& ex)
+			if (!id_card_reader.VerifyCard())
 			{
-				LOG_FATAL(L"读取身份证信息失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::ID_CARD_READER_READ_FAILED;
+				LOG_ERROR(L"未找到身份证或身份证验证失败！");
+				reply.error_code = StatusCode::ID_CARD_READER_VERIFY_FAILED;
 				break;
 			}
-		} while (0);
-		id_card_reader.SynDisConnect();
-	}
-	break;
-	}
-	
-	if (boost::iequals(reply.error_code, StatusCode::OK))
-		LOG_TRACE(L"读取身份证信息成功。");
-
-	CDLBmpManager cBmp;
-	string sBmpData = cBmp.ReadBmp(wstr_2_str(id_card_info.portrait_img_path).c_str());
-	switch (u8IDReaderType)
-	{
-		case 0:
-		{
-			DeleteFile(id_card_info.portrait_img_path.c_str());
-			wstring sPath = id_card_info.portrait_img_path.substr(0, id_card_info.portrait_img_path.size() - 6);
-			DeleteFile((sPath + L"wz.txt").c_str());
-			DeleteFile((sPath + L"xp.wlt").c_str());
+			id_card_info = id_card_reader.ReadCard();
 		}
-		break;
-		case 1:
+		catch (std::exception& ex)
 		{
-			DeleteFile(id_card_info.portrait_img_path.c_str());
+			LOG_FATAL(L"读取身份证信息失败，错误信息： " + str_2_wstr(ex.what()));
+			reply.error_code = StatusCode::ID_CARD_READER_READ_FAILED;
+			break;
 		}
-		break;
-	}
-	
+	} while (0);
+	id_card_reader.Disconnect();
+	if (boost::iequals(reply.error_code, StatusCode::OK))
+		LOG_TRACE(L"读取身份证信息成功。");
  
 	reply.data.put("id", wstr_2_str(id_card_info.id_code));
 	reply.data.put("name", wstr_2_str(id_card_info.name)); // Use 'wstr_2_str' to convert to UTF-8 string.
@@ -422,178 +184,44 @@ ReadPINPadCmd::Reply ReadIDCardCmd::Execute(const std::string&amp; input)
 	reply.data.put("depart", wstr_2_str(id_card_info.depart));
 	reply.data.put("start_date", wstr_2_str(id_card_info.start_date));
 	reply.data.put("end_date", wstr_2_str(id_card_info.end_date));
-	reply.data.put("img_data", sBmpData);
 	return reply;
 }
  
 ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string& input)
 {
+	//临时只读基本信息 add by liuye 
+	LOG_TRACE(L"园区卡开卡操作。");
+	auto cCamCard = DLCamCardManager_();
 	Reply reply;
-	LOG_TRACE(L"卡片激活。");
-	
-	std::string card_sn;
-	std::string key_DCCK, key_F0015_DACK, key_F0015_DEAK, key_F0015_DAMK1, key_F0005_DAMK1;
 	DILICard::BasicInfo card_basic_info;
-	SecurityLevel slLevel = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
-	EncryptType etEncrypType = (EncryptType)ApplicationConfig::Instance().EncryptType();
-	auto& dili_card_device = DILICardRWDevice();
-	do 
+	try
 	{
-		try
-		{
-			dili_card_device.Connect();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
-			break;
-		}
-		try
-		{
-			dili_card_device.FindCard();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
-			break;
-		}
-
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
-			break;
-		}
-
-		if (dili_card_device.NeedCreateFile())
-		{
-			try
-			{
-				std::string key = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0";
-				dili_card_device.CreateCardFile("3f00", key, "df20", std::string(), 1);
-				dili_card_device.CreateCardFile("df20", key, "0025", "0324", 3);
-				dili_card_device.CreateCardFile("df20", key, "0026", "0709", 3);
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"创建文件失败失败，错误信息： " + str_2_wstr(ex.what()));
-			}
-		}
-
-		LOG_TRACE(L"计算SN。");
-		card_sn = stuCardBasicInfo.chip_num + std::string("44494c49") + stuCardBasicInfo.chip_num;
-
-		if (slLevel == HardwareCmd::SL_0)
-		{
-			stuCardBasicInfo.device_id = card_sn;
-			card_basic_info = stuCardBasicInfo;
-			reply.error_code = StatusCode::OK;
-			break;
-		}
-
-		if (etEncrypType == ET_PWM)
-		{
-			LOG_TRACE(L"加密机模式计算主控秘钥。");
-			const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
-			const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
-			const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
-
-			auto& pwd_machine = PWDMachine_();
-
-			if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
-			{
-				LOG_ERROR(L"连接加密机失败！");
-				reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
-			}
-
-			try
-			{
-				key_DCCK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kDCCK>(), card_sn, TIMEOUT);
-				key_F0015_DACK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DACK>(), card_sn, TIMEOUT);
-				key_F0015_DEAK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DEAK>(), card_sn, TIMEOUT);
-				key_F0015_DAMK1 = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DAMK1>(), card_sn, TIMEOUT);
-				key_F0005_DAMK1 = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DAMK1>(), card_sn, TIMEOUT);
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-
-			pwd_machine.Disconnect();
-		}
-		else if (etEncrypType == ET_DES)
-		{
-			LOG_TRACE(L"软加密模式计算主控秘钥。");
-			try
-			{
-				const char* pDCCKDL = "43434bff43434bff";
-				const char* pDACKDL = "41434bff41434bff";
-				const char* pDEAKDL = "45414bff45414bff";
-				const char* pDAMKDL = "414d4b31414d4b31";
-
-				unsigned char aucCardSNHex[16] = { 0 };
-				unsigned char aucDCCKDL[8] = { 0 }, aucDACKDL[8] = { 0 }, aucDEAKDL[8] = { 0 }, aucDAMKDL[8] = { 0 };
-				EncryptTools::StringToHex((unsigned char*)pDCCKDL, 16, aucDCCKDL);
-				EncryptTools::StringToHex((unsigned char*)pDACKDL, 16, aucDACKDL);
-				EncryptTools::StringToHex((unsigned char*)pDEAKDL, 16, aucDEAKDL);
-				EncryptTools::StringToHex((unsigned char*)pDAMKDL, 16, aucDAMKDL);
-				EncryptTools::StringToHex((unsigned char*)card_sn.c_str(), 32, aucCardSNHex);
-
-				unsigned char aucNewDAMKHex[16] = { 0 }, aucNewDCCKHex[16] = { 0 }, aucNewDACKHex[16] = { 0 }, aucNewDEAKHex[16] = { 0 };
-				unsigned char aucNewDAMK[32] = { 0 }, aucNewDCCK[32] = { 0 }, aucNewDACK[32] = { 0 }, aucNewDEAK[32] = { 0 };
-
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDAMKDL, aucNewDAMKHex);
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDCCKDL, aucNewDCCKHex);
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDACKDL, aucNewDACKHex);
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDEAKDL, aucNewDEAKHex);
-
-				EncryptTools::HexToChar(aucNewDAMKHex, 16, aucNewDAMK);
-				EncryptTools::HexToChar(aucNewDCCKHex, 16, aucNewDCCK);
-				EncryptTools::HexToChar(aucNewDACKHex, 16, aucNewDACK);
-				EncryptTools::HexToChar(aucNewDEAKHex, 16, aucNewDEAK);
-
-				std::string sDAMKKey((char*)aucNewDAMK, 32);
-				std::string sDCCKKey((char*)aucNewDCCK, 32);
-				std::string sDACKKey((char*)aucNewDACK, 32);
-				std::string sDEAKKey((char*)aucNewDEAK, 32);
-
-				key_F0005_DAMK1 = key_F0015_DAMK1 = sDAMKKey;
-				key_DCCK = sDCCKKey;
-				key_F0015_DACK = sDACKKey;
-				key_F0015_DEAK = sDEAKKey;
-				
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"软加密密钥失败");
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-		}
+		LOG_TRACE(L"连接读卡器。");
+		cCamCard.Connect();
+		LOG_TRACE(L"寻卡操作。");
+		cCamCard.FindAndResetCard();
+		LOG_TRACE(L"切换主目录。");
+		cCamCard.SelectMF();
+		LOG_TRACE(L"切换文件。");
+		cCamCard.SelectFile();
+		LOG_TRACE(L"读取卡片基本信息。");
+		card_basic_info = cCamCard.ReadCardBasicInfo();
+	}
+	catch (std::exception& ex)
+	{
+		reply.error_code = StatusCode::DILI_CARD_DEVICE_ACTIVATE_CARD_FAILED;
+		LOG_FATAL(L"读取园区卡信息失败，错误信息： " + str_2_wstr(ex.what()));
+	}
+	cCamCard.DisConnect();
  
-		try
-		{
-			dili_card_device.ActivateCard(card_sn, key_DCCK, key_F0015_DACK, key_F0015_DEAK, key_F0015_DAMK1);
-			card_basic_info = dili_card_device.ReadCardBasicInfo();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"卡片激活失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_ACTIVATE_CARD_FAILED;
-			break;
-		}
-		
-	} while (0);
-	
-	dili_card_device.Disconnect();
 	if (boost::iequals(reply.error_code, StatusCode::OK))
-		LOG_TRACE(L"卡片激活成功。");
+	{
+		LOG_TRACE(L"园区卡卡片激活成功。");
+	}
+	else
+	{
+		LOG_TRACE(L"园区卡卡片激活失败。");
+	}
  
 	reply.data.put("chipNo", card_basic_info.chip_num);
 	reply.data.put("deviceId", card_basic_info.device_id);
@@ -601,169 +229,44 @@ ReadPINPadCmd::Reply ActivateDILICardCmd::Execute(const std::string&amp; input)
 	reply.data.put("issuerCode", card_basic_info.issuer_code);
 	reply.data.put("verifyCode", card_basic_info.verify_code);
 	return reply;
+	//
 }
  
 ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string& input)
 {
-	//const uint8_t BEEP_TIME = 20; // 20 * 10ms
-	
-
-	LOG_TRACE(L"卡片撤销激活。");
-	auto& dili_card_device = DILICardRWDevice();
-	
+	//临时只读基本信息 add by liuye 
+	LOG_TRACE(L"撤销园区卡激活操作。");
+	auto cCamCard = DLCamCardManager_();
 	Reply reply;
-	std::string card_sn;
-	std::string key_DCCK, key_F0015_DACK;
 	DILICard::BasicInfo card_basic_info;
-
-	SecurityLevel slLevel = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
-	EncryptType etEncrypType = (EncryptType)ApplicationConfig::Instance().EncryptType();
-
-	do
+	try
 	{
-		try
-		{
-			dili_card_device.Connect();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
-			break;
-		}
-		try
-		{
-			dili_card_device.FindCard();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
-			break;
-		}
-
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
-			break;
-		}
-
-		if (slLevel == HardwareCmd::SL_0)
-		{
-			card_basic_info = stuCardBasicInfo;
-			reply.error_code = StatusCode::OK;
-			break;
-		}
-
-		//card_sn = stuCardBasicInfo.device_id;
-
-		LOG_TRACE(L"计算SN。");
-		if (slLevel == HardwareCmd::SL_1)
-		{
-			card_sn = stuCardBasicInfo.device_id;
-		}
-		else if (slLevel == HardwareCmd::SL_2)
-		{
-			card_sn = stuCardBasicInfo.chip_num + "44494c49" + stuCardBasicInfo.chip_num;
-		}
-
-		if (etEncrypType == ET_PWM)
-		{
-			LOG_TRACE(L"加密机模式计算主控秘钥。");
-			const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
-			const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
-			const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
-
-			auto& pwd_machine = PWDMachine_();
-
-			if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
-			{
-				LOG_ERROR(L"连接加密机失败！");
-				reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
-			}
-
-			try
-			{
-				key_DCCK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kDCCK>(), card_sn, TIMEOUT);
-				key_F0015_DACK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DACK>(), card_sn, TIMEOUT);
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-
-			pwd_machine.Disconnect();
-		}
-		else if (etEncrypType == ET_DES)
-		{
-			LOG_TRACE(L"软加密模式计算主控秘钥。");
-			try
-			{
-				const char* pDCCKDL = "43434bff43434bff";
-				const char* pDACKDL = "41434bff41434bff";
-
-				unsigned char aucCardSNHex[16] = { 0 };
-				unsigned char aucDCCKDL[8] = { 0 }, aucDACKDL[8] = { 0 };
-				EncryptTools::StringToHex((unsigned char*)pDCCKDL, 16, aucDCCKDL);
-				EncryptTools::StringToHex((unsigned char*)pDACKDL, 16, aucDACKDL);
-				EncryptTools::StringToHex((unsigned char*)card_sn.c_str(), 32, aucCardSNHex);
-
-				unsigned char aucNewDCCKHex[16] = { 0 }, aucNewDACKHex[16] = { 0 };
-				unsigned char aucNewDCCK[32] = { 0 }, aucNewDACK[32] = { 0 };
-
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDCCKDL, aucNewDCCKHex);
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDACKDL, aucNewDACKHex);
-
-				EncryptTools::HexToChar(aucNewDCCKHex, 16, aucNewDCCK);
-				EncryptTools::HexToChar(aucNewDACKHex, 16, aucNewDACK);
-
-				std::string sDCCKKey((char*)aucNewDCCK, 32);
-				std::string sDACKKey((char*)aucNewDACK, 32);
-
-				key_DCCK = sDCCKKey;
-				key_F0015_DACK = sDACKKey;
-
-			}
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"软加密密钥失败");
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-		}
-
-		if (slLevel == HardwareCmd::SL_2)
-		{
-			LOG_TRACE(L"验证卡片。");
-			if (!dili_card_device.AuthenticationKey(key_DCCK))
-			{
-				LOG_FATAL(L"秘钥验证失败，卡片需要升级！");
-				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE;
-				break;
-			}
-		}
-		
+		LOG_TRACE(L"连接读卡器。");
+		cCamCard.Connect();
+		LOG_TRACE(L"寻卡操作。");
+		cCamCard.FindAndResetCard();
+		LOG_TRACE(L"切换主目录。");
+		cCamCard.SelectMF();
+		LOG_TRACE(L"切换文件。");
+		cCamCard.SelectFile();
+		LOG_TRACE(L"读取卡片基本信息。");
+		card_basic_info = cCamCard.ReadCardBasicInfo();
+	}
+	catch (std::exception& ex)
+	{
+		reply.error_code = StatusCode::DILI_CARD_DEVICE_RESET_CARD_FAILED;
+		LOG_FATAL(L"读取园区卡信息失败，错误信息： " + str_2_wstr(ex.what()));
+	}
+	cCamCard.DisConnect();
  
-		try
-		{
-			dili_card_device.ResetCard(key_DCCK, key_F0015_DACK);
-			card_basic_info = dili_card_device.ReadCardBasicInfo();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"卡片撤销激活失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_RESET_CARD_FAILED;
-			break;
-		}
-	} while (0);
-	dili_card_device.Disconnect();
 	if (boost::iequals(reply.error_code, StatusCode::OK))
-		LOG_TRACE(L"卡片撤销激活成功。");
+	{
+		LOG_TRACE(L"撤销园区卡激活操作成功。");
+	}
+	else
+	{
+		LOG_TRACE(L"撤销园区卡激活操作失败。");
+	}
  
 	reply.data.put("chipNo", card_basic_info.chip_num);
 	reply.data.put("deviceId", card_basic_info.device_id);
@@ -771,243 +274,97 @@ ReadPINPadCmd::Reply ResetDILICardCmd::Execute(const std::string&amp; input)
 	reply.data.put("issuerCode", card_basic_info.issuer_code);
 	reply.data.put("verifyCode", card_basic_info.verify_code);
 	return reply;
+	//
 }
  
 ReadPINPadCmd::Reply ReadDILICardBasicInfoCmd::Execute(const std::string& input)
 {
-	LOG_TRACE(L"读取卡片基本信息。");
-	auto& dili_card_device = DILICardRWDevice();
+	//临时只读基本信息 add by liuye 
+	LOG_TRACE(L"读取园区卡基本信息操作。");
+	auto cCamCard = DLCamCardManager_();
 	Reply reply;
 	DILICard::BasicInfo card_basic_info;
-	do
+	try
 	{
-		try 
-		{ 
-			dili_card_device.Connect(); 
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
-			break;
-		}
-		try
-		{
-			dili_card_device.FindCard();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
-			break;
-		}
-
-		try { card_basic_info = dili_card_device.ReadCardBasicInfo(); }
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
-			break;
-		}
-
-		
-		if (SL_2 == ApplicationConfig::Instance().SecurityLevel())
-		{
-			LOG_TRACE(L"计算主控秘钥。");
-			std::string sSN = card_basic_info.chip_num + "44494c49" + card_basic_info.chip_num;
-			std::string sDCCK;
-
-			if (ET_DES == ApplicationConfig::Instance().EncryptType())
-			{
-				LOG_TRACE(L"软加密模式计算主控秘钥。");
-				const char* pDCCKDL = "43434bff43434bff";
-
-				unsigned char aucCardSNHex[16] = { 0 };
-				unsigned char aucDCCKDL[8] = { 0 };
-				EncryptTools::StringToHex((unsigned char*)pDCCKDL, 16, aucDCCKDL);
-				EncryptTools::StringToHex((unsigned char*)sSN.c_str(), 32, aucCardSNHex);
-
-				unsigned char aucNewDCCKHex[16] = { 0 };
-				unsigned char aucNewDCCK[32] = { 0 };
-
-				EncryptTools::Encrypt(aucCardSNHex, 16, aucDCCKDL, aucNewDCCKHex);
-
-				EncryptTools::HexToChar(aucNewDCCKHex, 16, aucNewDCCK);
-
-				std::string sDCCKKey((char*)aucNewDCCK, 32);
-				
-				sDCCK = sDCCKKey;
-			}
-			else if (ET_PWM == ApplicationConfig::Instance().EncryptType())
-			{
-				LOG_TRACE(L"加密机模式计算主控秘钥。");
-				const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
-				const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
-				const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
-
-				auto& pwd_machine = PWDMachine_();
-
-				if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
-				{
-					LOG_ERROR(L"连接加密机失败！");
-					reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
-				}
-
-				try
-				{
-					sDCCK = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kDCCK>(), sSN, TIMEOUT);
-				}
-				catch (std::exception& ex)
-				{
-					LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
-					reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-					break;
-				}
-				pwd_machine.Disconnect();
-			}
-
-			LOG_TRACE(L"验证卡片。");
-			if (!dili_card_device.AuthenticationKey(sDCCK))
-			{
-				LOG_FATAL(L"秘钥验证失败，卡片需要升级！");
-				reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_NOT_USE;
-				break;
-			}
-
-		}
-
-		if (dili_card_device.NeedCreateFile())
-		{
-			LOG_FATAL(L"卡片需要升级！");
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE;
-			//启动卡片升级程序 add by liuye
-			ShellExecute(NULL, L"open", L".\\DLCardTool.exe", NULL, NULL, SW_SHOW);
-			//
-		}
+		LOG_TRACE(L"连接读卡器。");
+		cCamCard.Connect();
+		LOG_TRACE(L"寻卡操作。");
+		cCamCard.FindAndResetCard();
+		LOG_TRACE(L"切换主目录。");
+		cCamCard.SelectMF();
+		LOG_TRACE(L"切换文件。");
+		cCamCard.SelectFile();
+		LOG_TRACE(L"读取卡片基本信息。");
+		card_basic_info = cCamCard.ReadCardBasicInfo();
+	}
+	catch (std::exception& ex)
+	{
+		reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
+		LOG_FATAL(L"读取园区卡信息失败，错误信息： " + str_2_wstr(ex.what()));
+	}
+	cCamCard.DisConnect();
  
-	} while (0);
-	dili_card_device.Disconnect();
-	if (boost::iequals(reply.error_code, StatusCode::OK) || boost::iequals(reply.error_code, StatusCode::DILI_CARD_DEVICE_NEED_UPDATE_CAN_USE))
-		LOG_TRACE(L"读取卡片基本信息成功。");
+	if (boost::iequals(reply.error_code, StatusCode::OK))
+	{
+		LOG_TRACE(L"读取园区卡信息成功。");
+	}
+	else
+	{
+		LOG_TRACE(L"读取园区卡信息失败。");
+	}
  
 	reply.data.put("chipNo", card_basic_info.chip_num);
 	reply.data.put("deviceId", card_basic_info.device_id);
 	reply.data.put("type", card_basic_info.type_code);
 	reply.data.put("issuerCode", card_basic_info.issuer_code);
 	reply.data.put("verifyCode", card_basic_info.verify_code);
-	g_sCardNum = card_basic_info.device_id;
 	return reply;
+	//
 }
  
 ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string& input)
 {
-	SecurityLevel slLevel = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
-	EncryptType etEncrypType = (EncryptType)ApplicationConfig::Instance().EncryptType();
+	const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
+	const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
+	const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
+	const uint8_t BEEP_TIME = 20; // 20 * 10ms
 	LOG_TRACE(L"读取卡片业务信息。");
 	auto& dili_card_device = DILICardRWDevice();
-	
+	auto& pwd_machine = PWDMachine_();
 	Reply reply;
-
-	//安全等级都为0了，还读个毛的业务信息，直接返回！
-	if (slLevel == HardwareCmd::SL_0)
-	{
-		reply.error_code == StatusCode::OK;
-		LOG_TRACE(L"读取卡片业务信息成功。");
-		return reply;
-	}
-
+	std::string card_sn;
 	std::string key_r;
 	std::string service_data;
 	do
 	{
-		try
-		{
-			dili_card_device.Connect();
-		}
-		catch (std::exception& ex)
+		if (!dili_card_device.Connect())
 		{
-			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
+			LOG_ERROR(L"打开CPU卡读卡器失败！");
 			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
 			break;
 		}
-		try
+		if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
 		{
-			dili_card_device.FindCard();
+			LOG_ERROR(L"连接加密机失败！");
+			reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
+			break;
 		}
+		dili_card_device.Beep(BEEP_TIME);
+		try { card_sn = dili_card_device.FindCard(); }
 		catch (std::exception& ex)
 		{
-			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
+			LOG_FATAL(L"查找卡片失败，错误信息： " + str_2_wstr(ex.what()));
 			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
 			break;
 		}
-
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
+		try { key_r = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DEAK>(), card_sn, TIMEOUT); }
 		catch (std::exception& ex)
 		{
-			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
+			LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
+			reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
 			break;
 		}
  
-		LOG_TRACE(L"计算SN。");
-		std::string sSN;
-		if (slLevel == HardwareCmd::SL_1)
-		{
-			sSN = stuCardBasicInfo.device_id;
-		}
-		else if (slLevel == HardwareCmd::SL_2)
-		{
-			sSN = stuCardBasicInfo.chip_num + "44494c49" + stuCardBasicInfo.chip_num;
-		}
-
-		if (etEncrypType == ET_PWM)
-		{
-			LOG_TRACE(L"加密机模式计算主控秘钥。");
-			auto& pwd_machine = PWDMachine_();
-			const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
-			const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
-			const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
-
-			if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
-			{
-				LOG_ERROR(L"连接加密机失败！");
-				reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
-				break;
-			}
-
-			try { key_r = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DEAK>(), sSN, TIMEOUT); }
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-
-			pwd_machine.Disconnect();
-		}
-		else if (etEncrypType == ET_DES)
-		{
-			LOG_TRACE(L"软加密模式计算主控秘钥。");
-			const char* pDEAKDL = "45414bff45414bff";
-
-			unsigned char aucCardSNHex[16] = { 0 };
-			unsigned char aucDEAKDL[8] = { 0 };
-			EncryptTools::StringToHex((unsigned char*)pDEAKDL, 16, aucDEAKDL);
-			EncryptTools::StringToHex((unsigned char*)sSN.c_str(), 32, aucCardSNHex);
-
-			unsigned char aucNewDEAKHex[16] = { 0 };
-			unsigned char aucNewDEAK[32] = { 0 };
-
-			EncryptTools::Encrypt(aucCardSNHex, 16, aucDEAKDL, aucNewDEAKHex);
-
-			EncryptTools::HexToChar(aucNewDEAKHex, 16, aucNewDEAK);
-
-			std::string sDEAKKey((char*)aucNewDEAK, 32);
-
-			key_r = sDEAKKey;
-		}
-
 		try { service_data = dili_card_device.ReadCardServiceInfo(key_r); }
 		catch (std::exception& ex)
 		{
@@ -1016,8 +373,8 @@ ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string&amp; inpu
 			break;
 		}
 	} while (0);
-	
 	dili_card_device.Disconnect();
+	pwd_machine.Disconnect();
 	if (boost::iequals(reply.error_code, StatusCode::OK))
 		LOG_TRACE(L"读取卡片业务信息成功。");
  
@@ -1027,152 +384,24 @@ ReadPINPadCmd::Reply ReadDILICardServiceInfoCmd::Execute(const std::string&amp; inpu
  
 ReadPINPadCmd::Reply WriteDILICardServiceInfoCmd::Execute(const std::string& input)
 {
-	const char DATA_SPLITER = ':';
-	SecurityLevel slLevel = (SecurityLevel)ApplicationConfig::Instance().SecurityLevel();
-	EncryptType etEncrypType = (EncryptType)ApplicationConfig::Instance().EncryptType();
-
-	LOG_TRACE(L"写入卡片业务信息。");
-	auto& dili_card_device = DILICardRWDevice();
-	
+	//临时方法，不写入业务数据 add by liuye 
 	Reply reply;
-	//std::string card_sn;
-	std::string key_w;
-	do
+	auto cCamCard = DLCamCardManager_();
+	DILICard::BasicInfo card_basic_info;
+	try
 	{
-		try
-		{
-			dili_card_device.Connect();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"连接读卡器失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CONNECT_FAILED;
-			break;
-		}
-
-		//安全等级都为0了，还写个毛的业务信息，直接返回！
-		if (slLevel == HardwareCmd::SL_0)
-		{
-			reply.error_code == StatusCode::OK;
-			LOG_TRACE(L"读取卡片业务信息成功。");
-			return reply;
-		}
-
-		try
-		{
-			dili_card_device.FindCard();
-		}
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"寻卡失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::CPU_CARD_DEVICE_CANNOT_FIND_CARD;
-			break;
-		}
-
-		DILICard::BasicInfo stuCardBasicInfo;
-		try { stuCardBasicInfo = dili_card_device.ReadCardBasicInfo(); }
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"读取卡片基本信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_READ_BASIC_INFO_FAILED;
-			break;
-		}
-		//card_sn = stuCardBasicInfo.device_id;
-
-		LOG_TRACE(L"计算SN。");
-		std::string sSN;
-		if (slLevel == HardwareCmd::SL_1)
-		{
-			sSN = stuCardBasicInfo.device_id;
-		}
-		else if (slLevel == HardwareCmd::SL_2)
-		{
-			sSN = stuCardBasicInfo.chip_num + "44494c49" + stuCardBasicInfo.chip_num;
-		}
-
-
-		std::size_t index = input.find(DATA_SPLITER);
-		if (std::string::npos == index) // NOT found.
-		{
-			LOG_ERROR(L"写入卡片业务信息失败，错误信息：请求数据错误。");
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED;
-			break;
-		}
-		std::string device_id = g_sCardNum;//用于办卡时，保证操作的卡片是同一张;
-		std::string service_data = input.substr(index + 1, input.size() - index - 1);
-
-		// 验证操作的是否是同一张卡，即device_id是否匹配
-		if (!boost::iequals(sSN, device_id))
-		{
-			LOG_ERROR(L"写卡卡片的序列号不匹配！");
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_UNMATCHED_CARD;
-			break;
-		}
-
-		if (etEncrypType == ET_PWM)
-		{
-			LOG_TRACE(L"加密机模式计算主控秘钥。");
-			auto& pwd_machine = PWDMachine_();
-
-			const std::string PWD_MACHINE_IP = ApplicationConfig::Instance().PWDMachineIP();
-			const uint32_t PWD_MACHINE_PORT = ApplicationConfig::Instance().PWDMachinePort();
-			const uint8_t TIMEOUT = ApplicationConfig::Instance().PWDMachineTimeout();
-
-			if (!pwd_machine.Connect(PWD_MACHINE_IP, PWD_MACHINE_PORT))
-			{
-				LOG_ERROR(L"连接加密机失败！");
-				reply.error_code = StatusCode::PWD_MACHINE_CONNECT_FAILED;
-				break;
-			}
-
-			try { key_w = pwd_machine.GetCardPassword(DILICard::CardKeyCode<DILICard::KeyCode::kF0015_DAMK1>(), sSN, TIMEOUT); }
-			catch (std::exception& ex)
-			{
-				LOG_FATAL(L"从加密机读取密钥失败，错误信息： " + str_2_wstr(ex.what()));
-				reply.error_code = StatusCode::PWD_MACHINE_GET_KEY_FAILED;
-				break;
-			}
-
-			pwd_machine.Disconnect();
-		}
-		else if (etEncrypType == ET_DES)
-		{
-			LOG_TRACE(L"软加密模式计算15写秘钥。");
-			const char* pDAMKDL = "414d4b31414d4b31";
-
-			unsigned char aucCardSNHex[16] = { 0 };
-			unsigned char aucDAMKDL[8] = { 0 };
-			EncryptTools::StringToHex((unsigned char*)pDAMKDL, 16, aucDAMKDL);
-			EncryptTools::StringToHex((unsigned char*)sSN.c_str(), 32, aucCardSNHex);
-
-			unsigned char aucNewDAMKHex[16] = { 0 };
-			unsigned char aucNewDAMK[32] = { 0 };
-
-			EncryptTools::Encrypt(aucCardSNHex, 16, aucDAMKDL, aucNewDAMKHex);
-
-			EncryptTools::HexToChar(aucNewDAMKHex, 16, aucNewDAMK);
-
-			std::string sDAMKKey((char*)aucNewDAMK, 32);
-
-			key_w = sDAMKKey;
-		}
-		
-		try { dili_card_device.WriteCardServiceInfo(key_w, service_data); }
-		catch (std::exception& ex)
-		{
-			LOG_FATAL(L"写入卡片业务信息失败，错误信息： " + str_2_wstr(ex.what()));
-			reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED;
-			break;
-		}
-
-		
-	} while (0);
-	
-	dili_card_device.Disconnect();
-	if (boost::iequals(reply.error_code, StatusCode::OK))
-		LOG_TRACE(L"写入卡片业务信息成功。");
-	reply.data.put("", "");
+		LOG_TRACE(L"连接读卡器。");
+		cCamCard.Connect();
+	}
+	catch (std::exception& ex)
+	{
+		reply.error_code = StatusCode::DILI_CARD_DEVICE_WRITE_SERVICE_INFO_FAILED;
+		LOG_FATAL(L"读取园区卡信息失败，错误信息： " + str_2_wstr(ex.what()));
+	}
+	cCamCard.DisConnect();
+	LOG_TRACE(L"写入业务数据操作成功！");
 	return reply;
+	//
 }
  
 ReadPINPadCmd::Reply ReadBankCardNumCmd::Execute(const std::string& input)
@@ -1207,3 +436,4 @@ ReadPINPadCmd::Reply ReadBankCardNumCmd::Execute(const std::string&amp; input)
 	reply.data.put("chipNo", bank_card_no);
 	return reply;
 }
+
@@ -18,21 +18,6 @@ public:
 		std::string error_code;
 	};
  
-	//卡片安全等级
-	enum SecurityLevel
-	{
-		SL_0 = 0, // 0表示最低级，不替换秘钥，不写入业务信息，不做安全认证
-		SL_1, // 等级1需要替换秘钥，写入业务信息，不做安全认证
-		SL_2  // 等级2需要替换秘钥，写入业务信息，需要安全认证
-	};
-
-	//秘钥加密方式
-	enum EncryptType
-	{
-		ET_PWM = 0, //加密机方式加密
-		ET_DES = 1	//des算法加密
-	};
-
 	virtual ~HardwareCmd() {}
  
 	/*Exception will be thrown if any error happens.*/
@@ -7,7 +7,6 @@
 #include "etradeclient/hardware/id_card_reader.h"
 #include "etradeclient/utility/application_config.h"
 #include "etradeclient/utility/string_converter.h"
-#include "ETradeClient/hardware/SynPublic.h"
  
 namespace
 {
@@ -20,7 +19,6 @@ namespace
 const std::string IDCardReader::ID_CARD_READER_HARDWARE_INFO = "China-Vision_CVR-100U";
  
 IDCardReader::IDCardReader()
-	:m_iPort(0)
 {
 	Init();
 }
@@ -147,108 +145,4 @@ void IDCardReader::GetPortraitPath(std::wstring&amp; portrait_path) const
 		throw std::exception("ID card portrait image does not exist.");
  
 	portrait_path = portrait_path_;
-}
-
-bool IDCardReader::SynConnect()
-{
-	bool bResult = true;
-	int iRet = 0;
-	
-	iRet = Syn_FindUSBReader();
-
-	if (iRet == 0)
-	{
-		bResult = false;
-	}
-	else
-	{
-		m_iPort = iRet;
-		if (Syn_OpenPort(m_iPort))
-		{
-			bResult = false;
-		}
-	}
-
-	return bResult;
-}
-
-bool IDCardReader::SynDisConnect()
-{
-	bool bResult = true;
-
-	if (m_iPort)
-	{
-		if (Syn_ClosePort(m_iPort))
-		{
-			bResult = false;
-		}
-	}
-	return bResult;
-}
-
-bool IDCardReader::SynFindCard()
-{
-	bool bResult = true;
-
-	do 
-	{
-		unsigned char aucIIN[4] = { 0 }, aucSN[8] = { 0 };
-		if (Syn_StartFindIDCard(m_iPort, aucIIN, 0))
-		{
-			bResult = false;
-			break;
-		}
-
-		if (Syn_SelectIDCard(m_iPort, aucSN, 0))
-		{
-			bResult = false;
-			break;
-		}
-	} while (0);
-
-	return bResult;
-}
-
-BOOL StringToWString(const std::string &str, std::wstring &wstr)
-{
-	int nLen = (int)str.length();
-	wstr.resize(nLen, L' ');
-	
-	int nResult = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)str.c_str(), nLen, (LPWSTR)wstr.c_str(), nLen);
-	
-	if (nResult == 0)
-	{
-		return FALSE;
-	}
-	return TRUE;
-}
-
-IDCardInfo IDCardReader::SynReadCard()
-{
-	IDCardInfo stuCardInfo;
-	IDCardData stuCardData;
-
-	char ctmp[256] = { 0 };
-	Syn_SetPhotoPath(1, ctmp);
-	Syn_SetPhotoName(2);
-	Syn_SetPhotoType(0);
-	Syn_SetSexType(1);
-	Syn_SetNationType(2);
-	Syn_SetBornType(3);
-
-	if (!Syn_ReadMsg(m_iPort, 0, &stuCardData))
-	{
-		StringToWString(stuCardData.Name, stuCardInfo.name);
-		StringToWString(stuCardData.Sex, stuCardInfo.gender);
-		StringToWString(stuCardData.Nation, stuCardInfo.nation);
-		StringToWString(stuCardData.Born, stuCardInfo.birth_date);
-		StringToWString(stuCardData.Address, stuCardInfo.address);
-		StringToWString(stuCardData.IDCardNo, stuCardInfo.id_code);
-		StringToWString(stuCardData.GrantDept, stuCardInfo.depart);
-		StringToWString(stuCardData.UserLifeBegin, stuCardInfo.start_date);
-		StringToWString(stuCardData.UserLifeEnd, stuCardInfo.end_date);
-		StringToWString(stuCardData.PhotoFileName, stuCardInfo.portrait_img_path);
-	}
-
-	return stuCardInfo;
 }
 \ No newline at end of file
@@ -41,21 +41,12 @@ public:
 	bool VerifyCard() const;
 	IDCardInfo ReadCard() const;
  
-	//新中新电子身份证读卡器接口 add by liuye 2017.10.24
-	bool SynConnect();
-	bool SynFindCard();
-	IDCardInfo SynReadCard();
-	bool SynDisConnect();
-	//
-
 private:
 	void Init(); // Load library to initialize all the function object.
 	bool DoConnect(int port_min, int port_max) const;
 	void GetCardField(ReadContentFieldFunc fn, std::wstring& field) const;
 	void GetPortraitPath(std::wstring& portrait_path) const;
  
-
-
 	InitCommFunc		m_init_comm_fn; // Function object to init the communitation with ID card reader.
 	CloseCommFunc		m_close_comm_fn; // Function object to close the communitation with ID card reader.
 	AuthenticateFunc	m_auth_fn; // Function object to authentication of the ID card reader.
@@ -71,8 +62,6 @@ private:
 	ReadContentFieldFunc m_get_start_date_fn;
 	ReadContentFieldFunc m_get_end_data_fn;
  
-	int m_iPort;
-
 	static const std::string ID_CARD_READER_HARDWARE_INFO; // Currently this field is not used.
 };
 #endif // ETRADECLIENT_HARDWARE_ID_CARD_READER_H_INCLUDED
@@ -18,7 +18,6 @@ END_MESSAGE_MAP()
  
 CConfigDialog::CConfigDialog(CWnd* pParent /*=NULL*/)
 	: CDialog(CConfigDialog::IDD, pParent)
-	, m_id_reader_type(0)
 {}
  
 static const int HTTP = 0, HTTPS = 1;
@@ -30,7 +29,7 @@ void CConfigDialog::DoDataExchange(CDataExchange* pDX)
 	const int kMinPortValue = 0, kMaxPortValue = 65535;
 	const int kMinMsgCountQueryInterval = 60, kMaxMsgCountQueryInterval = 3600;
 	const int kMinTimeoutMs = 100, kMaxTimeoutMs = 10000;
-	const int kMinTimeoutSeconds = 1, kMaxTimeoutSeconds = 15;
+	const int kMinTimeoutSeconds = 1, kMaxTimeoutSeconds = 10;
 	const int kMinPwdLen = 6, kMaxPwdLen = 32;
  
 	DDX_Text(pDX, IDC_EDIT_MSG_COUNT_QUERY_INTERVAL, m_msg_count_query_interval);
@@ -54,8 +53,6 @@ void CConfigDialog::DoDataExchange(CDataExchange* pDX)
  
 	DDX_Text(pDX, IDC_EDIT_PIN_PAD_TIMEOUT, m_pin_pad_timeout);
 	DDV_MinMaxInt(pDX, m_pin_pad_timeout, kMinTimeoutSeconds, kMaxTimeoutSeconds);
-	
-	DDX_Radio(pDX, IDC_RADIO_HUASHIDIANZI, m_id_reader_type);
 }
  
 void CConfigDialog::OnCbnSelchangeComboProtocol()
@@ -79,7 +76,6 @@ BOOL CConfigDialog::OnInitDialog()
 	m_pwd_machine_timeout	= app_config.PWDMachineTimeout();
 	m_pin_pad_pwd_len		= app_config.PINPadPWDLen();
 	m_pin_pad_timeout		= app_config.PINPadTimeout();
-	m_id_reader_type		= app_config.IDReaderType();
  
 	const URLConfig& url_config = URLConfig::Instance();
 	m_protocol_index = url_config.IsHttps() ? HTTPS : HTTP;
@@ -103,8 +99,7 @@ void CConfigDialog::OnOK()
 		m_pwd_machine_port,
 		m_pwd_machine_timeout,
 		m_pin_pad_pwd_len,
-		m_pin_pad_timeout,
-		m_id_reader_type);
+		m_pin_pad_timeout);
 	URLConfig::Instance().ModifyCfg((HTTPS == m_protocol_index), m_server_port);
  
 	return CDialog::OnOK();
@@ -35,5 +35,4 @@ private:
  
 	uint8_t			m_pin_pad_pwd_len;
 	uint8_t			m_pin_pad_timeout;
-	int				m_id_reader_type;
 };
@@ -29,9 +29,6 @@
 #include "etradeclient/utility/url_config.h"
 #include "etradeclient/utility/string_converter.h"
  
-#include "windows.h"
-#include "TimeAPI.h"
-
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -89,15 +86,9 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
  
 	ON_COMMAND_RANGE(ID_ISSUE_MEIGUI_CARD, ID_OPER_LOG_QUERY, OnMenuBtnClicked)
 	ON_COMMAND_RANGE(RELOAD, USER_ACCOUNT, OnToolBarBtnClicked)
-
+	
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired)
-	ON_MESSAGE(WM_UPDATE_USER_MSG_COUNT, OnGotMsgCount)
-
-	ON_UPDATE_COMMAND_UI(ID_INDICATOR_TIME, OnUpdateStateBar)
-
-	ON_WM_TIMER()
-
-	ON_MESSAGE(WM_TIME_TICK, UpdateTime)
+	ON_MESSAGE(WM_UPDATE_USER_MSG_COUNT,OnGotMsgCount)
 END_MESSAGE_MAP()
  
 static UINT indicators[] =
@@ -106,7 +97,6 @@ static UINT indicators[] =
 	ID_INDICATOR_CAPS,
 	ID_INDICATOR_NUM,
 	ID_INDICATOR_SCRL,
-	ID_INDICATOR_TIME
 };
  
 // CMainFrame construction/destruction
@@ -137,7 +127,7 @@ bool CMainFrame::Launch()
  
 void CMainFrame::UpdateStatus(LPCTSTR status)
 {
-	//m_status_bar.SetPaneText(0, status);
+	m_status_bar.SetPaneText(0, status);
 }
  
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
@@ -180,24 +170,6 @@ void CMainFrame::Dump(CDumpContext&amp; dc) const
  
 // CMainFrame message handlers
  
-UINT TimeTick(LPVOID lParam)
-{
-	CMainFrame* pDlg = (CMainFrame*)lParam;
-	DWORD dwStart, dwStop;
-	dwStop = timeGetTime();// 起始值和终止值
-	while (TRUE)
-	{
-		dwStart = dwStop;// 上一次的终止值变成新的起始值
-		::SendMessage(pDlg->m_hWnd, WM_TIME_TICK, 0, 0);//发送消息通知对话框该更新时间了
-		do
-		{
-			dwStop = timeGetTime();
-		} while (dwStop - 1000 < dwStart);
-	}
-	return 0;
-}
-
-
 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	do
@@ -212,14 +184,6 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			break;
 		if (!CreateMainFrmUI())
 			break;
-
-		AfxBeginThread(TimeTick, this);//这个级别高一点，用来更新时间
-		SetTimer(1, 60000, NULL);//这个级别低一点，用来从服务器获取时间
-
-		UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引  
-		m_status_bar.SetPaneText(nIndex, m_cTimeManager.GetServerTime());
-
-
 		return 0; // Return 0 if all succeed.
 	} while (0);
 	return -1; // Return -1 to indicate error happens.
@@ -304,10 +268,10 @@ void CMainFrame::OnInitMenuPopup(CMenu* pMenu, UINT nIndex, BOOL bSysMenu)
 		minfo.fMask = MIIM_FTYPE | MIIM_ID;
 		pMenu->GetMenuItemInfo(pos, &minfo, TRUE);
  
-		if ((minfo.fState & MFS_DISABLED) || (minfo.fState & MFS_UNCHECKED))
+		/*if ((minfo.fState & MFS_DISABLED) || (minfo.fState & MFS_UNCHECKED))
 		{
-			int i = 0;
-		}
+		int i = 0;
+		}*/
  
 		if (minfo.fType == MFT_SEPARATOR) // Don't handle the separator.
 			continue;
@@ -513,8 +477,6 @@ bool CMainFrame::CreateMainFrmUI()
 		}
 		m_status_bar.SetIndicators(indicators, sizeof(indicators) / sizeof(UINT));
  
-		//m_status_bar.SetPaneStyle(0, SBPS_NORMAL);
-
 		//@{
 		if (!CreateWebNaviToolBar())
 		{
@@ -814,33 +776,4 @@ LRESULT CMainFrame::OnCrashClose(WPARAM wParam, LPARAM lParam)
 	LOG_TRACE(L"崩溃程序关闭。");
 	CFrameWnd::OnClose();
 	return 0;
-}
-
-
-
-void CMainFrame::OnTimer(UINT_PTR nIDEvent)
-{
-	CString sTime;
-	if (nIDEvent == 1)
-	{
-		sTime = m_cTimeManager.GetServerTime();
-		UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引  
-		m_status_bar.SetPaneText(nIndex, sTime);
-	}
-
-	CFrameWnd::OnTimer(nIDEvent);
-}
-
-void CMainFrame::OnUpdateStateBar(CCmdUI *pCmdUI)
-{
-	pCmdUI->Enable();
-}
-
-LRESULT CMainFrame::UpdateTime(WPARAM wParam, LPARAM lParam)
-{
-	CString sTime = m_cTimeManager.UpdateTime();
-	UINT nIndex = m_status_bar.CommandToIndex(ID_INDICATOR_TIME);//获取时间指示器索引  
-	m_status_bar.SetPaneText(nIndex, sTime);
-
-	return NULL;
 }
 \ No newline at end of file
@@ -12,8 +12,6 @@
 #include "etradeclient/browser/user_msg_monitor.h"
 #include "etradeclient/utility/menu_res_auth_mgr.h"
  
-#include "etradeclient/utility/ETTimeManage.h"
-
 class CMainFrame : public CFrameWnd
 {
 	typedef std::map<uint32_t, HICON> MenuIconsType;
@@ -59,8 +57,6 @@ protected:
  
 	afx_msg LRESULT OnCrashClose(WPARAM wParam, LPARAM lParam);
  
-	afx_msg void OnUpdateStateBar(CCmdUI *pCmdUI);
-
 	DECLARE_MESSAGE_MAP()
  
 private:
@@ -98,15 +94,6 @@ private:
 	int					m_msg_count;
  
 	bool 				m_is_view_closing;
-
-	CETTimeManage		m_cTimeManager;
-	
-public:
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg LRESULT UpdateTime(WPARAM wParam, LPARAM lParam);
- 
-	
 };
  
  
@@ -48,18 +48,6 @@ ApplicationConfig::ApplicationConfig()
 		m_client_cert_subject = ptree.get<std::string>("client_cert_subject");
 		m_client_cert_filename = ptree.get<std::string>("client_cert_filename");
 		m_client_cert_password = ptree.get<std::string>("client_cert_password");
-		m_security_level = ptree.get<uint8_t>("security_level"); //安全等级，数值越大等级越高，0为最低级
-		m_encrypt_type = ptree.get<uint8_t>("encrypt_type"); //0为加密机加密，1为软加密
-		m_id_reader = ptree.get<uint8_t>("id_reader");//读卡器种类，0为华视电子，1为新中新电子
-		
-
-
-		//为了安全起见，目前只支持加密机加密一种模式 add by daxiong 2017.10.19
-		/*if (m_is_encrypt == 1)
-		{
-		m_encrypt_type = 0;
-		}*/
-		//
 	}
 	catch (...) // Catch the exception in order for logging.
 	{
@@ -73,8 +61,7 @@ void ApplicationConfig::ModifyCfg(uint32_t			msg_query_interval,
 								uint32_t			pwd_machine_port,
 								uint32_t			pwd_machine_time_out,
 								uint8_t				pin_pad_pwd_len,
-								uint8_t				pin_pad_timeout,
-								int					id_reader_type)
+								uint8_t				pin_pad_timeout)
 {
 	std::stringstream ss;
 	namespace PT = boost::property_tree;
@@ -85,7 +72,6 @@ void ApplicationConfig::ModifyCfg(uint32_t			msg_query_interval,
 	m_pwd_machine_timeout = pwd_machine_time_out;
 	m_pin_pad_pwd_len = pin_pad_pwd_len;
 	m_pin_pad_timeout = pin_pad_timeout;
-	m_id_reader = id_reader_type;
 	try
 	{
 		PT::ptree root;
@@ -99,10 +85,6 @@ void ApplicationConfig::ModifyCfg(uint32_t			msg_query_interval,
 		root.put("client_cert_subject", m_client_cert_subject);
 		root.put("client_cert_filename", m_client_cert_filename);
 		root.put("client_cert_password", m_client_cert_password);
-		root.put("security_level", m_security_level);
-		root.put("encrypt_type", m_encrypt_type);
-		root.put("id_reader", m_id_reader);
-		
  
 		PT::write_json(ss, root, true);
 	}
@@ -177,20 +159,4 @@ std::string ApplicationConfig::ClientCertFileName() const
 std::string ApplicationConfig::ClientCertPassword() const
 {
 	return m_client_cert_password;
-}
-
-uint8_t ApplicationConfig::SecurityLevel() const
-{
-	return m_security_level;
-}
-
-uint8_t ApplicationConfig::EncryptType() const
-{
-	return m_encrypt_type;
-}
-
-uint8_t ApplicationConfig::IDReaderType() const
-{
-	return m_id_reader;
-}
-
+}
 \ No newline at end of file
@@ -16,8 +16,7 @@ public:
 					uint32_t			pwd_machine_port,
 					uint32_t			pwd_machine_time_out,
 					uint8_t				pin_pad_pwd_len,
-					uint8_t				pin_pad_timeout,
-					int					id_reader_type);
+					uint8_t				pin_pad_timeout);
  
 	uint32_t MsgCountQueryInterval() const; // Return value in second.
 	std::string PWDMachineIP() const; // Don't worry about the cost of returning string object because we have RVO & move semantics.
@@ -29,10 +28,6 @@ public:
 	std::string ClientCertSubject() const;
 	std::string ClientCertFileName() const;
 	std::string ClientCertPassword() const;
-	uint8_t SecurityLevel() const;
-	uint8_t EncryptType() const;
-	uint8_t IDReaderType() const;
-	
 private:
 	ApplicationConfig();
 	ApplicationConfig(const ApplicationConfig&);
@@ -51,10 +46,5 @@ private:
 	std::string m_client_cert_subject;
 	std::string m_client_cert_filename;
 	std::string m_client_cert_password;
-
-	uint8_t		m_security_level;
-	uint8_t		m_encrypt_type;
-	uint8_t		m_id_reader;
-	
 };
 #endif // ETRADECLIENT_UTILITY_APPLICATION_CONFIG_H_INCLUDED
@@ -18,11 +18,7 @@ namespace
 	const int kBlockSize = 16;
 	const int kKeyLength = 16;// 128Bit
 	const std::array<unsigned char, kKeyLength> kUserKey{ { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'i', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'i' } };
-	const std::array<unsigned char, kKeyLength> kDCCK{ { '4', '3', '4', '3', '4', 'b', 'f', 'f', '4', '3', '4', '3', '4', 'b', 'f', 'f' } };
-	const std::array<unsigned char, kKeyLength> kDACK{ { '4', '1', '4', '3', '4', 'b', 'f', 'f', '4', '1', '4', '3', '4', 'b', 'f', 'f' } };
-	const std::array<unsigned char, kKeyLength> kDEAK{ { '4', '5', '4', '1', '4', 'b', 'f', 'f', '4', '5', '4', '1', '4', 'b', 'f', 'f' } };
-	const std::array<unsigned char, kKeyLength> kDAMK{ { '4', '1', '4', 'd', '4', 'b', '3', '1', '4', '1', '4', 'd', '4', 'b', '3', '1' } };
-
+	
 	class AesCbcInterface
 	{
 		typedef struct AesKeySt
@@ -43,15 +39,12 @@ namespace
 			size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
  
 	public:
-		AesCbcInterface(const std::array<unsigned char, kKeyLength>& user_key, const std::array<unsigned char, kKeyLength>& dcck, 
-			const std::array<unsigned char, kKeyLength>& dack, const std::array<unsigned char, kKeyLength>& deak, 
-			const std::array<unsigned char, kKeyLength>& damk)
-			: m_user_key(user_key), m_dcck_key(dcck), m_dack_key(dack), m_deak_key(deak), m_damk_key(damk)
+		AesCbcInterface(const std::array<unsigned char, kKeyLength>& user_key) : m_user_key(user_key)
 		{
 			Init();
 		}
  
-		const std::string Encrypt(const std::string& plaintext, int iKeyIndex = 0) const
+		const std::string Encrypt(const std::string& plaintext) const
 		{
 			unsigned char c_plaintext[kBlockSize];
 			unsigned char c_ciphertext[kBlockSize];
@@ -64,35 +57,8 @@ namespace
  
 			unsigned int kKeyBits = m_user_key.size() * 8;
 			AES_KEY aes_key;
-			switch (iKeyIndex)
-			{
-			case 0:
-			{
-				m_fn_aes_set_encrypt_key(m_user_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 1:
-			{
-				m_fn_aes_set_encrypt_key(m_dcck_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 2:
-			{
-				m_fn_aes_set_encrypt_key(m_dack_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 3:
-			{
-				m_fn_aes_set_encrypt_key(m_deak_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 4:
-			{
-				m_fn_aes_set_encrypt_key(m_damk_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			}
-			
+			m_fn_aes_set_encrypt_key(m_user_key.data(), kKeyBits, &aes_key);
+
 			std::string ciphertext;
 			ciphertext.append((char*)iv, kBlockSize);// 保存iv数据
  
@@ -129,7 +95,7 @@ namespace
 			return ciphertext;
 		}
  
-		const std::string Decrypt(const std::string& ciphertext, int iKeyIndex = 0) const
+		const std::string Decrypt(const std::string& ciphertext) const
 		{
 			unsigned char c_plaintext[kBlockSize];
 			unsigned char c_ciphertext[kBlockSize];
@@ -137,34 +103,7 @@ namespace
  
 			const int kKeyBits = m_user_key.size() * 8;
 			AES_KEY aes_key;
-			switch (iKeyIndex)
-			{
-			case 0:
-			{
-				m_fn_aes_set_decrypt_key(m_user_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 1:
-			{
-				m_fn_aes_set_decrypt_key(m_dcck_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 2:
-			{
-				m_fn_aes_set_decrypt_key(m_dack_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 3:
-			{
-				m_fn_aes_set_decrypt_key(m_deak_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			case 4:
-			{
-				m_fn_aes_set_decrypt_key(m_damk_key.data(), kKeyBits, &aes_key);
-				break;
-			}
-			}
+			m_fn_aes_set_decrypt_key(m_user_key.data(), kKeyBits, &aes_key);
  
 			std::string plaintext;
  
@@ -217,10 +156,6 @@ namespace
  
 	private:
 		const std::array<unsigned char, kKeyLength> m_user_key;
-		const std::array<unsigned char, kKeyLength> m_dcck_key;
-		const std::array<unsigned char, kKeyLength> m_dack_key;
-		const std::array<unsigned char, kKeyLength> m_deak_key;
-		const std::array<unsigned char, kKeyLength> m_damk_key;
  
 		HINSTANCE			m_dll_handle;
 		AesSetEncryptKey	m_fn_aes_set_encrypt_key;
@@ -230,21 +165,21 @@ namespace
  
 	const AesCbcInterface& GetAesCbcInterface()
 	{
-		static AesCbcInterface aes_cbc_interface(kUserKey, kDCCK, kDACK, kDEAK, kDAMK); // 出错会抛出异常
+		static AesCbcInterface aes_cbc_interface(kUserKey); // 出错会抛出异常
 		return aes_cbc_interface;
 	}
 }
  
 namespace AES_CBC
 {
-	std::string Encrypt(const std::string& plaintext, int iKeyIndex)
+	std::string Encrypt(const std::string& plaintext)
 	{
-		return GetAesCbcInterface().Encrypt(plaintext, iKeyIndex);
+		return GetAesCbcInterface().Encrypt(plaintext);
 	}
  
-	std::string Decrypt(const std::string& ciphertext, int iKeyIndex)
+	std::string Decrypt(const std::string& ciphertext)
 	{
-		return GetAesCbcInterface().Decrypt(ciphertext, iKeyIndex);
+		return GetAesCbcInterface().Decrypt(ciphertext);
 	}
  
 	void EncryptToFile(const std::string& plaintext, const std::string& ciphertext_file_name)
@@ -8,10 +8,9 @@
   exception message to std::wstring in Unicode encoding.*/
 namespace AES_CBC
 {
-	//iKeyIndex:0为默认加密配置文件秘钥，1为dcck秘钥，2为dack秘钥，3为deak秘钥，4为damk秘钥
-	std::string Encrypt(const std::string& plaintext, int iKeyIndex = 0);
+	std::string Encrypt(const std::string& plaintext);
  
-	std::string Decrypt(const std::string& ciphertext, int iKeyIndex = 0);
+	std::string Decrypt(const std::string& ciphertext);
  
 	void EncryptToFile(const std::string& plaintext, const std::string& ciphertext_file_name);
  
@@ -61,7 +61,6 @@ URLConfig::URLConfig()
 		m_user_msg_count_path = ptree.get<std::string>("user_msg_count_path");
 		m_user_msg_path = ptree.get<std::string>("user_msg_path");
 		m_modify_pwd_path = ptree.get<std::string>("modify_pwd_path");
-		m_server_time_path = ptree.get<std::string>("server_time_path");
 	}
 	catch (...) // Catch the exception in order for logging.
 	{
@@ -92,7 +91,6 @@ void URLConfig::ModifyCfg(bool is_https, uint16_t port)
 		root.put("user_msg_count_path", m_user_msg_count_path);
 		root.put("user_msg_path", m_user_msg_path);
 		root.put("modify_pwd_path", m_modify_pwd_path);
-		root.put("server_time_path", m_server_time_path);
 		PT::write_json(ss, root, true);
 	}
 	catch (...) // Catch the exception in order for logging.
@@ -168,8 +166,4 @@ std::string URLConfig::UserMsgPath() const
 std::string URLConfig::PwdModificationPath() const
 {
 	return m_modify_pwd_path;
-}
-std::string URLConfig::ServerTimePath() const
-{
-	return m_server_time_path;
 }
 \ No newline at end of file
@@ -29,7 +29,6 @@ public:
 	std::string UserMsgCountPath() const;
 	std::string UserMsgPath() const;
 	std::string PwdModificationPath() const;
-	std::string ServerTimePath() const;
 private:
 	URLConfig();
 	URLConfig(const URLConfig&);
@@ -46,6 +45,5 @@ private:
 	std::string m_user_msg_count_path;
 	std::string m_user_msg_path;
 	std::string m_modify_pwd_path;
-	std::string m_server_time_path;
 };
 #endif // ETRADECLIENT_UTILITY_URL_CONFIG_H_INCLUDED
@@ -91,7 +91,7 @@ WinHttp::Request WinHttp::OpenRequest(const Method&amp; method, const std::string&amp; r
 		break;
 	}
 	// Create an HTTP request handle.
-	HINTERNET handle = WinHttpOpenRequest(m_connect, method_name.c_str(), str_2_wstr(res_path/*res_path_test*/).c_str(),
+	HINTERNET handle = WinHttpOpenRequest(m_connect, method_name.c_str(), str_2_wstr(res_path).c_str(),
 		NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, m_is_https ? WINHTTP_FLAG_SECURE : 0);
 	if (!handle)
 	{
@@ -23,9 +23,7 @@
 #define WM_CEF_MSG_VIEW_CLOSE_BROWSER	(WM_USER + 117)
 #define WM_CRASH_CLOSE					(WM_USER + 118)
  
-#define WM_TIME_TICK					(WM_USER + 119)
-
-#define WM_UPDATE_USER_MSG_COUNT		(WM_USER + 300)
+#define WM_UPDATE_USER_MSG_COUNT		(WM_USER + 200)
  
  
  
@@ -25,10 +25,6 @@
 #define IDC_EDIT_MSG_COUNT_QUERY_INTERVAL 1013
 #define IDC_EDIT_PIN_PAD_LEN            1014
 #define IDC_EDIT_PIN_PAD_TIMEOUT        1015
-#define IDC_STATIC_IDREADER             1016
-#define IDC_RADIO_HUASHIDIANZI          1017
-#define IDC_RADIO2                      1018
-#define IDC_RADIO_XINZHONGXIN           1018
 #define ID_EXIT                         32782
 #define ID_MODIFY_PASSWORD              32801
 #define ID_MODIFY_CONFIG                32807
@@ -59,17 +55,16 @@
 #define ID_FEE_PAYMENT                  50160
 #define ID_SETTLE_ACCOUNTS_APPLY        50170
 #define ID_CUSTOMER_QUERY               50180
-#define ID_CUS_MANAGE                   50181
 #define ID_OPER_LOG_QUERY               50190
-#define ID_INDICATOR_TIME               59142
+#define ID_CUS_MANAGE                   50181
  
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        326
+#define _APS_NEXT_RESOURCE_VALUE        325
 #define _APS_NEXT_COMMAND_VALUE         32829
-#define _APS_NEXT_CONTROL_VALUE         1018
+#define _APS_NEXT_CONTROL_VALUE         1014
 #define _APS_NEXT_SYMED_VALUE           311
 #endif
 #endif