#IQRV #comment 调整代码位置

Module/include/DevFSMCommBase.hpp

@@ -602,7 +602,7 @@ class CCommDevFSM : public FSMImpl<TFSM>
 {
 
 public:
-	CCommDevFSM() :m_FirstStart(TRUE), m_iInWhatPage(PageType_Init),m_bOpened(false), m_bOpening(true), m_eDevState(DEVICE_STATUS_NOT_READY),m_contiErrTimes(0)
+	CCommDevFSM() : m_iInWhatPage(PageType_Init),m_bOpened(false), m_bOpening(true), m_eDevState(DEVICE_STATUS_NOT_READY),m_contiErrTimes(0)
 	{
 
 	}
@@ -878,7 +878,6 @@ protected:
 
 	DevAdptLibHelper<TDevClass> m_hDevHelper;
 	DevEntityErrorCode m_entCode;
-	BOOL m_FirstStart;
 	int m_iInWhatPage/*在哪个页面，区分首页，用户桌面，其他页*/;
 
 	ErrorPackageEx m_errPkgEx;

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -223,7 +223,6 @@ CHSPScannerFSM::CHSPScannerFSM(void)
 	m_dwMaxImageSize(500)
 {
 	HARDWARE_ENTITY_RESET_ENTITYID(m_entCode, 0x217);
-	m_FirstStart = TRUE;
 }
 
 CHSPScannerFSM::~CHSPScannerFSM(void)
@@ -275,40 +274,6 @@ FAIL:
 	return Error_Succeed;
 }
 
