Z991239-5948 #comment Opened标记的优化

Module/include/DevFSMCommBase.hpp

@@ -1030,6 +1030,10 @@ public:
 		return result;
  	}
 
+	virtual void SetDevInitFlag(bool val = true) { m_bOpened = val; }
+	bool GetDevInitFlag() const { return m_bOpened; }
+	bool GetDevInitingFlag() const { return m_bOpening; }
+
 	virtual void SetInWhatPage(int iPageType) { m_iInWhatPage = iPageType; }
 
 public:

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -908,8 +908,6 @@ public:
 	void SetCancelByRFICFlag(bool bCancel = true) { m_bCancelByRFIC = bCancel; }
 	CSimpleStringA GetPreOnlineICCardNo() { return m_currCardNo; }
 	void CloseAndClearDevObj(bool bCheckConnecting = true, bool bCloseOnly = false);
-	bool GetDevInitFlag() { return m_bOpened; }
-	bool GetDevInitingFlag() { return m_bOpening; }
 
 	void SetEnterMainPage();
 	static void HttpsLogCallBack(const char* logtxt);

Module/mod_ContactlessCard/ContactlessFSM.h

@@ -282,8 +282,6 @@ public:
 	bool GetWaitFlag(){return m_bWaitingAccept;}
 	void SetWaitMore(){m_bWaitAccepteMore = true;}
 	void SetExitFlag(bool bFlag=true){m_bExit = bFlag;}
-	bool GetDevInitFlag() { return m_bOpened; }
-	bool GetDevInitingFlag() { return m_bOpening; }
 	void ToLogWarnInfoAboutTermCustom();
 	bool LoadCMBPrint(CSimpleStringA csBinPath);
 	void GetCardProcessLastErr(ErrorCodeEnum& eErrCode, CSimpleStringA& lastApiName, CSimpleStringA& alarmMsg, CSimpleStringA& csErrMsgWithReturnCode);

Module/mod_FingerPrint/FingerPrintFSM.h

@@ -272,8 +272,6 @@ public:
 	ErrorCodeEnum GetDevState(int &state);
 
 	int Initial();
-	bool GetDevInitFlag() { return m_bOpened; }
-	bool GetDevInitingFlag() { return m_bOpening; }
 
 	DevStateEnum GetDevState(){
 		return m_devState;

Module/mod_IDCertificate/IDCertFSM.h

@@ -252,10 +252,6 @@ public:
 	{
 		pTransactionContext->SendAnswer(Error_Succeed);
 	}
-
-	bool GetDevInitFlag() { return m_bOpened; }
-	void ResetDevInitFlag() { m_bOpened = false; }
-
 	int Initial();
 	void SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext);
 

Module/mod_cardissuerstore/CardIssuerFSM.h

@@ -1268,9 +1268,6 @@ public:
 	void SetCancelByRFICFlag(bool bCancel = true) { m_bCancelByRFIC = bCancel; }
 	CSimpleStringA GetPreOnlineICCardNo() { return m_currCardNo; }
 	void CloseAndClearDevObj(bool bCheckConnecting = true, bool bCloseOnly = false);
-	bool GetDevInitFlag() { return m_bOpened; }
-	bool GetDevInitingFlag() { return m_bOpening; }
-
 	void SetEnterMainPage();
 	static void HttpsLogCallBack(const char* logtxt);
 	//0:unknow（havn't access microservice or access failed），1：both mag & ic ，2：mag only，3：ic only

Module/mod_pinpad/PinPadFSM.h

@@ -216,8 +216,6 @@ public:
 	bool Get12Account(char *szAcc);
 	int GetInput(SpReqAnsContext<PinPadService_GetInputSM_Req, PinPadService_GetInputSM_Ans>::Pointer ctxSM);
 	ErrorCodeEnum GetEncryptText(SpReqAnsContext<PinPadService_GetInputSM_Req, PinPadService_GetInputSM_Ans>::Pointer ctxSM);
-	bool GetDevInitFlag(){ return m_bOpened;}
-	bool GetDeviceOpeningFlag() { return m_bOpening; }
 	void SetExitFlag(){m_bExit = true;}
 	bool GetEntityExit() { return m_bEntityExit;}
 	void SetCtx(SpReqAnsContext<PinPadService_GetInputSM_Req, PinPadService_GetInputSM_Ans>::Pointer ctxSM)

Module/mod_pinpad/mod_PinPad.h

@@ -172,7 +172,7 @@ public:
 	}
 	void GetDevInfo(SpReqAnsContext<PinPadService_GetDevInfo_Req, PinPadService_GetDevInfo_Ans>::Pointer ctx)
 	{
-		if (m_fsm.GetDeviceOpeningFlag())
+		if (m_fsm.GetDevInitingFlag())
 			ctx->Answer(Error_NotInit, PinPad_UserErrorCode_PinPad_DevOpenFailed);
 		else if (m_fsm.GetDevInitFlag())
 		{