#IQRV #comment 去除无用的变量配置

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -1402,8 +1402,6 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
 	m_csMachineType = sysInfo.strMachineType;
 	m_terminalNo = sysInfo.strTerminalID;
-	m_majorVerion = sysInfo.MachineVersion.GetMajor();
-	m_minorVerion = sysInfo.MachineVersion.GetMinor();
 
 	m_devStatus.eMedia = CI_MEDIA_NOTPRESENT;
 	m_bHasHopper[0] = false;

Module/mod_CardIssuerStand/CardIssuerStandFSM.h

@@ -1101,7 +1101,6 @@ private:
 	int m_issueStatusFromFile, m_issueStatus/*the status maybe changed by Business call*/;
 	//1:default, 2:SCI, 3:no cfg
 	int m_machineType;
-	WORD m_majorVerion, m_minorVerion;
 	int m_currentHopper,m_devOpenFailedCount;
 	int m_maxSlot,m_findCard,m_cardPos,m_currentFSMState,m_maxRetainCount, m_eacQueryFlag/*accout query*/
 		,m_ICRetryTimes;

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -32,14 +32,16 @@ void CCardReadAdapterFSM::s0_on_entry()
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
 	m_csMachineType = sysInfo.strMachineType;
 	m_terminalNo = sysInfo.strTerminalID;
-	m_majorVerion = sysInfo.MachineVersion.GetMajor();
-	m_minorVerion = sysInfo.MachineVersion.GetMinor();
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("machineType:%s,terminalNo:%s,machineVersion:%d.%d", (const char*)m_csMachineType, (const char*)m_terminalNo
-	, m_majorVerion, m_minorVerion);
 	m_eMachineType = SpStr2MachineType(sysInfo.strMachineType);
+	/** test  [Gifur@202587]*/
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("machinType:%d", m_eMachineType);
+	m_csMachineType = "";
+	GetEntityBase()->GetFunction()->GetMachineType(&m_csMachineType);
+	/** test done  [Gifur@202587]*/
 
-	FSMEvent *pEvt;
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("machineType:%s,terminalNo:%s", (const char*)m_csMachineType, (const char*)m_terminalNo);
 
+	FSMEvent *pEvt;
 	pEvt = new FSMEvent(USER_EVT_INIT);
 	PostEventFIFO(pEvt);
 }

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -842,7 +842,6 @@ private:
 	//0:all; 1:CardIssuerStand or CardIssuerStore; 2:ContactlessCard
 	int m_lastModule,m_lastS2Event, m_lastS2EvtParam1;
 	MachineTypeEnum m_eMachineType;
-	WORD m_majorVerion,m_minorVerion;
 	///
 	int m_resetTimes;
 	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -652,12 +652,6 @@ ErrorCodeEnum CContactlessCardFSM::OnInit()
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2J19")("create card process failed.");
 		return Error_Resource;
 	}
-
-	CSystemStaticInfo sysInfo;
-	m_csMachineType = "";
-	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
-	m_csMachineType = sysInfo.strMachineType;
-
 	m_bOpening = true;
 	ErrorCodeEnum errCode = Load();
 	
@@ -785,8 +779,6 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 	}
 	else
 	{
-		m_devInit = true;
-		//LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Success, "非接读卡器打开成功");
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("非接读卡器打开成功");
 		return Error_Succeed;
 	}

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -279,7 +279,7 @@ public:
 
 		CContactlessCardFSM() : m_bCancelAccept(false), m_bWaitingAccept(false),
 		m_bWaitAccepteMore(false), m_bExit(false), m_resetTimes(0), m_testResult(Error_Succeed)
-		, m_bCDA(false), m_pDataToARQC(NULL), m_csMachineType(true), m_csDevNo(""), m_devInit(false), m_repeatErrTimes(0),
+		, m_bCDA(false), m_pDataToARQC(NULL), m_repeatErrTimes(0),
 		m_bCancelRead(false),m_bPageExit(false), m_bNeedReset(true)
 		{
 			HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x213); 
@@ -389,9 +389,8 @@ private:
 	int m_resetTimes;
 	lpCMBdecodeMag2 cmdDecodeMag2;
 	lpCMBdecodeEx cmdDecodeEx;	
-	bool m_devInit, m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit;
+	bool m_bCancelAccept, m_bWaitingAccept, m_bWaitAccepteMore, m_bExit;
 	ErrorCodeEnum m_testResult;
-	CSimpleStringA m_csMachineType;
 	DevCategoryInfo m_devCatInfo;
 
 	
