#IQRV #comment [Other] root.ini告警信息上传

Module/include/EventCode.h

@@ -809,10 +809,12 @@ ERROR_ACCESSAUTH_CONNECT_ACS}
 #define LOG_ERR_WATCHDOG_LOGWARN_TERM_INFO 0x20D00201	//Watchdog适配器信息告警上送
 #define LOG_ERR_WATCHDOG_NO_ADAPTER_FILE	0x20D00202	//未找到适配器文件
 #define LOG_ERR_WATCHDOG_LOGWARN_ROOTINFO 0x20D00203
+#define LOG_ERR_WATCHDOG_REAL_ROOT_CONFIG 0x20D00204
 
 #define LOG_ERR_UPS_LOGWARN_TERM_INFO 0x20E00201	//Ups适配器信息告警上送
 #define LOG_ERR_UPS_NO_ADAPTER_FILE	0x20E00202	//未找到适配器文件
 #define LOG_ERR_UPS_LOGWARN_ROOTINFO 0x20E00203
+#define LOG_ERR_UPS_REAL_ROOT_CONFIG 0x20E00204	//实际root配置
 
 #define LOG_EVT_HEALTH_UPS_NO_ELECTOR 0x50100001			//无市电
 #define LOG_EVT_HEALTH_FIRST_ENTER_MAINPADE 0x50100002			//IE启动以来首次进首页

Module/mod_ContactlessCard/ContactlessCard_UserErrorCode.h

@@ -3,24 +3,32 @@
 #pragma once
 
 #define ContactlessCard_UserErrorCode_Start 0x21300200
-#define ContactlessCard_UserErrorCode_Reset_Failed	(ContactlessCard_UserErrorCode_Start + 1)		//Reset失败
-#define ContactlessCard_UserErrorCode_GetDevInfo_Failed	(ContactlessCard_UserErrorCode_Start + 2)	//获取设备信息失败
-#define ContactlessCard_UserErrorCode_LOGWARN_TERM_INFO	(ContactlessCard_UserErrorCode_Start + 3)	//硬件信息告警
-#define ContactlessCard_UserErrorCode_NO_ADAPTER_FILE	(ContactlessCard_UserErrorCode_Start + 4)	//未找到适配器文件
-#define ContactlessCard_UserErrorCode_ZssDeviceInfo	(ContactlessCard_UserErrorCode_Start + 5)	//中世顺机型信息告警
-#define ContactlessCard_UserErrorCode_RootInfo	(ContactlessCard_UserErrorCode_Start + 6)	//root信息
+#define ContactlessCard_UserErrorCode_Reset_Failed	(ContactlessCard_UserErrorCode_Start + 1)		//Reset澶辫触
+#define ContactlessCard_UserErrorCode_GetDevInfo_Failed	(ContactlessCard_UserErrorCode_Start + 2)	//鑾峰彇璁惧�淇℃伅澶辫触
+#define ContactlessCard_UserErrorCode_LOGWARN_TERM_INFO	(ContactlessCard_UserErrorCode_Start + 3)	//纭�欢淇℃伅鍛婅�
+#define ContactlessCard_UserErrorCode_NO_ADAPTER_FILE	(ContactlessCard_UserErrorCode_Start + 4)	//鏈�壘鍒伴€傞厤鍣ㄦ枃浠�
+#define ContactlessCard_UserErrorCode_ZssDeviceInfo	(ContactlessCard_UserErrorCode_Start + 5)	//涓�笘椤烘満鍨嬩俊鎭�憡璀�
+#define ContactlessCard_UserErrorCode_RootInfo	(ContactlessCard_UserErrorCode_Start + 6)	//root淇℃伅
 
