Browse Source

Z991239-1263 #comment pinpad析构时退出等待及适配器前缀加lib other:pinpad析构时退出等待及适配器前缀加lib

杨诗友80174847 5 years ago
parent
commit
8772f24896
2 changed files with 6 additions and 2 deletions
  1. 1 1
      Module/include/GetDevInfoHelper.h
  2. 5 1
      Module/mod_pinpad/PinPadFSM.h

+ 1 - 1
Module/include/GetDevInfoHelper.h

@@ -344,7 +344,7 @@ ErrorCodeEnum SpGetDevAdaptorPath(CEntityBase *pCallerEntity,
 			(const char*)strDepPath,
 			(const char*)strDevAdaptorPath);
 #else
-		strDevAdaptorPath = CSimpleStringA::Format("%s/%s.so",
+		strDevAdaptorPath = CSimpleStringA::Format("%s/lib%s.so",
 			(const char*)strDepPath,
 			(const char*)strDevAdaptorPath);
 #endif

+ 5 - 1
Module/mod_pinpad/PinPadFSM.h

@@ -228,7 +228,11 @@ public:
 		, m_csAlarmMsg("NO more information"), m_bRVCIL(false), m_keySN(""),m_keySNSM(""){
 			HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x206);
 	}
-	~CPinPadFSM(){}
+	~CPinPadFSM(){
+		Dbg("~CPinPadFSM");
+		m_bEntityExit = true;
+		m_hInputConVar.Broadcast();
+	}
 	virtual ErrorCodeEnum OnInit();
 	virtual ErrorCodeEnum OnExit();