Эх сурвалжийг харах

#IQRV #comment 使用 GetVTMErrMsg 接管

80374374 6 сар өмнө
parent
commit
7cbb066647

+ 0 - 1
Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -30,7 +30,6 @@
 #define HSPScanner_UserErrorCode_DLLNAME_FAILED						0x2170020A
 #define HSPScanner_UserErrorCode_DLLNAME_NOCFG						0x2170020B
 #define HSPScanner_UserErrorCode_DEVICE_OFFLINE						0x2170020C
-#define HSPScanner_UserErrorCode_IMAGE_CLEAR					0x2170020D
 #define HSPScanner_UserErrorCode_NOT_SUPPORT					0x2170020E
 #define HSPScanner_UserErrorCode_REAL_ROOT_CONFIG	0x2170020F
 

+ 11 - 13
Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -2474,15 +2474,16 @@ ErrorCodeEnum CHSPScannerFSM::TryToOpenDevice()
 
 LPCTSTR CHSPScannerFSM::MapCode2RTAString(DWORD dwValue)
 {
-	//static CSimpleStringA tmpRTA(true);
-	//CSimpleStringA tmpDesc(true);
-
-	//tmpRTA = "";
-	//if (GetEntityBase()->GetFunction()->GetVTMErrMsg(dwValue, tmpDesc, tmpRTA) == Error_Succeed)
-	//{
-	//	return tmpRTA.GetData();
-	//}
-
+	static CSimpleStringA tmpRTA(true);
+	CSimpleStringA tmpDesc(true);
+	ErrorCodeEnum err(Error_Succeed);
+	tmpRTA = "";
+	if ((err=GetEntityBase()->GetFunction()->GetVTMErrMsg(dwValue, tmpDesc, tmpRTA)) == Error_Succeed)
+	{
+		return tmpRTA.GetData();
+	}
+	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("cannot found 0x%X from ResStatic: %s", dwValue, SpStrError(err));
+	/** 降级处理  [Gifur@2025325]*/
 	switch (dwValue) {
 	case LOG_ERR_HSPS_DEVOPEN_FAILED:
 		return "RTA2N01";
@@ -2517,7 +2518,7 @@ LPCTSTR CHSPScannerFSM::MapCode2RTAString(DWORD dwValue)
 	case 0x2170000B:
 		return "RTA2N0B";
 		break;
-	case 0x2170000C:
+	case 0x2170000C: /*未登记到资源管理平台*/
 		return "RTA2N0C";
 		break;
 	case HSPScanner_UserErrorCode_READ_IMAGE_FILE_FAILED:
@@ -2541,9 +2542,6 @@ LPCTSTR CHSPScannerFSM::MapCode2RTAString(DWORD dwValue)
 	case HSPScanner_UserErrorCode_DEVICE_OFFLINE:
 		return "RTA2N0K";
 		break;
-	case HSPScanner_UserErrorCode_IMAGE_CLEAR:
-		return "RTA2N0L";
-		break;
 	case HSPScanner_UserErrorCode_CLEAR_RESOURCE_FAILED:
 		return "RTA2N0L";
 		break;