-#define ContactlessCard_UserErrorCode_FORGET_FETCH	(ContactlessCard_UserErrorCode_Start + 7)	//客户忘记取卡
+#define ContactlessCard_UserErrorCode_FORGET_FETCH	(ContactlessCard_UserErrorCode_Start + 7)	//瀹㈡埛蹇樿�鍙栧崱
 
 
-//预留一部分用于CardAssist.cpp中的报错告警
-//自ContactlessCard_UserErrorCode_Start + 11 ~ CardIssuer_UserErrorCode_Start + 20
-#define ContactlessCard_UserErrorCode_ActiveContactlessICCard_Failed						(ContactlessCard_UserErrorCode_Start + 11)	//DetectIfICCard调用ContactIC失败
-#define ContactlessCard_UserErrorCode_RFTypeABCommand_Failed								(ContactlessCard_UserErrorCode_Start + 12)	//BuildSupportedAppList调用RFTypeABCommand失败
-#define ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid							(ContactlessCard_UserErrorCode_Start + 13)	//APDU接收到的数据无效
-#define ContactlessCard_UserErrorCode_BuildSupportedAppList_Failed							(ContactlessCard_UserErrorCode_Start + 14)	//BuildSupportedAppList失败
+//棰勭暀涓€閮ㄥ垎鐢ㄤ簬CardAssist.cpp涓�殑鎶ラ敊鍛婅�
+//鑷狢ontactlessCard_UserErrorCode_Start + 11 ~ CardIssuer_UserErrorCode_Start + 20
+#define ContactlessCard_UserErrorCode_ActiveContactlessICCard_Failed						(ContactlessCard_UserErrorCode_Start + 11)	//DetectIfICCard璋冪敤ContactIC澶辫触
+#define ContactlessCard_UserErrorCode_RFTypeABCommand_Failed								(ContactlessCard_UserErrorCode_Start + 12)	//BuildSupportedAppList璋冪敤RFTypeABCommand澶辫触
+#define ContactlessCard_UserErrorCode_ICCommand_RecvData_Invalid							(ContactlessCard_UserErrorCode_Start + 13)	//APDU鎺ユ敹鍒扮殑鏁版嵁鏃犳晥
+#define ContactlessCard_UserErrorCode_BuildSupportedAppList_Failed							(ContactlessCard_UserErrorCode_Start + 14)	//BuildSupportedAppList澶辫触
 
-//Error_DevNotAvailable情况
-#define ContactlessCard_UserErrorCode_Read_OpenFailed						(ContactlessCard_UserErrorCode_Start + 21)	//设备未打开，读卡失败
+//Error_DevNotAvailable鎯呭喌
+#define ContactlessCard_UserErrorCode_Read_OpenFailed						(ContactlessCard_UserErrorCode_Start + 21)	//璁惧�鏈�墦寮€锛岃�鍗″け璐�
+#define ContactlessCard_UserErrorCode_Cancel_OpenFailed						(ContactlessCard_UserErrorCode_Start + 22)	//璁惧�鏈�墦寮€锛屽彇娑堝け璐�
+#define ContactlessCard_UserErrorCode_Exit_OpenFailed						(ContactlessCard_UserErrorCode_Start + 23)	//璁惧�鏈�墦寮€锛岄€€鍑哄け璐�
+
+#define ContactlessCard_UserErrorCode_DevOpen_Success						(ContactlessCard_UserErrorCode_Start + 31)	//璁惧�鎵撳紑鎴愬姛
+#define ContactlessCard_UserErrorCode_DevOpen_Failed						(ContactlessCard_UserErrorCode_Start + 32)	//璁惧�鎵撳紑澶辫触
+
+//瀹為檯root閰嶇疆
+#define ContactlessCard_UserErrorCode_Real_Root_Config						(ContactlessCard_UserErrorCode_Start + 36)	//瀹為檯root閰嶇疆
 
 #endif //_CONTACTLESSCARD_USER_ERRORCODE_H

Module/mod_FingerPrint/FingerPrint_UserErrorCode.h

@@ -23,7 +23,7 @@
 #define FingerPrint_UserErrorCode_LOGWARN_TERM_INFO						( FingerPrint_UserErrorCode_Start + 17 )	//告警硬件模块信息
 #define FingerPrint_UserErrorCode_NO_ADAPTER_FILE						( FingerPrint_UserErrorCode_Start + 18 )	//未找到适配器文件
 
-#define FingerPrint_UserErrorCode_FEATURELEN_ISNOTRIGHT					( FingerPrint_UserErrorCode_Start + 19 )	//返回的指纹特征长度错误
+#define FingerPrint_UserErrorCode_FEATURELEN_ISNOTRIGHT					( FingerPrint_UserErrorCode_Start + 19 )	//注册时 返回的指纹特征长度错误
 
 #define FingerPrint_UserErrorCode_DEVOPENFAILED_MATCH					( FingerPrint_UserErrorCode_Start + 20 )	//指纹DevOpen失败，业务调用Match时报错
 #define FingerPrint_UserErrorCode_DEVOPENFAILED_GETFINGERPRINT			( FingerPrint_UserErrorCode_Start + 21 )	//指纹DevOpen失败，业务调用GetFingerPrint时报错
