Z991239-3388 #comment other: some fix

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -860,6 +860,7 @@ int CCardReadAdapterFSM::ContactlessCardRead(SpReqAnsContext<CardReadAdapterServ
 				ContactlessCardService_Insert_Req req;
 				ContactlessCardService_Insert_Ans ans;
 				req.aid = ctx->Req.aid;
+
 				Dbg("to call contactless insert...");
 				eErr = m_pContactless->Insert(req, ans, 56000);
 				if (eErr == Error_Succeed)

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -6353,12 +6353,12 @@ int CCardIssuerFSM::PreOnlineOnStore(SpReqAnsContext<CardIssuerService_PreOnline
 			req.data = ctx->Req.businessData;
 			req.slot = ctx->Req.slot;
 
-			errMsg = CSimpleStringA::Format("<PreOnlineOnStore>, send CardActive, termNo:%s, slot:%d", req.term, req.slot);
+			errMsg = CSimpleStringA::Format("<PreOnlineOnStore>, send CardActive, termNo:%s, slot:%d", req.term.GetData(), req.slot);
 			LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_PreOnline_Send_CardActive, errMsg.GetData());
 
 			eErr = pHeartBeatClient->CardActive(req, ans, 60000);
 
-			errMsg = CSimpleStringA::Format("CardActive Result(termNo:%s, slot:%d):%d(0x%x)", req.term, req.slot, eErr, eErr);
+			errMsg = CSimpleStringA::Format("CardActive Result(termNo:%s, slot:%d):%d(0x%x)", req.term.GetData(), req.slot, eErr, eErr);
 			LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_PreOnline_Recv_CardActive, errMsg.GetData());
 
 			pHeartBeatClient->GetFunction()->CloseSession();
@@ -6378,7 +6378,7 @@ void CCardIssuerFSM::NotifyPreOnline(unsigned long errCode, unsigned long findCa
 			m_crossCtx->Ans.cardPos = cardPos;
 			m_crossCtx->Ans.findCard = findCard;
 			m_crossCtx->Ans.result = data;
-			CSimpleStringA outParam = CSimpleStringA::Format("NotifyPreOnline, cardPos:%d, findCard:%d, data:%s, errCode:%d", cardPos, findCard, data.GetData(), errCode);
+			CSimpleStringA outParam = CSimpleStringA::Format("NotifyPreOnline, cardPos:%d, findCard:%d, errCode:%d", cardPos, findCard, errCode);
 			LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_NotifyPreOnline_ParamInfo, outParam.GetData());
 			m_crossCtx->Answer((ErrorCodeEnum)errCode);
 		}

Module/mod_cardissuer/mod_cardissuer.h

