Преглед изворни кода

#IQRV #comment [CustMngr] SpTest等移除

80374374 пре 5 месеци
родитељ
комит
b810f1b3ee
2 измењених фајлова са 1 додато и 41 уклоњено
  1. 1 30
      Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp
  2. 0 11
      Module/mod_CustMngrAuth/mod_CustMngrAuth.h

+ 1 - 30
Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -819,6 +819,7 @@ void CCustMngrAuthFSM::DeleteBmp(int type)
 	}
 }
 
+//TODO: CrossPlaform  [Gifur@2025630]
 ErrorCodeEnum CCustMngrAuthFSM::DeleteFileIfExisted(const char* fileName)
 {
 #ifdef RVC_OS_WIN
@@ -912,40 +913,10 @@ void CCustMngrAuthFSM::BroadcastGetFinger(int status)
 	SpSendBroadcast(GetEntityBase()->GetFunction(), SP_MSG_OF(GetFinger), SP_MSG_SIG_OF(GetFinger), evt);
 }
 
-
-
-
-
 #pragma endregion
 
 #pragma region invoked function
 
-//ErrorCodeEnum CCustMngrAuthFSM::WaitForUkey(ErrorCodeEnum eErr)
-//{
-//	//与朱毅约定,4表示本地无指纹数据,3表示指纹仪实体异常(包括旧接口的其他错误码和新接口的Error_HardWare)
-//	//4: no data in local, 3:enitty exception
-////	DbgInfo(CSimpleStringA::Format("WaitForUkey, eErr:%d(0x%x)", eErr, eErr));
-//	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("WaitForUkey, eErr:%d(0x%x)", eErr, eErr);
-//	int status = (eErr == Error_NoTarget) ? 4 : 3;
-//	BroadcastGetFinger(status);
-//	while (1) {
-//#ifdef RVC_OS_WIN
-//		Sleep(300);
-//#else
-//		SLEEP(300);
-//#endif
-//		if (m_bCancelAuthorize) {
-//			m_bCancelAuthorize = false;
-//			if (m_bAuthorizeTimeout){
-//				m_bAuthorizeTimeout = false;
-//				return Error_TimeOut;
-//			}
-//			else
-//				return Error_Cancel;
-//		}
-//	}
-//}
-
 void CCustMngrAuthFSM::CancelAuthorize()
 {
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Invoke m_pFingerPrint->CancelMatch()");

+ 0 - 11
Module/mod_CustMngrAuth/mod_CustMngrAuth.h

@@ -4,12 +4,6 @@
 #pragma once
 
 #include "SpBase.h"
-#ifdef RVC_OS_WIN
-#else
-#include "SpTest.h"
-#include "modVer.h"
-#endif
-
 #include "CustMngrAuth_server_g.h"
 #include "CustMngrAuth_def_g.h"
 #include "CustMngrAuthFSM.h"
@@ -45,12 +39,7 @@ public:
 	virtual ~CCustMngrAuthEntity(){}
 	
 	virtual const char *GetEntityName() const;
-#ifdef RVC_OS_WIN
-#else
-	virtual const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
-	ON_ENTITYT_TEST();
-#endif
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext);
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause, CSmartPointer<ITransactionContext> pTransactionContext);
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError);