Z991239-5221 #comment 删除实体对CardSwiper，CardIssuer的引用

Module/mod_healthmanager/CMakeLists.txt

@@ -29,7 +29,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${ModuleCommonHeadPath}
 	${MODULE_BASE_DIR}/mod_heartbeat
-	${MODULE_BASE_DIR}/mod_cardswiper
 	${MODULE_BASE_DIR}/mod_ContactlessCard
 	${MODULE_BASE_DIR}/mod_DeviceControl
 	${MODULE_BASE_DIR}/mod_ups

Module/mod_healthmanager/mod_healthmanager.h

@@ -155,10 +155,7 @@ public:
 		//UpgradeManager
 
 #if defined(RVC_OS_WIN)
-		GetFunction()->SubscribeLog(m_uuidCardSwiper, this, Log_Event, Severity_Middle, Error_IgnoreAll, -1, "CardSwiper");
 		GetFunction()->SubscribeLog(m_uuidPublic, this, Log_Event, Severity_Middle, Error_IgnoreAll, -1, "PinPad");
-        GetFunction()->SubscribeLog(m_uuidCardSwiper, this, Log_Error, Severity_Middle, Error_IgnoreAll, -1, "CardSwiper");
-		GetFunction()->SubscribeBroadcast("CardSwiper", "", this, m_uuidCardSwiper);
 		GetFunction()->SubscribeLog(m_uuid4SIPPhone, this, Log_Event, Severity_High, Error_IgnoreAll, -1, "SIPPhone");
 #endif //RVC_OS_WIN
 
@@ -277,7 +274,7 @@ private:
 	//the following is useless?just one var is ok? oiltmp
 	CUUID m_uuidUpdate,m_uuidMediaController,m_uuidFaceTracking,m_uuidAccessAuth,m_uuidSelfChecker
 		, m_uuidRemoteController, m_uuidGUIConsole, m_uuidHeartBeat, m_uuidIE, m_uuidCenterS, m_uuidVtmLoader;
-	CUUID m_uuidCardSwiper,m_uuidPublic, m_uuid4SIPPhone;
+	CUUID m_uuidPublic, m_uuid4SIPPhone;
 	int m_devCfgNum,m_connectStatus;
 	int m_restartHour, m_restartMinute, m_lastHour, m_restartTimes, m_maxRestartTimes, m_preDay, m_dayNum, m_maxRunDays, m_guardianCount;
 	bool m_bInit, m_bWaitRestartPC, m_bScreenLock, m_bToRestart, m_testFlag, m_bSayIdle

Module/mod_selfchecker/CMakeLists.txt

@@ -14,7 +14,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${ModuleCommonHeadPath}
 	${MODULE_BASE_DIR}/mod_heartbeat
-	${MODULE_BASE_DIR}/mod_cardswiper
 	${MODULE_BASE_DIR}/mod_ContactlessCard
 	${MODULE_BASE_DIR}/mod_assistantchannel
 )

Module/mod_selfchecker/SelfCheckerFSM.cpp

@@ -268,7 +268,7 @@ ErrorCodeEnum CSelfCheckerFSM::CheckEntity(const char* pszEntityName, EntityTest
 		{
 			//the hardward entity and some other entity no need to test
 			if (_strnicmp("PinPad", pszEntityName, strlen("PinPad")) == 0 || _strnicmp("CardIssuer", pszEntityName, strlen("CardIssuer")) == 0
-				|| _strnicmp("CardSwiper", pszEntityName, strlen("CardSwiper")) == 0 || _strnicmp("ContactlessCard", pszEntityName, strlen("ContactlessCard")) == 0
+				|| _strnicmp("ContactlessCard", pszEntityName, strlen("ContactlessCard")) == 0
 				|| _strnicmp("IDCertificate", pszEntityName, strlen("IDCertificate")) == 0
 				|| _strnicmp("gpio", pszEntityName, strlen("gpio")) == 0 || _strnicmp("HSPScanner", pszEntityName, strlen("HSPScanner")) == 0
 				|| _strnicmp("FingerPrint", pszEntityName, strlen("FingerPrint")) == 0

Module/mod_selfchecker/mod_selfchecker.h

@@ -62,11 +62,9 @@ public:
 		}
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("regist entity event ok.");
 		GetFunction()->SubscribeLog(m_uuidCardIsuuer,this,Log_Error,Severity_High,Error_IgnoreAll,-1,NULL,false);
-		GetFunction()->SubscribeLog(m_uuidCardSwiper,this,Log_Event,Severity_High,Error_IgnoreAll,-1,"CardSwiper",false);
-		GetFunction()->SubscribeLog(m_uuidCardSwiper, this, Log_Error, Severity_Middle, Error_IgnoreAll, -1, "CardSwiper");
 		GetFunction()->RegistSysVarEvent("UIState", this);
 		GetFunction()->RegistSysVarEvent("TerminalStage", this);
-		m_csQueryStateEntity = "CardIssuer,CardSwiper,IDCertificate,PinPad,MediaController,CounterConnector";
+		m_csQueryStateEntity = "CardIssuer,IDCertificate,PinPad,MediaController,CounterConnector";
 		CSmartPointer<IConfigInfo> spCenterConfig;
 		CSimpleStringA csQueryStateEntity(true);
 		///**TODO(Gifur@1/9/2023): Ôö¼Ó¼¯ÖÐÅäÖà */
@@ -133,7 +131,7 @@ private:
 	CSelfCheckerFSM m_fsm;
 	map<CSimpleStringA,EntityProcessInfo> m_entityProcInfo;
 	bool m_bIEIdle, m_bEverInMainPage, m_bGetEntityList;
-	CUUID m_uuidCardIsuuer,m_uuidCardSwiper,m_uuidPinPad,m_uuidIDCertificate,m_uuidMedia;
+	CUUID m_uuidCardIsuuer,m_uuidPinPad,m_uuidIDCertificate,m_uuidMedia;
 	CSimpleStringA m_csQueryStateEntity;
 	vector<CSimpleStringA> m_vQueryStateEntity;
 	ErrorCodeEnum RestartModule(const char* pEntityName);