@@ -366,6 +366,7 @@ public:
 	void NotifyPreonline(SpReqAnsContext<CardIssuerService_NotifyPreonline_Req, CardIssuerService_NotifyPreonline_Ans>::Pointer ctx)
 	{
 		m_fsm.NotifyPreOnline(ctx->Req.errCode,ctx->Req.findCard,ctx->Req.cardPos,ctx->Req.data);
+		ctx->Answer(Error_Succeed);
 	}
 	void QueryCardInfoOnStore(SpReqAnsContext<CardIssuerService_QueryCardInfoOnStore_Req, CardIssuerService_QueryCardInfoOnStore_Ans>::Pointer ctx)
 	{

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -2335,14 +2335,20 @@ void CHealthManagerFSM::ToLogWarnTermAboutInfo(BOOL bSuccessFlag)
 	bool bTmpEtyNewStart = m_bEntityNewStart;
     CSimpleStringA csOSVerion(""), csWarnMsg(""), csAsiaInfo;
     std::map<std::string, std::string> termInfo;
+	std::map<std::string, std::string> pcInfo;
     termInfo["version"] = m_sysInfo.InstallVersion.ToString();
 	termInfo["TerminalNo"] = m_sysInfo.strTerminalID;
-	termInfo["MachineType"] = m_sysInfo.strMachineType;
-	termInfo["MachineVersion"] = CSimpleStringA::Format("%d.%d", m_sysInfo.MachineVersion.GetMajor(), m_sysInfo.MachineVersion.GetMinor());
-	termInfo["Screen"] = CSimpleStringA::Format("%d", m_sysInfo.eScreen);
-	termInfo["Site"] = m_sysInfo.strSite;
-	termInfo["EnrolGPS"] = CSimpleStringA::Format("%.3f,%.3f", m_sysInfo.EnrolGPS.GetLongitude(), m_sysInfo.EnrolGPS.GetLatitude());
-	termInfo["EnrolAddr"] = m_sysInfo.strEnrolAddr;
+
+	pcInfo["MachineType"] = m_sysInfo.strMachineType;
+	pcInfo["MachineVersion"] = CSimpleStringA::Format("%d.%d", m_sysInfo.MachineVersion.GetMajor(), m_sysInfo.MachineVersion.GetMinor());
+	pcInfo["Screen"] = CSimpleStringA::Format("%d", m_sysInfo.eScreen);
+	pcInfo["Site"] = m_sysInfo.strSite;
+	pcInfo["EnrolGPS"] = CSimpleStringA::Format("%.3f,%.3f", m_sysInfo.EnrolGPS.GetLongitude(), m_sysInfo.EnrolGPS.GetLatitude());
+	pcInfo["EnrolAddr"] = m_sysInfo.strEnrolAddr;
+	pcInfo["Manufacturer"] = m_sysInfo.strManufacturer;
+	pcInfo["MachineModel"] = m_sysInfo.strMachineModel;
+	pcInfo["SN"] = m_sysInfo.strMachineSN;
+
 
     if (!m_csErrEntity.IsNullOrEmpty())
         termInfo["ErrEntity"] = m_csErrEntity;
@@ -2386,14 +2392,16 @@ void CHealthManagerFSM::ToLogWarnTermAboutInfo(BOOL bSuccessFlag)
 #endif //RVC_OS_LINUX
 
     std::pair<bool, std::string> strResult;
+	std::pair<bool, std::string> strPCInfo;
     strResult = generateJsonStr(termInfo);
-    Dbg("[%s]", strResult.second.c_str());
+	strPCInfo = generateJsonStr(pcInfo);
     //oilyang@20210323 discard the following rule of throwing LogWarn.Always throw LogWarn 
     //oilyang@20201201 log warn every time if content of msg has changed
 	if (bTmpEtyNewStart)
 	{
 		LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_HEALTH_UPLOAD_INFO_ABOUT_TERM, strResult.second.c_str());
 		LogWarn(Severity_Low, Error_Unexpect, HealthManager_UserErrorCode_First_Info_AboutTerm, strResult.second.c_str());
+		LogWarn(Severity_Low, Error_Unexpect, HealthManager_UserErrorCode_First_Info_AboutPC, strPCInfo.second.c_str());
 	}
 	else
 		LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_HEALTH_UPLOAD_INFO_ABOUT_TERM, strResult.second.c_str());

Module/mod_healthmanager/HealthManagerFSM.h

@@ -38,6 +38,12 @@ enum HealthManger_UserErrorCode {
 	HealthManager_UserErrorCode_PinPad_HaveNotLoad_SM,		//密码键盘未加载国密密钥
 	HealthManager_UserErrorCode_Receive_Browser_Idle,		//健康收到浏览器Idle事件
 	HealthManager_UserErrorCode_First_Info_AboutTerm,		//健康启动结束后第一次终端信息上送
+	HealthManager_UserErrorCode_AutoDoInit_Suc,				//自动初始化成功
+	HealthManager_UserErrorCode_AutoDoInit_Fail,			//自动初始化失败
+	HealthManager_UserErrorCode_Need_Guardian,				//健康需要启动guardian
+	HealthManager_UserErrorCode_Need_No_Guardian,			//健康不需要启动guardian	
+	HealthManager_UserErrorCode_WaitForAccessGrayResult,	//健康等待准入灰度结果
+	HealthManager_UserErrorCode_First_Info_AboutPC,			//健康启动结束后第一次上送计算机信息(主要是确定pad的归属厂商信息)
 };
 enum EvtType
 {