#IQRV #comment 缺陷修复

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -2340,7 +2340,7 @@ int CHSPScannerFSM::ScanImageJS(SpReqAnsContext<HSPScannerService_ScanImageJS_Re
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_ScanImageJS).setResultCode("RTA2N0S")("fopen(%s) error after invoking scanimage: %d.", (LPCTSTR)csImageFile, errno);
 			}
 
-			if (ctx->Req.hide && !FAILURED(SetPreviewProperty(JS::PreviewSettings(false), HSPScannerService_LogCode_ScanImageJS))) {
+			if (ctx->Req.hide && FAILURED(SetPreviewProperty(JS::PreviewSettings(false), HSPScannerService_LogCode_ScanImageJS))) {
 				erroCode = Error_Unexpect;
 				ret = 1;
 			}
@@ -2418,21 +2418,7 @@ ErrorCodeEnum CHSPScannerFSM::SetPreviewProperty(const JS::PreviewSettings& val,
 			return erroCode;
 		}
 	}
-	//////////////////////////////////////////////////////////////////////////
-	if (val.view != 0) {
-		const ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
-		erroCode = m_hDevHelper->SetParam(HSPS_MODEL_VIEW, Param_View_Map[val.view]);
-		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
-		if (ISSUCCEEDED(erroCode)) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)(ParamValToString(Param_View_Map[val.view]));
-		}
-		else {
-			SetErrorAndLog(erroCode, val.view == 1 ? HSPScanner_UserErrorCode_SetParam_View : HSPScanner_UserErrorCode_SetParam_Hide
-				, "DevAdapter::SetParam", __FUNCTION__, isBusiness, ullEnd - ullStart, logCode, CombineJsonContext(ParamValToString(Param_View_Map[val.view])));
-			SetLastUserCode(GetAlarmDEC());
-			return erroCode;
-		}
-	}
+
 	//////////////////////////////////////////////////////////////////////////
 	if (val.pos != 0) {
 		CSimpleStringA tmpParm = CSimpleStringA::Format("x(%d), y(%d), w(%d)", val.pos_x, val.pos_y, val.pos_w);
@@ -2452,6 +2438,21 @@ ErrorCodeEnum CHSPScannerFSM::SetPreviewProperty(const JS::PreviewSettings& val,
 			SetLastUserCode(GetAlarmDEC());
 		}
 	}
+	//////////////////////////////////////////////////////////////////////////
+	if (val.view != 0) {
+		const ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
+		erroCode = m_hDevHelper->SetParam(HSPS_MODEL_VIEW, Param_View_Map[val.view]);
+		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
+		if (ISSUCCEEDED(erroCode)) {
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)(ParamValToString(Param_View_Map[val.view]));
+		}
+		else {
+			SetErrorAndLog(erroCode, val.view == 1 ? HSPScanner_UserErrorCode_SetParam_View : HSPScanner_UserErrorCode_SetParam_Hide
+				, "DevAdapter::SetParam", __FUNCTION__, isBusiness, ullEnd - ullStart, logCode, CombineJsonContext(ParamValToString(Param_View_Map[val.view])));
+			SetLastUserCode(GetAlarmDEC());
+			return erroCode;
+		}
+	}
 	return erroCode;
 }
 

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -310,7 +310,7 @@ namespace JS {
 	class SetParamEvent : public FSMEvent
 	{
 	public:
-		SetParamEvent() : FSMEvent(USER_EVT_SCANIMAGE_JS) {}
+		SetParamEvent() : FSMEvent(USER_EVT_SETPARAM_JS) {}
 		~SetParamEvent() {}
 		SpReqAnsContext<HSPScannerService_SetParamJS_Req, HSPScannerService_SetParamJS_Ans>::Pointer m_ctx;
 		virtual void OnUnhandled()
@@ -845,7 +845,6 @@ namespace JS {
 		void Process()
 		{
 			FSMEvent* pEvt = new FSMEvent(USER_EVT_CANCELPREVIEW_JS_DONE);
-			////0,succ;1 failed;
 			pEvt->param1 = m_fsm->CancelPreview(m_ctx);
 			pEvt->param2 = m_ctx->Req.hide ? 1 : 0;
 			m_fsm->PostEventFIFO(pEvt);

Module/mod_HSPScanner/mod_HSPScanner.h

@@ -188,22 +188,30 @@ public:
 
 	void StartPreviewJS(SpReqAnsContext<HSPScannerService_StartPreviewJS_Req, HSPScannerService_StartPreviewJS_Ans>::Pointer ctx)
 	{
-		ctx->Answer(Error_NotImpl);
+		JS::StartPreviewEvent* pEvent = new JS::StartPreviewEvent();
+		pEvent->m_ctx = ctx;
+		m_fsm.PostEventFIFO(pEvent);
 	}
 
 	void CancelPreviewJS(SpReqAnsContext<HSPScannerService_CancelPreviewJS_Req, HSPScannerService_CancelPreviewJS_Ans>::Pointer ctx)
 	{
-		ctx->Answer(Error_NotImpl);
+		JS::CancelPreviewEvent* pEvent = new JS::CancelPreviewEvent();
+		pEvent->m_ctx = ctx;
+		m_fsm.PostEventFIFO(pEvent);
 	}
 
 	void ScanImageJS(SpReqAnsContext<HSPScannerService_ScanImageJS_Req, HSPScannerService_ScanImageJS_Ans>::Pointer ctx)
 	{
-		ctx->Answer(Error_NotImpl);
+		JS::ScanImageEvent* pEvent = new JS::ScanImageEvent();
+		pEvent->m_ctx = ctx;
+		m_fsm.PostEventFIFO(pEvent);
 	}
 
 	void SetParamJS(SpReqAnsContext<HSPScannerService_SetParamJS_Req, HSPScannerService_SetParamJS_Ans>::Pointer ctx)
 	{
-		ctx->Answer(Error_NotImpl);
+		JS::SetParamEvent* pEvent = new JS::SetParamEvent();
+		pEvent->m_ctx = ctx;
+		m_fsm.PostEventFIFO(pEvent);
 	}
 
 	void OnSelfTest(EntityTestEnum eTestType, CSmartPointer<ITransactionContext> pTransactionContext)