#IQRV #comment: 细化IDCerRFControl的报错信息，通过时上下文context区分是打开时还是关闭时的调用

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -910,7 +910,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 	if (eErr1 != Error_Succeed)
 	{
 		SetErrorAndLog(eErr1, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-			false, m_ullEndTime - m_ullBeginTime);
+			false, m_ullEndTime - m_ullBeginTime, "", SetRFControlContext(false).GetData());
 	}
 	else
 	{
@@ -939,7 +939,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 		else if (!bOpenRF)
 		{
 			SetErrorAndLog(errRfOpen, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8);
+				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8, SetRFControlContext(true).GetData());
 			ctx->Answer(Error_TimeOut, GetAlarmDEC());
 		}
 		else
@@ -1367,7 +1367,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 	if (eErr1 != Error_Succeed)
 	{
 		SetErrorAndLog(eErr1, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-			false, m_ullEndTime - m_ullBeginTime);
+			false, m_ullEndTime - m_ullBeginTime, "", SetRFControlContext(false).GetData());
 	}
 	else
 	{
@@ -1398,7 +1398,7 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 		else if (!bOpenRF)
 		{
 			SetErrorAndLog(errRfOpen, MEC_DEVAPI_IDCER_IDCerRFControl, "DevAdapter::IDCerRFControl", __FUNCTION__,
-				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS);
+				true, m_ullEndTime - m_ullBeginTime, IDCertService_LogCode_ReadAndScanUTF8JS, SetRFControlContext(true).GetData());
 			//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Open IDCerRFControl(Timeout) failed: %s", SpStrError(errRfOpen));
 
 			ctx->Answer(Error_TimeOut, GetAlarmDEC());
@@ -2137,6 +2137,26 @@ CSimpleStringA CIDCertFSM::GetFileLastModifyTime(CSimpleStringA filePath)
 #endif
 }
 
+CSimpleStringA CIDCertFSM::SetRFControlContext(bool bControl)
+{
+	CSimpleStringA keyContext = "";
+	if (bControl) //true
+	{
+		keyContext = "OpenIDCerRFControl";
+	}
+	else //false
+	{
+		keyContext = "CloseIDCerRFControl";
+	}
+	std::map<std::string, std::string> msgInfo;
+	msgInfo["Key"] = keyContext.GetData();
+	std::pair<bool, std::string> strResult;
+	strResult = generateJsonStr(msgInfo);
+	CSimpleStringA rfContext = strResult.second.c_str();
+
+	return rfContext;
+}
+
 #ifdef RVC_OS_WIN
 void CIDCertFSM::HttpsLogCallBack(const char* logtxt)
 {

Module/mod_IDCertificate/IDCertFSM.h

@@ -240,6 +240,8 @@ public:
 	int ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCert_ReadAndScanUTF8_Ans>::Pointer ctx); 
 	int ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req, IDCert_ReadAndScanUTF8JS_Ans>::Pointer ctx);
 
+	CSimpleStringA SetRFControlContext(bool bControl);
+
 	int WaitFetchIDCard();
 	void SetReadMore(){m_bWaitReadMore = true;}
 	void SetExitFlag(){m_bExit = true;}