#IQRV #comment ToLogRootINIInfo移除

Module/include/DevFSMCommBase.hpp

@@ -611,16 +611,6 @@ public:
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("PinPad", 0x20600207));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("Gpio", 0x20900201));
 		m_WarnCodeMap.insert(std::make_pair<std::string, DWORD>("HSPScanner", 0x21700207));
-
-		m_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>("FingerPrint", 0x20400229));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("IDCertificate", 0x2010021f));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("PinPad", 0x2060021f));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("Gpio", 0x20900203));
-		m_RootIniCodeMap.insert(std::make_pair<std::string, DWORD>("HSPScanner", 0x2170020f));
-
 	}
 
 	ErrorCodeEnum GetAndSplitDevErrInfo(
@@ -798,49 +788,6 @@ public:
 
 #endif //_MSC_VER
 
-	void ToLogRootINIInfoOnce()
-	{
-        CSmartPointer<IConfigInfo> spConfig;
-		this->GetEntityBase()->GetFunction()->OpenConfig(Config_Cache, spConfig);
-		CSimpleStringA entityName(this->GetEntityBase()->GetEntityName());
-		int nUploadTime(0);
-		spConfig->ReadConfigValueInt("RootUploadFlag", entityName, nUploadTime);
-        SYSTEMTIME stNow = CSmallDateTime::GetNow().ToSystemTime();
-        SYSTEMTIME lastUploadTime = CSmallDateTime(nUploadTime).ToSystemTime();
-        if (lastUploadTime.wYear != stNow.wYear || lastUploadTime.wMonth != stNow.wMonth || lastUploadTime.wDay != stNow.wDay) {
-			ToLogRootINIInfo();
-			spConfig->WriteConfigValue("RootUploadFlag", entityName, CSimpleStringA::Format("0x%08X", (DWORD)CSmallDateTime::GetNow()));
-        }
-	}
-
-	void ToLogRootINIInfo()
-	{
-		CSimpleStringA entityName(this->GetEntityBase()->GetEntityName());
-		std::map<std::string, std::string> rootInfo;
-		rootInfo["File"] = m_adapterInfo.strPureAdapterName.GetData();
-		rootInfo["Vendor"] = m_adapterInfo.strVendor.GetData();
-		rootInfo["Version"] = m_adapterInfo.strVersion.GetData();
-		rootInfo["Batch"] = m_adapterInfo.strBatch.GetData();
-		rootInfo["Port"] = m_adapterInfo.strPort.GetData();
-		rootInfo["Baudrate"] = m_adapterInfo.strBaudrate.GetData();
-
-		if (!entityName.Compare("Gpio")) {
-			rootInfo["PortNum"] = m_adapterInfo.strPortNum.GetData();
-		} else if (!entityName.Compare("PinPad")) {
-			rootInfo["Checkdata"] = m_adapterInfo.strCheckdata.GetData();
-			rootInfo["Keysn"] = m_adapterInfo.strKeysn.GetData();
-		}
-
-        std::pair<bool, std::string> strResult;
-        strResult = generateJsonStr(rootInfo);
-        if (!entityName.IsNullOrEmpty()) {
-            LogWarn(Severity_Low, Error_Debug, m_RootIniCodeMap[entityName.GetData()], strResult.second.c_str());
-        } else {
-            DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Entity Name is empty, please check!!!");
-        }
-        return;
-	}
-
 	/** upload adapter file's hash value and open param as well as dev category information, return if information has uploaded this time*/
 	bool ToLogWarnInfoAboutTerm()
 	{
@@ -1143,9 +1090,7 @@ protected:
 	virtual void OnHardwareShakeHand(CSmartPointer<ITransactionContext> pTransactionContext);
 
 private:
-
 		std::map<std::string, DWORD> m_WarnCodeMap;
-		std::map<std::string, DWORD> m_RootIniCodeMap;
 };
 
 template<class TFSM, class TDevClass>

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -1540,7 +1540,6 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 		if (eErrDev == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpenEx").setCostTime(l_endTime - l_beginTime)("OpenDevice::DevOpenEx, openType:%d, connectType:%d", btOpenType, m_connectType);
-			ToLogRootINIInfo();
 			SetDevInitFlag(true);
 			m_devOpenFailedCount = 0;
 			ZeroMemory(m_devCat.szModel, sizeof(m_devCat.szModel));

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -598,7 +598,6 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 		if (hr == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(l_endTime - l_beginTime)("ContactlessCard DevOpen succ , dwPort:%d, dwBaudRate:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
-			ToLogRootINIInfo();
 			SetDevInitFlag();
 			ZeroMemory(m_devCatInfo.szModel, sizeof(m_devCatInfo.szModel));
 			ZeroMemory(m_devCatInfo.szType, sizeof(m_devCatInfo.szType));

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -359,7 +359,6 @@ int CFingerPrintFSM::Initial()
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(l_endTime - l_beginTime)("Initial::DevOpen  port: %d, baudrate: %d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt());
 		}
 		SetDevInitFlag();
-		ToLogRootINIInfo();
 	} while (false);
 	ZeroMemory(m_devCatInfo.szModel, MAX_DEV_MODEL_LEN);
 	ZeroMemory(m_devCatInfo.szType, MAX_DEV_TYPE_LEN);

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -236,7 +236,6 @@ ErrorCodeEnum CHSPScannerFSM::OnInit()
 	if (erroCode == Error_Succeed) {
 		if (Error_Succeed == (erroCode = TryToOpenDevice())) {
 			SetDevState(DEVICE_STATUS_NORMAL);
-			ToLogRootINIInfo();
 			ToLogWarnInfoAboutTerm();
 			return erroCode;
 		}

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1920,7 +1920,6 @@ int CIDCertFSM::Initial()
 		m_hDevHelper.TearDown();
 		return 2;
 	}
-	ToLogRootINIInfo();
 	memset(m_devCatInfo.szModel, 0, MAX_DEV_MODEL_LEN);
 	memset(m_devCatInfo.szType, 0, MAX_DEV_TYPE_LEN);
 	memset(m_devCatInfo.szVendor, 0, MAX_DEV_VENDOR_LEN);

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -1825,7 +1825,6 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 		if (eErrDev == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpenEx").setCostTime(l_endTime - l_beginTime)("OpenDevice::DevOpenEx, openType:%d, connectType:%d", btOpenType, m_connectType);
-			ToLogRootINIInfo();
 			SetDevInitFlag();
 			m_devOpenFailedCount = 0;
 			ZeroMemory(m_devCat.szModel, sizeof(m_devCat.szModel));

Module/mod_gpio/GpioFSM.cpp

@@ -304,7 +304,6 @@ ErrorCodeEnum CGPIOFSM::OnInit()
 		ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (err == Error_Succeed) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(ullEnd - ullStart)("open device succ");
-			ToLogRootINIInfo();
 			DevCategoryInfo devCatInfo;
 			ZeroMemory(devCatInfo.szModel, sizeof(devCatInfo.szModel));
 			ZeroMemory(devCatInfo.szType, sizeof(devCatInfo.szType));

Module/mod_pinpad/PinPadFSM.cpp

@@ -351,7 +351,6 @@ int CPinPadFSM::Initial()
 		if (eErr == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(m_ullEndTime - m_ullBeginTime)();
-			ToLogRootINIInfo();
 			initTries = 0;
 			ErrorCodeEnum errCode3, errCode4;
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();