Explorar o código

#IQRV #comment 卡机实体名改为 CardIssuerStand

80374374 hai 1 ano
pai
achega
dbc5828ae7
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 1 1
      Module/include/DevEntityCommBase.hpp
  2. 3 3
      Module/include/DevFSMCommBase.hpp

+ 1 - 1
Module/include/DevEntityCommBase.hpp

@@ -156,7 +156,7 @@ inline ErrorCodeEnum CDevAdptEntityBase::ExtractVendorLibName()
 	if (IS_SUCCEED(erroCode)) 
 	{
 		CSimpleStringA strDeviceEntityName = GetEntityName();
-		if (strDeviceEntityName.Compare("CardIssuerStore", true) == 0) {
+		if (strDeviceEntityName.Compare("CardIssuerStore", true) == 0 || strDeviceEntityName.Compare("CardIssuerStand", true) == 0) {
 			strDeviceEntityName = "CardIssuer";
 		}
 		CSimpleStringA strSection = CSimpleStringA("Device.") + strDeviceEntityName;

+ 3 - 3
Module/include/DevFSMCommBase.hpp

@@ -693,7 +693,7 @@ class CCommDevFSM : public FSMImpl<TFSM>
 public:
 	CCommDevFSM() :m_FirstStart(TRUE), m_bOpened(false), m_bOpening(false), m_csAlarmMsg("No more information"), m_contiErrTimes(0)
 	{
-		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuer", 0x2030021f));
+		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStand", 0x2030021f));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStore", 0x2200021f));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("ContactlessCard", 0x21300203));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("CardSwiper", 0x20200207));
@@ -705,7 +705,7 @@ public:
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("WatchDog", 0x20d00201));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("Ups", 0x20e00201));
 
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuer", 0x20300299));
+		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStand", 0x20300299));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardIssuerStore", 0x22000299));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("ContactlessCard", 0x21300224));
 		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("CardSwiper", 0x20200238));
@@ -775,7 +775,7 @@ public:
 		this->GetEntityBase()->GetFunction()->OpenConfig(Config_Root, spConfigRoot);
 
 		CSimpleStringA entityName(this->GetEntityBase()->GetEntityName());
-		if (entityName.Compare("CardIssuerStore", true) == 0) {
+		if (entityName.Compare("CardIssuerStore", true) == 0 || entityName.Compare("CardIssuerStand", true) == 0) {
 			entityName = "CardIssuer";
 		}
 		CSimpleStringA sectionName = CSimpleStringA::Format("Device.%s", entityName.GetData());