@@ -33,5 +33,18 @@
 
 #define FingerPrint_UserErrorCode_ROOT_INFO								( FingerPrint_UserErrorCode_Start + 25 )	//root信息
 
+#define FingerPrint_UserErrorCode_DevOpen_Success						( FingerPrint_UserErrorCode_Start + 30 )	//指纹打开成功
+#define FingerPrint_UserErrorCode_DevOpen_Failed						( FingerPrint_UserErrorCode_Start + 31 )	//指纹打开失败
+#define FingerPrint_UserErrorCode_Release_Object_Failed					( FingerPrint_UserErrorCode_Start + 32 )	//释放对象失败
+
+#define FingerPrint_UserErrorCode_Registe_Timeout						( FingerPrint_UserErrorCode_Start + 33 )	//注册时 采集超时
+#define FingerPrint_UserErrorCode_Match_Timeout							( FingerPrint_UserErrorCode_Start + 34 )	//识别时 采集超时
+
+#define FingerPrint_UserErrorCode_GETFEATURE_FAILED_MATCH				( FingerPrint_UserErrorCode_Start + 35 )		//识别时，采集接口调用成功，但返回的特征值为空 - LogError
+#define FingerPrint_UserErrorCode_FEATURELEN_ISNOTRIGHT_MATCH			( FingerPrint_UserErrorCode_Start + 36 )		//识别时 返回的指纹特征长度错误
+
+#define FingerPrint_UserErrorCode_DevOpen_Failed_Registe				( FingerPrint_UserErrorCode_Start + 37 )	//采集指纹时，指纹是打开失败状态
+
+#define FingerPrint_UserErrorCode_Real_Root_Config						( FingerPrint_UserErrorCode_Start + 41 )	//实际加载的root配置
 
 #endif

Module/mod_IDCertificate/IDCertificate_UserErrorCode.h

@@ -17,6 +17,15 @@
 #define IDCertificate_UserErrorCode_NotMatch         		(IDCertificate_UserErrorCode_Start + 12) //起止日期不匹配
 #define IDCertificate_UserErrorCode_DevOpenFailed			(IDCertificate_UserErrorCode_Start + 13) //实体打开失败
 #define IDCertificate_UserErrorCode_DevFailAddUp			(IDCertificate_UserErrorCode_Start + 14) //报错累计达到上限
-#define IDCertificate_UserErrorCode_ErrorDevMedia			(IDCertificate_UserErrorCode_Start + 15)
+#define IDCertificate_UserErrorCode_Release_Object_Failed	(IDCertificate_UserErrorCode_Start + 15) //释放设备失败
 #define IDCertificate_UserErrorCode_CancelOperation			(IDCertificate_UserErrorCode_Start + 16)
+#define IDCertificate_UserErrorCode_DevOpen_Success			(IDCertificate_UserErrorCode_Start + 20) //身份证打开成功
+#define IDCertificate_UserErrorCode_FWB_NotConnected		(IDCertificate_UserErrorCode_Start + 21) //RVC.PAD机型蓝牙多合一未连接
+#define IDCertificate_UserErrorCode_Reading_Disconnected	(IDCertificate_UserErrorCode_Start + 22) //读证时蓝牙多合一断开
+
+#define IDCertificate_UserErrorCode_ReadAndScan_Failed		(IDCertificate_UserErrorCode_Start + 26) //读取身份证失败
+#define IDCertificate_UserErrorCode_ReadAndScan_Interrupt	(IDCertificate_UserErrorCode_Start + 27) //读取身份证异常退出
+
+#define IDCertificate_UserErrorCode_Real_Root_Config		(IDCertificate_UserErrorCode_Start + 31) //加载实际的root配置
+
 #endif //_IDCERTIFICATE_USER_ERRORCODE_H

Module/mod_cardissuer/CardIssuer_UserErrorCode.h

@@ -164,4 +164,19 @@
 #define CardIssuer_UserErrorCode_AcceptCard_Failed					(CardIssuer_UserErrorCode_Start + 144)	//读卡失败
 #define CardIssuer_UserErrorCode_Track2Status_IS_NotOK			(CardIssuer_UserErrorCode_Start + 145)	//二磁道数据异常
 