@@ -403,8 +402,6 @@ private:
 
 	char m_AuthCode[2];
 	bool m_bCDA;
-	CSimpleStringA m_csDevNo;
-
 	int SplitTrack2(CSimpleStringA pTrack2,Track2Data &decodeData);
 
 	int m_repeatErrTimes;

Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -434,16 +434,6 @@ ErrorCodeEnum CCustMngrAuthFSM::OnInit()
 {
 	LOG_FUNCTION();
 	m_authCtx.eAuthByWhich = AuthByNone;
-
-	CSystemStaticInfo staticInfo;
-	m_pEntity->GetFunction()->GetSystemStaticInfo(staticInfo);
-	m_TerminalID = staticInfo.strTerminalID;
-	m_csMachineType = staticInfo.strMachineType;
-	m_FingerSection = "FingerInfo";
-	CSimpleStringA machineVersion = CSimpleStringA::Format("%d.%d", staticInfo.MachineVersion.GetMajor(), staticInfo.MachineVersion.GetMinor());
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CustMngrAuth m_csMachineType:%s, machineVersion:%s, TerminalNo:%s",
-			m_csMachineType.GetData(), machineVersion.GetData(), m_TerminalID.GetData());
-
 	return Error_Succeed;
 }
 
@@ -456,25 +446,9 @@ ErrorCodeEnum CCustMngrAuthFSM::OnExit()
 
 int CCustMngrAuthFSM::Initial()
 {
-	ErrorCodeEnum errCode = OpenRunInfoFile();
-	if (errCode != Error_Succeed) {
-		return 1;
-	}
 	return 0;
 }
 
-ErrorCodeEnum CCustMngrAuthFSM::OpenRunInfoFile()
-{
-	ErrorCodeEnum errCode;
-	errCode = GetEntityBase()->GetFunction()->GetPath("RunInfo", m_RunInfoPath);
-	if (errCode != Error_Succeed)
-	{
-		LogWarn(Severity_High, Error_DevLoadFileFailed, LOG_ERR_CUSTMNGRAUTH_GET_RUNINFO_PATH_FAILED_Init, "get runinfo path failed while init");
-		errCode =  Error_Unexpect;
-	}	
-	return errCode;
-}
-
 #pragma endregion
 
 #pragma region Registe process

Module/mod_CustMngrAuth/CustMngrAuthFSM.h

@@ -495,9 +495,6 @@ public:
 	SpReqAnsContext<CustMngrAuthService_StartAuthorize_Req, CustMngrAuthService_StartAuthorize_Ans>::Pointer m_ctx;
 	SpReqAnsContext<CustMngrAuthService_QueryAuthorInfo_Req, CustMngrAuthService_QueryAuthorInfo_Ans>::Pointer qaInfoCtx;
 	AuthContext m_authCtx;
-	CSimpleStringA m_TerminalID;
-	CSimpleStringA m_csMachineType;
-
 	
 	ErrorCodeEnum MatchFingerPrintEx(SpReqAnsContext<CustMngrAuthService_QueryAuthorInfo_Req, CustMngrAuthService_QueryAuthorInfo_Ans>::Pointer ctx, bool& bStopAuthorize, DWORD& dwUserErrCode);
 	
@@ -515,14 +512,10 @@ public:
 	void DeleteBmp(int type);
 	ErrorCodeEnum DeleteFileIfExisted(const char* fileName);
 
-	ErrorCodeEnum OpenRunInfoFile();//Initial使用
-	
 	//在旧dep路径下找到文件时告警，未继承CCommDevFSM,单独实现
 	void UpdateAndWarnFileFindInDepBak(CSimpleStringA& newDepPath, const char* filename, DWORD userCode);
 
 #pragma region 废弃的方法
-
-
 	ErrorCodeEnum MatchFingerPrint(SpReqAnsContext<CustMngrAuthService_StartAuthorize_Req, CustMngrAuthService_StartAuthorize_Ans>::Pointer ctx, bool& bStopAuthorize);//废弃的方法
 	ErrorCodeEnum CollectFingerPrint(SpReqAnsContext<CustMngrAuthService_CollectFingerPrint_Req, CustMngrAuthService_CollectFingerPrint_Ans>::Pointer ctx, DWORD& dwUserErrCode);//废弃的方法
 	ErrorCodeEnum CollectFingerPrintEx(SpReqAnsContext<CustMngrAuthService_CollectFingerPrintEx_Req, CustMngrAuthService_CollectFingerPrintEx_Ans>::Pointer ctx, DWORD& dwUserErrCode);//废弃的方法
