#IQRV #comment 高拍仪日志调整

Module/include/DevFSMCommBase.hpp

@@ -827,9 +827,9 @@ public:
 		//oilyang@20200525 if have been set ErrorCode of entity defined (not device),use it directly
 		DWORD dwCode = GetAlarmDEC();
 
-		const CSimpleStringA alarmMsg = CSimpleStringA::Format("{\"Function\":\"%s\", \"DevApi\":\"%s\", \"returnCode\":\"%s\", \"Msg\":\"%s\", \"context\":\"%s\"}"
+		const CSimpleStringA alarmMsg = CSimpleStringA::Format("{\"Function\":\"%s\", \"DevApi\":\"%s\", \"ReturnCode\":\"%s\", \"Msg\":\"%s\", \"Context\":\"%s\"}"
 			, funPath.GetData(), devApi.GetData(), SpStrError(m_errPkgEx.errCode), csErrMsg.GetData(), context.GetData());
-		CSimpleStringA csErrMsgWithReturnCode = CSimpleStringA::Format("{\"returnCode\":%s, \"errMsg\":\"%s\", \"context\":\"%s\"}", SpStrError(errCode), csErrMsg.GetData(), context.GetData()).GetData();
+		CSimpleStringA csErrMsgWithReturnCode = CSimpleStringA::Format("{\"ReturnCode\":\"%s\", \"ErrMsg\":\"%s\", \"Context\":\"%s\"}", SpStrError(errCode), csErrMsg.GetData(), context.GetData());
 		CSimpleStringA tmpRTA(true), tmpDesc(true);
 		if (this->GetEntityBase()->GetFunction()->GetVTMErrMsg(dwCode, tmpDesc, tmpRTA) != Error_Succeed)
 			tmpRTA = CSimpleStringA::Format("%d", dwCode);//if map failed, use dwCode instead

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -168,9 +168,9 @@ LPCTSTR CHSPScannerFSM::MapCode2RTAString(DWORD dwValue)
 	}
 }
 
-int Param_Color_Map[4] = { 0, HSPS_COLOR_FULL , HSPS_COLOR_GREY , 0 };
-int Param_Rotate_Map[5] = { 0, HSPS_ROTATE_NOANGLE , HSPS_ROTATE_LEFT , HSPS_ROTATE_MIRROR,HSPS_ROTATE_RIGHT };
-int Param_Scan_Map[4] = { 0, HSPS_SCAN_FULL , HSPS_SCAN_A4 , HSPS_SCAN_IDCARD };
+ParamTypeValue Param_Color_Map[4] = { HSPS_COLOR_FULL, HSPS_COLOR_FULL , HSPS_COLOR_GREY , HSPS_COLOR_FULL };
+ParamTypeValue Param_Rotate_Map[5] = { HSPS_ROTATE_NOANGLE, HSPS_ROTATE_NOANGLE , HSPS_ROTATE_LEFT , HSPS_ROTATE_MIRROR,HSPS_ROTATE_RIGHT };
+ParamTypeValue Param_Scan_Map[4] = { HSPS_SCAN_FULL, HSPS_SCAN_FULL , HSPS_SCAN_A4 , HSPS_SCAN_IDCARD };
 
 
 
@@ -1908,6 +1908,7 @@ ErrorCodeEnum CHSPScannerFSM::OnDevExit()
 			//RTA2N09
 			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, ullEnd - ullStart);
 		}
+
 		if(ISSUCCEEDED(erroCode) && status.isConnected)
 		{
 			if (status.inPreview) {
@@ -1925,11 +1926,8 @@ ErrorCodeEnum CHSPScannerFSM::OnDevExit()
 					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, false, ullEnd - ullStart, "", "OnDevExit::SetPreview(0)");
 				}
 			}
-		} else if (FAILURED(erroCode)) {
-			SetErrPackage("OnDevExit::GetDevStatus", m_csDevNo, erroCode, MEC_DEVAPI_HSPSCANNER_GetDevStatus);
-			AlarmDEC();
-		} else {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("HSPSCanner device is disconnected!");
+		} else if(ISSUCCEEDED(erroCode) && !status.isConnected){
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("HSPSCanner device is disconnected!");
 		}
 	}
 
@@ -1979,8 +1977,9 @@ void CHSPScannerFSM::OnStateTrans(int iSrcState, int iDstState)
 	m_nSrcState = iSrcState;
 }
 