-ErrorCodeEnum CHSPScannerFSM::TryToOpenDevice()
-{
-	ErrorCodeEnum result(Error_Succeed);
-	ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
-	result = m_hDevHelper->DevOpen();
-	ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
-	if (FAILURED(result)) {
-		//RTA2N01 / 21700001
-		SetErrorAndLog(result, MEC_DEVAPI_HSPSCANNER_DevOpen, "DevAdapter::DevOpen", __FUNCTION__, false, ullEnd - ullStart);
-		SetLastUserCode(LOG_ERR_HSPS_DEVOPEN_FAILED);
-	}
-	else {
-		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) {
-			SetErrorAndLog(result, MEC_DEVAPI_HSPSCANNER_GetDevCategory, "DevAdapter::GetDevCategory", "FulfillAdapterDevCategory", false, ullEnd - ullStart);
-		}
-		m_nRecX = 0;
-		m_nRecY = 224;
-		m_nRecW = 1024;
-		ErrorCodeEnum ecInit = m_hDevHelper->SetViewPos(m_nRecX, m_nRecY, m_nRecW);
-		ErrorCodeEnum ecInitScan = m_hDevHelper->SetParam(HSPS_MODEL_SCANSIZE, HSPS_SCAN_FULL);
-		ErrorCodeEnum ecInitRotate = m_hDevHelper->SetParam(HSPS_MODEL_ROTATE, HSPS_ROTATE_NOANGLE);
-		ErrorCodeEnum ecInitColor = m_hDevHelper->SetParam(HSPS_MODEL_COLOR, HSPS_COLOR_FULL);
-		if (FAILURED(ecInit) || FAILURED(ecInitScan) || FAILURED(ecInitRotate) || FAILURED(ecInitColor)) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ViewPos: %s, Scan: %s, rotate: %s, color: %s.", SpStrError(ecInit), SpStrError(ecInitScan), SpStrError(ecInitRotate), SpStrError(ecInitColor));
-		}
-	}
-	return result;
-}
-
 ErrorCodeEnum CHSPScannerFSM::OnExit()
 {
 	if (m_hDevHelper) {
@@ -492,7 +457,7 @@ unsigned int CHSPScannerFSM::s1_Preview_on_event(FSMEvent* e)
 	case USER_EVT_STARTPREVIEW_JS:
 	{
 		JS::StartPreviewEvent* pEvt = dynamic_cast<JS::StartPreviewEvent*>(e);
-		if (JS::PreviewSettings(pEvt->m_ctx->Req).IsWorth()) {
+		if (JS::PreviewSettings(pEvt->m_ctx->Req).IsAvailable()) {
 			ErrorCodeEnum erroCode = SetPreviewProperty(JS::PreviewSettings(pEvt->m_ctx->Req), HSPScannerService_LogCode_StartPreviewJS);
 			if (FAILURED(erroCode)) {
 				pEvt->m_ctx->Answer(Error_Unexpect, GetLastUserCode());
@@ -2235,7 +2200,7 @@ int CHSPScannerFSM::StartPreviewJS(SpReqAnsContext<HSPScannerService_StartPrevie
 	ErrorCodeEnum erroCode = Error_Unexpect;
 	int ret(0);
 	SetLastUserCode();
-	if(JS::PreviewSettings(ctx->Req).IsWorth()) {
+	if(JS::PreviewSettings(ctx->Req).IsAvailable()) {
 		erroCode = SetPreviewProperty(JS::PreviewSettings(ctx->Req), HSPScannerService_LogCode_StartPreviewJS);
 		if (FAILURED(erroCode)) {
 			ctx->Answer(Error_Unexpect, GetLastUserCode());
@@ -2505,6 +2470,22 @@ int CHSPScannerFSM::SetPreviewParam(int colorType, int rotateType, int scanType,
 	return retCode;
 }
 
+ErrorCodeEnum CHSPScannerFSM::DeleteFileIfExisted(LPCTSTR fileName)
+{
+	if (ExistsFileA(fileName)) {
+		if (RemoveFileA(fileName) != 0) {
+			return Error_Succeed;
+		}
+		else {
+			LogWarn(Severity_High, Error_Unexpect, HSPScanner_UserErrorCode_CLEAR_RESOURCE_FAILED, CSimpleStringA::Format(
+				"DeleteFile(%s) failed LastError(%d) at ResizeImage proc", fileName, GetLastError()));
+			return Error_Unexpect;
+		}
+	}
+	else {
+		return Error_Succeed;
+	}
+}
 
 void CHSPScannerFSM::InitialMaxResizeValue()
 {
@@ -2521,17 +2502,37 @@ void CHSPScannerFSM::InitialMaxResizeValue()
 }
 
 
-ErrorCodeEnum CHSPScannerFSM::DeleteFileIfExisted(LPCTSTR fileName)
+ErrorCodeEnum CHSPScannerFSM::TryToOpenDevice()
 {
-	if (ExistsFileA(fileName)) {
-		if (RemoveFileA(fileName) != 0) {
-			return Error_Succeed;
-		} else {
-			LogWarn(Severity_High, Error_Unexpect, HSPScanner_UserErrorCode_CLEAR_RESOURCE_FAILED, CSimpleStringA::Format(
-				"DeleteFile(%s) failed LastError(%d) at ResizeImage proc", fileName, GetLastError()));
-			return Error_Unexpect;
+	ErrorCodeEnum result(Error_Succeed);
+	ULONGLONG ullStart = SP::Module::Comm::RVCGetTickCount();
+	result = m_hDevHelper->DevOpen();
+	ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
+	if (FAILURED(result)) {
+		//RTA2N01 / 21700001
+		SetErrorAndLog(result, MEC_DEVAPI_HSPSCANNER_DevOpen, "DevAdapter::DevOpen", __FUNCTION__, false, ullEnd - ullStart);
+		SetLastUserCode(LOG_ERR_HSPS_DEVOPEN_FAILED);
+	}
+	else {
+		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) {
+			SetErrorAndLog(result, MEC_DEVAPI_HSPSCANNER_GetDevCategory, "DevAdapter::GetDevCategory", "FulfillAdapterDevCategory", false, ullEnd - ullStart);
+		}
+		m_nRecX = 0;
+		m_nRecY = 224;
+		m_nRecW = 1024;
+		ErrorCodeEnum ecInit = m_hDevHelper->SetViewPos(m_nRecX, m_nRecY, m_nRecW);
+		ErrorCodeEnum ecInitScan = m_hDevHelper->SetParam(HSPS_MODEL_SCANSIZE, HSPS_SCAN_FULL);
+		ErrorCodeEnum ecInitRotate = m_hDevHelper->SetParam(HSPS_MODEL_ROTATE, HSPS_ROTATE_NOANGLE);
+		ErrorCodeEnum ecInitColor = m_hDevHelper->SetParam(HSPS_MODEL_COLOR, HSPS_COLOR_FULL);
+		if (FAILURED(ecInit) || FAILURED(ecInitScan) || FAILURED(ecInitRotate) || FAILURED(ecInitColor)) {
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ViewPos: %s, Scan: %s, rotate: %s, color: %s.", SpStrError(ecInit), SpStrError(ecInitScan), SpStrError(ecInitRotate), SpStrError(ecInitColor));
 		}
-	} else {
-		return Error_Succeed;
 	}
+	return result;
 }
+

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -95,7 +95,7 @@ namespace JS
 
 		PreviewSettings(bool show) :rotate(0), scan(0), color(0), pos(0), pos_x(0), pos_y(0), pos_w(0), view(show ? 1 : 2) {}
 
-		bool IsWorth() const {
+		bool IsAvailable() const {
 			return (rotate != 0 || scan != 0 || color != 0 || pos != 0);
 		}
 		void SetDisplay(bool display) { if (display) view = 1; else view = 2; }
@@ -419,19 +419,6 @@ public:
 		FSM_RULE_ENTRY_ANY(sIdle, sFault_NotConfig, USER_EVT_NOCFG)
 		FSM_RULE_ENTRY_ANY(sIdle, sFault, USER_EVT_GOTOHELL)
 
-		/*
-			USER_EVT_STARTPREVIEW_JS,
-	USER_EVT_STARTPREVIEW_JS_DONE,
-
-	USER_EVT_CANCELPREVIEW_JS,
-	USER_EVT_CANCELPREVIEW_JS_DONE,
-
-	USER_EVT_SCANIMAGE_JS,
-	USER_EVT_SCANIMAGE_JS_DONE,
-
-	USER_EVT_SETPARAM_JS,
-		
-		*/
 
 		/** JS Compoent  [Gifur@20241114]*/
 		FSM_RULE_ENTRY(sIdle, sPreview, USER_EVT_STARTPREVIEW_JS_DONE, 0)

Module/mod_HSPScanner/mod_HSPScanner.cpp

@@ -75,24 +75,28 @@ void CHSPScannerServerSession::Handle_Exit(SpOnewayCallContext<HSPScannerService
 
 void CHSPScannerServerSession::Handle_StartPreviewJS(SpReqAnsContext<HSPScannerService_StartPreviewJS_Req, HSPScannerService_StartPreviewJS_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS).setAPI(__FUNCTION__)(__FUNCTION__);
 	m_pEntity->StartPreviewJS(ctx);
 }
 
 void CHSPScannerServerSession::Handle_CancelPreviewJS(SpReqAnsContext<HSPScannerService_CancelPreviewJS_Req, HSPScannerService_CancelPreviewJS_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreviewJS).setAPI(__FUNCTION__)(__FUNCTION__);
 	m_pEntity->CancelPreviewJS(ctx);
 }
 
 void CHSPScannerServerSession::Handle_ScanImageJS(SpReqAnsContext<HSPScannerService_ScanImageJS_Req, HSPScannerService_ScanImageJS_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_ScanImageJS).setAPI(__FUNCTION__)(__FUNCTION__);
 	m_pEntity->ScanImageJS(ctx);
 }
 
 void CHSPScannerServerSession::Handle_SetParamJS(SpReqAnsContext<HSPScannerService_SetParamJS_Req, HSPScannerService_SetParamJS_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_SetParamJS).setAPI(__FUNCTION__)(__FUNCTION__);
 	m_pEntity->SetParamJS(ctx);
 }