Z991239-6224 #comment 高拍仪SetPreview接口日志埋点改造

Module/mod_HSPScanner/HSPSCanner_LogCode.h

@@ -0,0 +1,35 @@
+#ifndef _HSPSCANNER_USER_LOGRCODE_H
+#define _HSPSCANNER_USER_LOGRCODE_H
+#pragma once
+
+
+/*
+*/
+
+#define CustomLogCode_Start "QLR0402217A0"
+#define CustomLogCode_Reset "QLR0402217A1"
+
+#define CustomLogCode_Preview_Default "QLR0402217A2"
+#define CustomLogCode_CancelPreview_Default "QLR0402217A3"
+
+
+/*
+#define HSPScannerService_LogCode_StartPreview "QLR040221700"
+#define HSPScannerService_LogCode_CancelPreview "QLR040221701"
+#define HSPScannerService_LogCode_ScanImage "QLR040221702"
+#define HSPScannerService_LogCode_ScanImageEx "QLR040221703"
+#define HSPScannerService_LogCode_SetProperty "QLR040221704"
+#define HSPScannerService_LogCode_SetWinPos "QLR040221705"
+#define HSPScannerService_LogCode_ShowProperty "QLR040221706"
+#define HSPScannerService_LogCode_GetDevStatus "QLR040221707"
+#define HSPScannerService_LogCode_GetDevInfo "QLR040221799"
+#define HSPScannerService_LogCode_Exit "QLR040221708"
+#define HSPScannerService_LogCode_StartPreviewJS "QLR040221709"
+#define HSPScannerService_LogCode_CancelPreviewJS "QLR040221710"
+#define HSPScannerService_LogCode_ScanImageJS "QLR040221711"
+#define HSPScannerService_LogCode_SetParamJS "QLR040221712"
+
+*/
+
+
+#endif //_HSPSCANNER_USER_LOGRCODE_H

Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -2,10 +2,6 @@
 #define _HSPSCANNER_USER_ERRORCODE_H
 #pragma once
 
-#define HSPScannerService_CustomLogCode_Start "QLR040221720"
-#define HSPScannerService_CustomLogCode_Reset "QLR040221721"
-
-
 #define LOG_ERR_HSPS_DEVOPEN_FAILED 0x21700001
 #define LOG_ERR_HSPS_PREVIEW_FAILED 0x21700003
 #define LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED 0x21700004

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -13,6 +13,7 @@
 #else
 #include <opencv2/opencv.hpp>
 #endif //NOT _WIN32
+#include "HSPSCanner_LogCode.h"
 
 #define RESET_TIMER_ID 1
 #define CHECK_CONNECT_TIMER_ID 2
@@ -111,6 +112,29 @@ CSimpleStringA CombineJsonContext(const char* szMessage)
 	return  result;
 }
 
+CSimpleStringA CombineJsonContext4SetPreview(bool bOpen, const char* szMessage = NULL)
+{
+	CSimpleStringA result(true);
+	if (szMessage == NULL || strlen(szMessage) == 0) {
+		if (bOpen) {
+			result = CSimpleStringA::Format("{\"PreviewSwitch\": ON}");
+		}
+		else {
+			result = CSimpleStringA::Format("{\"PreviewSwitch\": OFF}");
+		}
+	}
+	else {
+		if (bOpen) {
+			result = CSimpleStringA::Format("{\"addition\": \"%s\", \"PreviewSwitch\": ON}", szMessage);
+		}
+		else {
+			result = CSimpleStringA::Format("{\"addition\": \"%s\", \"PreviewSwitch\": OFF}", szMessage);
+		}
+	}
+	return  result;
+}
+
+
 CHSPScannerFSM::CHSPScannerFSM(void)
 	:
 	m_ecSelfTest(Error_Succeed),
@@ -752,7 +776,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 				ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 				if (FAILURED(erroCode)) {
 					//RTA2N0B
-					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_Reset, "DevAdapter::Reset", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_Reset, "DevAdapter::Reset", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset);
 					SetDevState(DEVICE_STATUS_FAULT);
 					uRet = 1;
 				} else {
@@ -762,7 +786,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 					ullEnd = SP::Module::Comm::RVCGetTickCount();
 					if (FAILURED(eXYW)) {
 						//RTA2N07
-						SetErrorAndLog(eXYW, MEC_DEVAPI_HSPSCANNER_SetViewPos, "DevAdapter::SetViewPos", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+						SetErrorAndLog(eXYW, MEC_DEVAPI_HSPSCANNER_SetViewPos, "DevAdapter::SetViewPos", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset);
 						SetDevState(DEVICE_STATUS_FAULT);
 						uRet = 1;
 						e->SetHandled();
@@ -780,10 +804,10 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 								erroCode = m_hDevHelper->SetPreview(0);
 								ullEnd = SP::Module::Comm::RVCGetTickCount();
 								if (erroCode == Error_Succeed) {
-									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)();
+									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false));
 								} else {
 									//RTA2N04
-									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset);
+									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 								}
 							} while (false);
 							do 
@@ -799,7 +823,7 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 									}
 									else {
 										//RTA2N0Q
-										SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
+										SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
 									}
 								}
 							} while (false);
