Z991239-5633 #comment 高拍仪改造错误码

Module/include/DevFSMCommBase.hpp

@@ -351,7 +351,7 @@ public:
 	ErrorCodeEnum GetDllVersionInfo(LPCTSTR lpcszFilePath, DWORD& dwMajor, DWORD& dwMinor, DWORD& dwBuild, DWORD& dwRevision)
 	{
 		char* buf = NULL;
-		dwMajor = dwMinor = dwBuild = dwRevision = -1;
+		dwMajor = dwMinor = dwBuild = dwRevision = (DWORD)(-1);
 
 		DWORD dwHnd;
 		DWORD dwVerInfoSize;
@@ -774,7 +774,7 @@ public:
             LogErrMsgEx(m_errPkg, csErrMsg, dwCode, bToBusiness);
 		} else {
 			DbgWithLink(bToBusiness ? LOG_LEVEL_ERROR : LOG_LEVEL_WARN, bToBusiness ? LOG_TYPE_USER : LOG_TYPE_SYSTEM).setAPI(m_errPkg.msgHead)("{\"DevSN\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
-				, m_errPkg.devSN.GetData(), SpStrError(m_errPkg.devErrCode), csErrMsg);
+				, m_errPkg.devSN.GetData(), SpStrError(m_errPkg.devErrCode), csErrMsg.GetData());
 		}
 		return dwCode;
 	}
@@ -807,7 +807,7 @@ public:
 
 		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\":%d, \"errMsg\":\"%s\", \"context\":\"%s\"}", errCode, csErrMsg.GetData(), context.GetData()).GetData();
+		CSimpleStringA csErrMsgWithReturnCode = CSimpleStringA::Format("{\"returnCode\":%s, \"errMsg\":\"%s\", \"context\":\"%s\"}", SpStrError(errCode), csErrMsg.GetData(), context.GetData()).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
@@ -947,8 +947,6 @@ public:
 
         std::pair<bool, std::string> strResult;
         strResult = generateJsonStr(rootInfo);