@@ -533,12 +526,6 @@ public:
 private:
 	
 	FingerPrintService_ClientBase *m_pFingerPrint;
-
-
-	CSimpleStringA m_FingerSection;//人脸特征路径
-	CSimpleStringA m_RunInfoPath;
-
-
 	bool m_bCancelCollectFP, m_bCancelAuthorize, m_bAuthorizeTimeout;
 	int m_TimeLimit;
 

Module/mod_CustMngrAuth/CustMngrAuth_UserErrorCode.h

@@ -8,7 +8,6 @@
 #define LOG_ERR_CUSTMNGRAUTH_FEATUPDATE_CONNECT_FAILED				0x10200204	//连接分行服务失败（连续60次连接不上（30min），报错一次） - LogWarn
 #define LOG_ERR_CUSTMNGRAUTH_AUTHORIZATION_READFEAT_FAILED			0x10200205	//读文件数据到内存失败 - LogWarn
 #define LOG_ERR_CUSTMNGRAUTH_READ_INTO_MEMORY_TIME					0x10200206	//读文件到内存耗时 - LogWarn
-#define LOG_ERR_CUSTMNGRAUTH_GET_RUNINFO_PATH_FAILED_Init			0x10200207	//初始化时获取运行时路径失败 - LogWarn
 
 #define LOG_ERR_CUSTMNGRAUTH_INVOKE_MATCH							0x10200208	//web调用旧的比对接口 - LogWarn
 #define LOG_ERR_CUSTMNGRAUTH_INVOKE_MATCHEx							0x10200209	//web调用后端比对接口 - LogWarn

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -350,16 +350,6 @@ unsigned CFingerPrintFSM::s3_on_event(FSMEvent* e)
 
 ErrorCodeEnum CFingerPrintFSM::OnInit()
 {
-	CSystemStaticInfo sysInfo;
-	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
-	m_csMachineType = sysInfo.strMachineType;
-	WORD majorVersion = sysInfo.MachineVersion.GetMajor();
-	WORD minorVersion = sysInfo.MachineVersion.GetMinor();
-	m_machineVersion = CSimpleStringA::Format("%d.%d", majorVersion, minorVersion);
-	m_terminalNo = sysInfo.strTerminalID;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("MachineType:%s, machineVersion:%s, terminalNo: %s",
-		m_csMachineType.GetData(), m_machineVersion.GetData(), m_terminalNo.GetData()));
-
 	auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
 	pEntity->LoadVendorLibName();
 	return Error_Succeed;

Module/mod_FingerPrint/FingerPrintFSM.h

@@ -293,7 +293,7 @@ public:
 	END_FSM_RULE()
 
 	CFingerPrintFSM():m_bCancelRegister(false), m_bCancelMatch(false), m_bExit(false),
-					  m_testResult(Error_Succeed),m_csMachineType(""), m_terminalNo(""), m_machineVersion(""),
+					  m_testResult(Error_Succeed),
 					  m_bCancelScan(false), m_bExitMainPage(false)
 					{	
 						HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x204); 
@@ -346,7 +346,6 @@ private:
 	bool m_bCancelRegister;
 	bool m_bCancelMatch;
 	bool m_bExit;
-	CSimpleStringA m_csMachineType, m_terminalNo, m_machineVersion;
 	
 public:
 	int GetFingerPrintJS(SpReqAnsContext<FingerPrintService_GetFingerPrintJS_Req, FingerPrintService_GetFingerPrintJS_Ans>::Pointer ctx);

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -1128,11 +1128,6 @@ void CIDCertFSM::DeleteZP(int type, int deleteTiming)
 int CIDCertFSM::Initial()
 {
 	LOG_FUNCTION();
-	CSystemStaticInfo sysInfo;
-	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
-	m_csMachineType = sysInfo.strMachineType;
-	m_terminalNo = sysInfo.strTerminalID;
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("machineType:%s,terminalNo:%s", (const char*)m_csMachineType, (const char*)m_terminalNo);
 	SetDevState(DEVICE_STATUS_NOT_READY);
 	auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
 

Module/mod_IDCertificate/IDCertFSM.h

@@ -229,7 +229,7 @@ public:
 	END_FSM_RULE()
 
 		CIDCertFSM() :m_bCancelRead(false), m_bReading(false),
-		m_bExit(false), m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect), m_csMachineType(""), m_terminalNo(""), transImgMsg("")
+		m_bExit(false), m_testResult(Error_Succeed), m_getDevCategory(Error_Unexpect),transImgMsg("")
 	{
 		ZeroMemory(&m_adapterInfo, sizeof(m_adapterInfo));
 		HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x201);