@@ -814,12 +838,12 @@ unsigned int CHSPScannerFSM::s3_Failed_on_event(FSMEvent* e)
 									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::SetParam").setCostTime(ullEnd - ullStart)("HSPS_VIEW_HIDE");
 								} else {
 									//RTA2N0Q
-									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, HSPScannerService_CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
+									SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetParam, "DevAdapter::SetParam", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_Reset, CombineJsonContext("HSPS_VIEW_HIDE"));
 								}
 							} while (false);
 						}
 						else {
-							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode(HSPScannerService_CustomLogCode_Reset)("Recover routine done");
+							DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode(CustomLogCode_Reset)("Recover routine done");
 							uRet = 2;
 						}
 					}
@@ -1485,17 +1509,19 @@ int CHSPScannerFSM::StartPreview(SpReqAnsContext<HSPScannerService_StartPreview_
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (FAILURED(erroCode)) {
 			//RTA2N03
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreview, CombineJsonContext("StartPreview::SetPreview(1)"));
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, CustomLogCode_Preview_Default, CombineJsonContext4SetPreview(true, "StartPreview"));
 			SetLastUserCode(GetAlarmDEC());
 		} else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)("StartPreview::SetPreview(1)");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(CustomLogCode_Preview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(true, "StartPreview"));
 		}
 	}
 
 	if (FAILURED(erroCode)) {
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview)(__FUNCTION__);
 		nRes = 1;
 	} else {
 		/** 无论如何都打开一次灯，所以这里应该是有所冗余的  [Gifur@2025325]*/
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreview)(__FUNCTION__);
 		ToSwithLight();
 	}
 	ctx->Answer(TransECWithRepeat(erroCode), GetLastUserCode());
@@ -1529,10 +1555,10 @@ int CHSPScannerFSM::StopPreview(SpReqAnsContext<HSPScannerService_CancelPreview_
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (ISSUCCEEDED(erroCode)) {
 			nRes = 2;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreview).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("SetPreview(0) succ");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false));
 		} else {
 			//RTA2N04
-			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreview, CombineJsonContext("SetPreview(0)"));
+			SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 			const DWORD dwCode = GetAlarmDEC();
 			CSimpleStringA tmpRTA(true), tmpDesc(true);
 			if (GetEntityBase()->GetFunction()->GetVTMErrMsg(dwCode, tmpDesc, tmpRTA) == Error_Succeed)
@@ -2090,11 +2116,11 @@ ErrorCodeEnum CHSPScannerFSM::OnDevExit()
 				erroCode = m_hDevHelper->SetPreview(0);
 				const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 				if (ISSUCCEEDED(erroCode)) {
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(__FUNCTION__).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("OnDevExit::SetPreview(0)");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(__FUNCTION__).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false, "OnDevExit"));
 					ToSwithLight(false);
 				} else {
 					//RTA2N04
-					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::CancelPreview", __FUNCTION__, false, ullEnd - ullStart, "", CombineJsonContext("OnDevExit::SetPreview(0)"));
+					SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Close, "DevAdapter::SetPreview", __FUNCTION__, false, ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 				}
 			}
 		} else if(ISSUCCEEDED(erroCode) && !status.isConnected){
@@ -2137,15 +2163,22 @@ int CHSPScannerFSM::StartPreviewJS(SpReqAnsContext<HSPScannerService_StartPrevie
 	erroCode = m_hDevHelper->SetPreview(1);
 	ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 	if (FAILURED(erroCode)) {
-		SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_StartPreviewJS, CombineJsonContext("StartPreview::SetPreview(1)"));
+		SetErrorAndLog(erroCode, MEC_DEVAPI_HSPSCANNER_SetPreview_Open, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, CustomLogCode_Preview_Default, CombineJsonContext4SetPreview(true));
 		SetLastUserCode(GetAlarmDEC());
 		erroCode = Error_Unexpect;
 		ret = 1;
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)("StartPreview::SetPreview(1)");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(CustomLogCode_Preview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(true, "StartPreview"));
 		ToSwithLight();
 	}
+
+	if (erroCode == Error_Succeed) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS)(__FUNCTION__);
+	}
+	else {
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_StartPreviewJS)(__FUNCTION__);
+	}
 	ctx->Answer(erroCode, GetLastUserCode());
 	return ret;
 }
@@ -2172,12 +2205,12 @@ int CHSPScannerFSM::CancelPreview(SpReqAnsContext<HSPScannerService_CancelPrevie
 		erroCode = m_hDevHelper->SetPreview(0);
 		const ULONGLONG ullEnd = SP::Module::Comm::RVCGetTickCount();
 		if (ISSUCCEEDED(erroCode)) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(HSPScannerService_LogCode_CancelPreviewJS).setAPI("DevAdapter::CancelPreview").setCostTime(ullEnd - ullStart)("SetPreview(0) succ");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(CustomLogCode_CancelPreview_Default).setAPI("DevAdapter::SetPreview").setCostTime(ullEnd - ullStart)(CombineJsonContext4SetPreview(false, "JS::CancelPreview"));
 			ctx->Answer(Error_Succeed);
 		}
 		else {
 			//RTA2N04
-			SetErrorAndLog(erroCode, LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED, "DevAdapter::CancelPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, HSPScannerService_LogCode_CancelPreviewJS, CombineJsonContext("SetPreview(0)"));
+			SetErrorAndLog(erroCode, LOG_EVT_HSPS_CANCEL_PREVIEW_FAILED, "DevAdapter::SetPreview", __FUNCTION__, IsInBusiness(), ullEnd - ullStart, CustomLogCode_CancelPreview_Default, CombineJsonContext4SetPreview(false));
 			SetLastUserCode(GetAlarmDEC());
 			ctx->Answer(Error_Unexpect, GetLastUserCode());
 			ret = 1;