-        strResult.second.c_str();
-
         if (!entityName.IsNullOrEmpty()) {
             LogWarn(Severity_Low, Error_Debug, m_RootIniCodeMap[entityName.GetData()], strResult.second.c_str());
         } else {
@@ -1035,7 +1033,6 @@ public:
 
 		std::pair<bool, std::string> strResult;
 		strResult = generateJsonStr(termInfo);
-		strResult.second.c_str();
 
 		CSmartPointer<IConfigInfo> spConfigRun;
 		CSimpleStringA csWarnMsg;

Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -38,15 +38,15 @@
 #define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGE_START  0x21700211
 #define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGEEX_START  0x21700212
 
-#define LOG_WARN_HSPS_READ_CONFIG_FILE_FAILED						0x21700213 //图片大小限制参数读取失败
-#define LOG_WARN_HSPS_OPENCV_READ_FAILED							0x21700214 //opencv读图片失败
-#define LOG_WARN_HSPS_OPENCV_WRITE_FAILED							0x21700215 //opencv写图片失败
-#define LOG_WARN_HSPS_RESIZE_IMAGE_FILE_FAILED					0x21700216 //图片缩小失败
-#define LOG_WARN_HSPS_RESIZE_IMAGEEX_FILE_FAILED				0x21700217 //ex图片缩小失败
-#define LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED					0x21700218 //resize函数执行成功
-
-#define LOG_WARN_HSPS_VENDORDLL_CHANGE					0x21700219 //修改加载DLL的名称
-#define LOG_WARN_HSPS_VENDORDLL_KEBA_MATCHED	    0x2170021A //符合切换科堡适配器的告警
+#define LOG_WARN_HSPS_READ_CONFIG_FILE_FAILED						0x21700213 //鍥剧墖澶у皬闄愬埗鍙傛暟璇诲彇澶辫触
+#define LOG_WARN_HSPS_OPENCV_READ_FAILED							0x21700214 //opencv璇诲浘鐗囧け璐�
+#define LOG_WARN_HSPS_OPENCV_WRITE_FAILED							0x21700215 //opencv鍐欏浘鐗囧け璐�
+#define LOG_WARN_HSPS_RESIZE_IMAGE_FILE_FAILED					0x21700216 //鍥剧墖缂╁皬澶辫触
+#define LOG_WARN_HSPS_RESIZE_IMAGEEX_FILE_FAILED				0x21700217 //ex鍥剧墖缂╁皬澶辫触
+#define LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED					0x21700218 //resize鍑芥暟鎵ц�鎴愬姛
+
+#define LOG_WARN_HSPS_VENDORDLL_CHANGE					0x21700219 //淇�敼鍔犺浇DLL鐨勫悕绉�
+#define LOG_WARN_HSPS_VENDORDLL_KEBA_MATCHED	    0x2170021A //绗﹀悎鍒囨崲绉戝牎閫傞厤鍣ㄧ殑鍛婅�
 
 #define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGE_SUCC   0x21700220
 #define LOG_DEBUG_HSPS_CRITICAL_OPERATION_SCANIMAGE_FAILED 0x21700221

Module/mod_HSPScanner/HSPScannerFSM.h

@@ -419,15 +419,11 @@ private:
 
 	int m_nRecX, m_nRecY, m_nRecW;
 
-	CSimpleStringA m_csDllName;
-	CSimpleStringA m_csDllFullPath;
-
-	CSimpleStringA m_csDevNo;
-	CSimpleStringA m_csPort, m_csBuadrate;
 	DevStateEnum m_eDevStatus;
 	EvtType m_desiredAction;
 	CSimpleStringA m_csMachineType;
 	DevCategoryInfo m_devCat;
+	CSimpleStringA m_csDevNo;
 
 	DWORD dwLastUserCode;
 	DWORD m_dwMaxImageSize;

Module/mod_HSPScanner/mod_HSPScanner.cpp

@@ -73,7 +73,21 @@ void CHSPScannerServerSession::Handle_Exit(SpOnewayCallContext<HSPScannerService
 	m_pEntity->Exit(ctx);
 }
 
+void CHSPScannerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue, const char* pszOldValue, const char* pszEntityName)
+{
+	if ((_strnicmp(pszKey, "UIState", strlen("UIState")) == 0))
+	{
+		if (_strnicmp(pszValue, "M", strlen("M")) == 0)
+			m_fsm.SetInWhatPage(PageType_MainPage);
+		else if (_strnicmp(pszValue, "U", strlen("U")) == 0)
+			m_fsm.SetInWhatPage(PageType_UserDesktop);
+		else
+			m_fsm.SetInWhatPage(PageType_Other);
+	}
+}
+
 #if defined(_MSC_VER)
+
 ErrorCodeEnum CHSPScannerEntity::CustomVendorLibInfo()
 {
 	if (vendorLibInfo.strVendor.Compare("keba", true) == 0

Module/mod_HSPScanner/mod_HSPScanner.h

@@ -56,7 +56,7 @@ private:
 };
 
 
-class CHSPScannerEntity : public CDevAdptEntityBase
+class CHSPScannerEntity : public CDevAdptEntityBase, public ISysVarListener
 {
 public:
 	CHSPScannerEntity() {}
@@ -105,11 +105,13 @@ public:
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,
 		CSmartPointer<ITransactionContext> pTransactionContext)
 	{
-		LOG_FUNCTION();
 		ErrorCodeEnum erroCode = m_fsm.OnExit();
 		pTransactionContext->SendAnswer(erroCode);
 	}
 
+	virtual void OnSysVarEvent(const char* pszKey,
+		const char* pszValue, const char* pszOldValue, const char* pszEntityName);
+
 	void Preview(SpReqAnsContext<HSPScannerService_StartPreview_Req,
 		HSPScannerService_StartPreview_Ans>::Pointer ctx)
 	{