@@ -309,7 +309,6 @@ private:
 	ErrorCodeEnum m_testResult;
 	ErrorCodeEnum m_getDevCategory;
 	DevCategoryInfo m_devCatInfo;
-	CSimpleStringA m_csMachineType, m_terminalNo;
 	CSimpleStringA transImgMsg;
 #ifdef RVC_OS_WIN
 	unordered_map<int, wstring> nationalCode; 

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -934,11 +934,10 @@ BOOL CAccessAuthEntity::SetLocalTimeZoneByKeyName(const TCHAR* szTimeZoneKeyName
 #endif // RVC_OS_WIN
 }
 
-bool CAccessAuthEntity::IsMachineTypeConfigurePinPad(CSimpleStringA strMachineType)
+bool CAccessAuthEntity::IsMachineTypeConfigurePinPad(const CSimpleStringA& strMachineType)
 {
 	CSmartPointer<IConfigInfo> spConfig;
-	ErrorCodeEnum Error = GetFunction()->OpenConfig(Config_CenterSetting, spConfig);
-
+	GetFunction()->OpenConfig(Config_CenterSetting, spConfig);
 	CSimpleStringA mcType = CSimpleStringA("CoreBootList.") + strMachineType;
 	CSimpleStringA loaderConifg("");
 	ErrorCodeEnum errCode = spConfig->ReadConfigValue("VtmLoader", mcType.GetData(), loaderConifg);

Module/mod_accessauth/mod_AccessAuth.h

@@ -83,7 +83,7 @@ public:
 	// 是否使用PinPad
 	bool HasPinPad();
 	// 机型是否配置密码键盘
-	bool IsMachineTypeConfigurePinPad(CSimpleStringA strMachineType);
+	bool IsMachineTypeConfigurePinPad(const CSimpleStringA& strMachineType);
 
 	int GetPinPadCapability();
 

Module/mod_pinpad/PinPadFSM.cpp

@@ -25,11 +25,6 @@ const int CurrentPasswordLen = 6;//according to guodan, we only use 6
 ErrorCodeEnum CPinPadFSM::OnInit()
 {
 	m_bOpening = true;
-	CSystemStaticInfo sysInfo;
-	m_csMachineType = m_terminalNo = "";
-	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
-	m_csMachineType = sysInfo.strMachineType;
-	m_terminalNo = sysInfo.strTerminalID;
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Source Code complied at: %s %s", __DATE__, __TIME__);
 	_beginthreadex(NULL,0,DoWork,(void*)this,0,NULL);
 
@@ -280,6 +275,7 @@ int CPinPadFSM::Initial()
 	ErrorCodeEnum eErrDev;
 	auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
 
+	CSystemStaticInfo m_sysStaticInfo;
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(m_sysStaticInfo);
 	m_deviceNo = m_sysStaticInfo.strTerminalID;
 	m_devCheckData = "0000000000000000";

Module/mod_pinpad/PinPadFSM.h

@@ -173,8 +173,7 @@ public:
 		m_bEntityExit(false), m_bPinInput(false), m_bLoadKey(false), m_bEncrypt(false)
 		, m_dwDevCommFailCount(0), m_dwPinPadRunCount(0), m_encryptkey(1)
 		, m_bSM(false), m_bSMLoaded(false), m_szModel(""), m_szType("")
-		, m_szVendor(""),m_csMachineType(true), m_terminalNo(true)
-		, m_bPinInputJS(false), m_bUseBackupSN(true), m_bSetParamOnce(false){
+		, m_szVendor(""), m_bPinInputJS(false), m_bUseBackupSN(true), m_bSetParamOnce(false){
 			HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x206);
 			ZeroMemory(&m_adapterInfo, sizeof(m_adapterInfo));
 	}
@@ -292,8 +291,8 @@ private:
 	DWORD m_dwDevCommFailCount,m_dwPinPadRunCount;
 	
 	int m_encryptkey;
-	CSimpleStringA m_csMachineType, m_terminalNo,m_lastCheckCode;
-	CSystemStaticInfo m_sysStaticInfo;
+	CSimpleStringA m_lastCheckCode;
+	
 };
 
 struct InitTask : public ITaskSp