#IQRV #comment [HSPScanner] 高拍仪合并

Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -20,17 +20,25 @@
 #define HSPScanner_UserErrorCode_CLEAR_RESOURCE_FAILED				( HSPScanner_UserErrorCode_Start + 6 )
 #define HSPScanner_UserErrorCode_UPLOAD_VENDORINFO					( HSPScanner_UserErrorCode_Start + 7 )
 #define HSPScanner_UserErrorCode_ROOT_INFO							( HSPScanner_UserErrorCode_Start + 8 )
-
-#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_START						( HSPScanner_UserErrorCode_Start + 9 )
-#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGE 				( HSPScanner_UserErrorCode_Start + 10 )
-#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGEEX 				( HSPScanner_UserErrorCode_Start + 11 )
-
-#define LOG_WARN_HSPS_READ_CONFIG_FILE_FAILED						( HSPScanner_UserErrorCode_Start + 12 ) //图片大小限制参数读取失败
-#define LOG_WARN_HSPS_OPENCV_READ_FAILED							( HSPScanner_UserErrorCode_Start + 13 ) //opencv读图片失败
-#define LOG_WARN_HSPS_OPENCV_WRITE_FAILED							( HSPScanner_UserErrorCode_Start + 14 ) //opencv写图片失败
-#define LOG_WARN_HSPS_RESIZE_IMAGE_FILE_FAILED						( HSPScanner_UserErrorCode_Start + 15 ) //图片缩小失败
-#define LOG_WARN_HSPS_RESIZE_IMAGEEX_FILE_FAILED					( HSPScanner_UserErrorCode_Start + 16 ) //ex图片缩小失败
-#define LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED						( HSPScanner_UserErrorCode_Start + 17 ) //resize函数执行成功
+#define HSPScanner_UserErrorCode_FSM_INVALID						( HSPScanner_UserErrorCode_Start + 9 )
+#define HSPScanner_UserErrorCode_DLLNAME_FAILED						( HSPScanner_UserErrorCode_Start + 10)
+#define HSPScanner_UserErrorCode_DLLNAME_NOCFG						( HSPScanner_UserErrorCode_Start + 11)
+#define HSPScanner_UserErrorCode_DEVICE_OFFLINE						( HSPScanner_UserErrorCode_Start + 12)
+#define HSPScanner_UserErrorCode_IMAGE_CLEAR					( HSPScanner_UserErrorCode_Start + 13)
+#define HSPScanner_UserErrorCode_NOT_SUPPORT					( HSPScanner_UserErrorCode_Start + 14)
+#define HSPScanner_UserErrorCode_REAL_ROOT_CONFIG	(HSPScanner_UserErrorCode_Start + 15)
+
+
+#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_START						( HSPScanner_UserErrorCode_Start + 16 )
+#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGE 				( HSPScanner_UserErrorCode_Start + 17 )
+#define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGEEX 				( HSPScanner_UserErrorCode_Start + 18 )
+
+#define LOG_WARN_HSPS_READ_CONFIG_FILE_FAILED						( HSPScanner_UserErrorCode_Start + 19 ) //图片大小限制参数读取失败
+#define LOG_WARN_HSPS_OPENCV_READ_FAILED							( HSPScanner_UserErrorCode_Start + 20 ) //opencv读图片失败
+#define LOG_WARN_HSPS_OPENCV_WRITE_FAILED							( HSPScanner_UserErrorCode_Start + 21 ) //opencv写图片失败
+#define LOG_WARN_HSPS_RESIZE_IMAGE_FILE_FAILED						( HSPScanner_UserErrorCode_Start + 22 ) //图片缩小失败
+#define LOG_WARN_HSPS_RESIZE_IMAGEEX_FILE_FAILED					( HSPScanner_UserErrorCode_Start + 23 ) //ex图片缩小失败
+#define LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED						( HSPScanner_UserErrorCode_Start + 24 ) //resize函数执行成功
 
 
 

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -8,6 +8,7 @@
 #include "HSPScanner_server_g.h"
 #include "DevErrorCode.h"
 #include "DevFSMCommBase.hpp"
+#include "HSPSCanner_UserErrorCode.h"
 
 using namespace HSPScanner;
 
@@ -22,6 +23,9 @@ using namespace HSPScanner;
 	}							\
 	}while(0)
 
