!10762 st2 2025.5 2轮

Merge pull request !10762 from 80174847/ST2

Module/mod_IDCertificate/IDCertificate_LogCode.h

@@ -0,0 +1,11 @@
+#pragma once
+#ifndef _IDCERTIFICATE_LOGCODE_H
+#define _IDCERTIFICATE_LOGCODE_H
+
+namespace IDCertificate {
+
+#define IDCertService_LogCode_OpenIDCerRFControl "QLR040220121"
+#define IDCertService_LogCode_CloseIDCerRFControl "QLR040220122"
+
+}
+#endif

Module/mod_gpio/GpioFSM.cpp

@@ -247,7 +247,7 @@ CSimpleStringA CombineJsonContext(const char* szMessage)
 	return  result;
 }
 
-CGPIOFSM::CGPIOFSM(void) :m_bVibrationFlag(false), m_bOpenFlag(false), m_bMoveFlag(false), m_bCardGateFlag(false)
+CGPIOFSM::CGPIOFSM(void) :m_ePickUpFlag(UnknownStatus),m_bVibrationFlag(false), m_bOpenFlag(false), m_bMoveFlag(false), m_bCardGateFlag(false)
 	, m_moveHoldTimes(0)
 	, m_moveDisappearTimes(0)
 	, m_bNewVersion(FALSE), m_bFuncVer2(FALSE), m_btLastRevcInput(-1), m_RecvErrTims(0)

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1974,6 +1974,15 @@ void CVtmLoaderFSM::CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDevi
 	CEntityStaticInfo staticInfo;
 	ErrorCodeEnum eErrCode = Error_Unexpect;
 	CSimpleStringA csEntityName = ctx->Req.entityName;
+
+	//oiltmp@20240415 to be delete after x months
+	if (ctx->Req.entityName.Compare("CardIssuer") == 0)
+	{
+		if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
+			csEntityName = "CardIssuerStore";
+		else
+			csEntityName = "CardIssuerStand";
+	}
 	
 	if ((eErrCode = m_pEntity->GetFunction()->GetEntityStaticInfo(csEntityName.GetData(), staticInfo)) != Error_Succeed)
 	{