Sfoglia il codice sorgente

#IQRV #comment 区分加载适配器报错的RTA错误码

80374374 9 mesi fa
parent
commit
275f7dc1d1

+ 1 - 8
Module/include/EventCode.h

@@ -480,17 +480,10 @@ ERROR_ACCESSAUTH_CONNECT_ACS_x}
 #define LOG_DEVICECONTROL_SOGOU_SCRIPTS_EXECUTE_FAILED 0x21400009
 #define LOG_DEVICECONTROL_SOGOU_SCRIPTS_EXECUTE_TIMEOUT 0x2140000A
 
+//公有引用
 #define LOG_EVT_HSPS_LIGHT_ON 0x21700002
 #define LOG_EVT_HSPS_LIGHT_OFF 0x21700003
 
-//#define LOG_ERR_DEVICECONTROL_RESTART 0x21480001
-
-#define LOG_ERR_HSPS_DEVOPEN_FAILED 0x21700001
-#define LOG_EVT_HSPS_LIGHT_ON 0x21700002
-#define LOG_EVT_HSPS_LIGHT_OFF 0x21700003
-#define LOG_EVT_HSPS_LOST_CONNECT 0x21700004
-
-
 #define LOG_EVT_HEALTH_FIRST_ENTER_MAINPADE_FROM_HEALTH_START 0x50100003	//健康启动以来首次进首页
 #define LOG_WARN_HEALTH_INSTALL_FINISHED 0x50100004		//安装成功的标识
 #define LOG_WARN_HEALTH_INSTALL_RESET 0x50100005		//请求重新安装的标识

+ 1 - 1
Module/mod_HSPScanner/HSPSCanner_UserErrorCode.h

@@ -19,7 +19,7 @@
 
 #define HSPScanner_UserErrorCode_Start							0x21700200
 #define HSPScanner_UserErrorCode_READ_IMAGE_FILE_FAILED			0x21700201
-#define HSPScanner_UserErrorCode_CREATE_OBJECT_FAILED			0x21700202
+#define HSPScanner_UserErrorCode_LOAD_DLLFILE_NOTEIXT			0x21700202
 #define HSPScanner_UserErrorCode_LOAD_DLLFILE_FAILED			0x21700203
 #define HSPScanner_UserErrorCode_GET_CDC_ADDR_FAILED			0x21700204
 #define HSPScanner_UserErrorCode_GET_RDC_ADDR_FAILED			0x21700205

+ 7 - 1
Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -129,7 +129,7 @@ LPCTSTR CHSPScannerFSM::MapCode2RTAString(DWORD dwValue)
 	case HSPScanner_UserErrorCode_READ_IMAGE_FILE_FAILED:
 		return "RTA2N0D";
 		break;
-	case HSPScanner_UserErrorCode_CREATE_OBJECT_FAILED:
+	case HSPScanner_UserErrorCode_LOAD_DLLFILE_NOTEIXT:
 		return "RTA2N0E";
 		break;
 	case HSPScanner_UserErrorCode_LOAD_DLLFILE_FAILED:
@@ -246,6 +246,12 @@ ErrorCodeEnum CHSPScannerFSM::OnInit()
 			return erroCode;
 		}
 	}
+	else if (erroCode == Error_NotExist) {
+		SetLastUserCode(HSPScanner_UserErrorCode_LOAD_DLLFILE_NOTEIXT);
+	}
+	else {
+		SetLastUserCode(HSPScanner_UserErrorCode_LOAD_DLLFILE_FAILED);
+	}
 
 FAIL:
 	m_bOpened = false;