+//加卡
+#define CardIssuer_UserErrorCode_GetAddCardInfo_CardCount			(CardIssuer_UserErrorCode_Start + 150)	//卡库中卡片数量
+
+//LogWarn real root config
+#define CardIssuer_UserErrorCode_Real_Root_Config					(CardIssuer_UserErrorCode_Start + 153)	//适配器实际的root配置
+#define CardIssuer_UserErrorCode_DupCallPreOnline_WhileInWorking	(CardIssuer_UserErrorCode_Start + 154)	//CardIssuer实体正忙,再次收到跨机激活
+#define CardIssuer_UserErrorCode_Hopper1_Mixed_Too_Much				(CardIssuer_UserErrorCode_Start + 155)	//卡箱1异常（连续吞卡过多）
+#define CardIssuer_UserErrorCode_Hopper2_Mixed_Too_Much				(CardIssuer_UserErrorCode_Start + 156)	//卡箱2异常（连续吞卡过多）
+#define CardIssuer_UserErrorCode_Hopper3_Mixed_Too_Much				(CardIssuer_UserErrorCode_Start + 157)	//卡箱3异常（连续吞卡过多）
+#define CardIssuer_UserErrorCode_MoveCard_In_IssueCard				(CardIssuer_UserErrorCode_Start + 158)	//移动卡片失败（发卡移卡）
+#define CardIssuer_UserErrorCode_CardActive_Service_NoReturn		(CardIssuer_UserErrorCode_Start + 159)	//卡库跨机服务端超时未返回
+#define CardIssuer_UserErrorCode_Maybe_InsertCard_InWrongStyle		(CardIssuer_UserErrorCode_Start + 160)	//可能卡片插反了
+#define CardIssuer_UserErrorCode_IssueCard_ActiveICCard_Failed		(CardIssuer_UserErrorCode_Start + 161)	//发卡时，DetectIfICCard调用ActiveICCard失败
+#define CardIssuer_UserErrorCode_MoveCardToSlot_Failed				(CardIssuer_UserErrorCode_Start + 162)	//加卡时，卡片移动到卡槽失败
+
 #endif //_CARDISSUER_USER_ERRORCODE_H

Module/mod_gpio/Gpio_UserErrorCode.h

@@ -2,12 +2,13 @@
 #define _GPIO_USER_ERRORCODE_H
 #pragma once
 
-#define GPIO_UserErrorCode_Start								0x20900200
-#define GPIO_UserErrorCode_LogInfoAboutTerm						(GPIO_UserErrorCode_Start + 1)
-#define GPIO_UserErrorCode_RootInfo								(GPIO_UserErrorCode_Start + 2)
+#define GPIO_UserErrorCode_Start				0x20900200
+#define GPIO_UserErrorCode_LogInfoAboutTerm		(GPIO_UserErrorCode_Start + 1)
+#define GPIO_UserErrorCode_RootInfo				(GPIO_UserErrorCode_Start + 2)
+#define GPIO_UserErrorCode_Real_Root_Config		(GPIO_UserErrorCode_Start + 3)
 
 //adapter func failed
-#define GPIO_UserErrorCode_DevOpen_Failed						(GPIO_UserErrorCode_Start + 3)
-#define GPIO_UserErrorCode_GetDevCategory_Failed				(GPIO_UserErrorCode_Start + 4)
+#define GPIO_UserErrorCode_DevOpen_Failed						(GPIO_UserErrorCode_Start + 4)
+#define GPIO_UserErrorCode_GetDevCategory_Failed				(GPIO_UserErrorCode_Start + 5)
 
 #endif //_CONTACTLESSCARD_USER_ERRORCODE_H

Module/mod_pinpad/PinPad_UserErrorCode.h

@@ -38,4 +38,8 @@
 #define PinPad_UserErrorCode_PinPad_DevOpenFailed					(PinPad_UserErrorCode_Start + 28)
 #define PinPad_UserErrorCode_PinPad_CkCode_While_Load_SM			(PinPad_UserErrorCode_Start + 29)
 
+//LogWarn real root config
+#define PinPad_UserErrorCode_PinPad_Real_Root_Config				(PinPad_UserErrorCode_Start + 31)
+#define PinPad_UserErrorCode_PinPad_GetPinBlock_Call				(PinPad_UserErrorCode_Start + 32)
+
 #endif //_PINPAD_USER_ERROR_CODE_H