-int SetPreviewParam(int colorType, int rotateType, int scanType)
+int CHSPScannerFSM::SetPreviewParam(int colorType, int rotateType, int scanType)
 {
+	ErrorCodeEnum erroCode;
 	int retCode = 0;
 	if (colorType > 0 && colorType < 4) {
 		const ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
@@ -1990,7 +1989,7 @@ int SetPreviewParam(int colorType, int rotateType, int scanType)
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)(ParamValToString(Param_Color_Map[colorType]));
 		}
 		else {
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Color_Map[ctx->Req.colorType]);
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Color_Map[colorType]));
 		}
 		retCode |= 0x0001;
 	}
@@ -2003,7 +2002,7 @@ int SetPreviewParam(int colorType, int rotateType, int scanType)
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)(ParamValToString(Param_Rotate_Map[rotateType]));
 		}
 		else {
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Rotate_Map[ctx->Req.rotateType]));
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Rotate_Map[rotateType]));
 		}
 		if (FAILURED(erroCode))
 		{
@@ -2019,7 +2018,7 @@ int SetPreviewParam(int colorType, int rotateType, int scanType)
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)(ParamValToString(Param_Scan_Map[scanType]));
 		}
 		else {
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Scan_Map[scanType]);
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_SetProperty, ParamValToString(Param_Scan_Map[scanType]));
 		}
 		if (FAILURED(erroCode)) {
 			retCode |= 0x0004;
@@ -2061,9 +2060,9 @@ void CHSPScannerFSM::InitialMaxResizeValue()
 ErrorCodeEnum CHSPScannerFSM::TryToOpenDevice()
 {
 	ErrorCodeEnum result(Error_Succeed);
-	const ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
+	ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
 	result = m_hDevHelper->DevOpen();
-	const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
+	ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 	m_bOpening = false;
 	if (FAILURED(result)) {
 		//RTA2N01
@@ -2073,10 +2072,11 @@ ErrorCodeEnum CHSPScannerFSM::TryToOpenDevice()
 		m_bOpened = true;
 		SetLastUserCode();
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::DevOpen").setCostTime(ullEnd - ullStart)("Open HSPS succ");
+		ullStart = SP::Module::Comm::RVCGetTickCount();
 		result = FulfillAdapterDevCategory();
+		ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (result != Error_Succeed) {
-			SetErrPackage("OnInit::GetDevCategory", m_csDevNo, result, MEC_DEVAPI_HSPSCANNER_GetDevCategory);
-			AlarmDEC();
+			SetErrorAndLog(result, MEC_DEVAPI_HSPSCANNER_GetDevCategory, "DevAdapter::GetDevCategory", "FulfillAdapterDevCategory", false, ullEnd - ullStart);
 		}
 		m_nRecX = 0;
 		m_nRecY = 224;

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -404,6 +404,8 @@ public:
 	}
 	LPCTSTR MapCode2RTAString(DWORD dwValue = 0);
 
+	int SetPreviewParam(int colorType, int rotateType, int scanType);
+
 private:
 	int m_version, m_batch;
 
@@ -429,7 +431,6 @@ public:
 
 	DWORD GetCustLastErrorCode() { return m_dwErroCode; }
 	void SetCustLastErrorCode(DWORD dwVal = 0) { m_dwErroCode = dwVal; }
-
 	ErrorCodeEnum TryToOpenDevice();
 
 private:
@@ -455,7 +456,6 @@ private:
 	}
 	
 	void InitialMaxResizeValue();
-	int SetPreviewParam(int colorType, int rotateType, int scanType);
 };
 
 struct StartPreviewTask : public ITaskSp
@@ -488,7 +488,15 @@ struct SetPropertyInPreviewTask : public ITaskSp
 	void Process()
 	{
 		FSMEvent* pEvt = new FSMEvent(USER_EVT_SETPROPERTYINVIEW_FINISHED);
-		ErrorCodeEnum eRet = m_fsm->SetPreview(m_ctx);
+		ErrorCodeEnum eRet;
+		const int retCode = m_fsm->SetPreviewParam(m_ctx->Req.colorType, m_ctx->Req.rotateType, m_ctx->Req.scanType);
+		if (retCode == 0)
+		{
+			eRet = Error_Succeed;
+		}
+		else {
+			eRet = Error_DevCommFailed;
+		}
 		m_ctx->Answer(eRet);
 		if(ISSUCCEEDED(eRet))
 			pEvt->param1 = 0;