+
+
+
 enum EvtType
 {
 	USER_EVT_STARTPREVIEW = (EVT_USER + 1),
@@ -70,7 +74,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -86,7 +90,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -102,7 +106,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -118,7 +122,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -134,7 +138,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -150,7 +154,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -166,7 +170,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -182,7 +186,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -198,7 +202,7 @@ public:
 	{
 		if(m_ctx != NULL)
 		{
-			m_ctx->Answer(Error_InvalidState);
+			m_ctx->Answer(Error_InvalidState, HSPScanner_UserErrorCode_FSM_INVALID);
 		}
 	}
 };
@@ -229,6 +233,9 @@ public:
 		FSM_STATE_ENTRY(s8, "Idiot", s8_on_entry, s8_on_exit, s8_on_event)
 	END_FSM_STATE()
 
+		
+
+
 	BEGIN_FSM_RULE(CHSPScannerFSM, s0)
 		//2 reserved in s0 state.
 		FSM_RULE_ENTRY(s0, s1, USER_EVT_STARTPREVIEW_FINISHED, 0)
@@ -331,11 +338,10 @@ public:
 	virtual unsigned int s7_on_event(FSMEvent* e);
 
 	virtual void s8_on_entry() {
-		Dbg("Enter Idiot status");
 		m_eDevStatus = DEVICE_STATUS_NOCFG;
+		SetLastUserCode(HSPScanner_UserErrorCode_DLLNAME_NOCFG);
 	}
 	virtual void s8_on_exit() {
-		Dbg("Leave Idiot status");
 		m_eDevStatus = DEVICE_STATUS_NORMAL;
 	}
 	virtual unsigned int s8_on_event(FSMEvent* e);
@@ -376,6 +382,19 @@ public:
 
 	ErrorCodeEnum OnDevExit();
 
+	void UploadVendorDllInfo();
+
+	UINT UnitTest(LPCTSTR testTag);
+
+	void SetLastUserCode(DWORD dwCode = 0) 
+	{ 
+		dwLastUserCode = dwCode; 
+	}
+	DWORD GetLastUserCode() const
+	{
+		return dwLastUserCode;
+	}
+
 private:
 	int m_version, m_batch;
 	ErrorCodeEnum m_ecSelfTest;
@@ -387,17 +406,25 @@ private:
 
 	int m_nRecX, m_nRecY, m_nRecW;
 
+	CSimpleStringA m_csDllName;
+	CSimpleStringA m_csDevNo;
+	CSimpleStringA m_csPort, m_csBuadrate;
 	DevStateEnum m_eDevStatus;
 	EvtType m_desiredAction;
-	CSimpleStringA m_csDevNo;
-	bool m_bOpened;
+	CSimpleStringA m_csMachineType;
 	DevCategoryInfo m_devCat;
 	ErrorPackage m_errPkg;
-	AdapterInfo m_adapterInfo;
+	CSimpleStringA m_csAlarmMsg;
+
 	int m_contiErrTimes;
+	DWORD dwLastUserCode;
+
+	AdapterInfo m_adapterInfo;
 
 public:
 
+    bool m_bOpened;
+
 	DWORD GetCustLastErrorCode() { return m_dwErroCode; }
 	void SetCustLastErrorCode(DWORD dwVal = 0) { m_dwErroCode = dwVal; }
 
@@ -438,7 +465,6 @@ private:
 			else
 				return 1;
 		}
-		Dbg("GetDevStatus failed in IsDevConnect().");
 		return -1;
 	}
 };

Module/mod_HSPScanner/mod_HSPScanner.cpp

@@ -73,6 +73,8 @@ void CHSPScannerServerSession::Handle_Exit(SpOnewayCallContext<HSPScannerService
 	m_pEntity->Exit(ctx);
 }
 
+
+
 SP_BEGIN_ENTITY_MAP()
 	SP_ENTITY(CHSPScannerEntity)
-SP_END_ENTITY_MAP()
+	SP_END_ENTITY_MAP()

Module/mod_HSPScanner/mod_HSPScanner.h

@@ -76,16 +76,19 @@ public:
 		pTransactionContext->SendAnswer(erroCode);
 	}
 
+	virtual void OnStarted()
+	{
+		if(m_fsm.m_bOpened) { m_fsm.UploadVendorDllInfo(); }
+	}
+
 	virtual void OnPrePause(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		pTransactionContext->SendAnswer(Error_Succeed);
 	}
-
 	virtual void OnPreContinue(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		pTransactionContext->SendAnswer(Error_Succeed);
 	}
-
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,
 		CSmartPointer<ITransactionContext> pTransactionContext)
 	{