Merge branch 'gifur_fixed_everything' into st4

Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -1218,7 +1218,7 @@ bool CHSPScannerFSM::ResizeImage(CSimpleStringA fileName)
 
 	Dbg("Rsize Image suc.");
 	RemoveFileA((LPCTSTR)backUpFile);
-	LogWarn(Severity_Middle, Error_Unexpect, LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED,
+	LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_HSPS_RESIZE_FUNCTION_SUCCEED,
 		CSimpleStringA::Format("HSPScanner resize image succeed, SIZE : %d KB.", fileSize));
 	return TRUE;
 }
@@ -1589,6 +1589,7 @@ int CHSPScannerFSM::SetWinPos(SpReqAnsContext<HSPScannerService_SetWinPos_Req,
 			m_nRecX = ctx->Req.pointX;
 			m_nRecY = ctx->Req.pointY;
 			m_nRecW = ctx->Req.nWidth;
+			Dbg("SetViewPos succ.");
 		}
 	}
 	else

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -4154,38 +4154,11 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardBackNotHold()
 	LOG_FUNCTION();
 	ErrorCodeEnum eMoveNotHold = m_hDevHelper->MoveCard(CI_MOVECARD_BACK_NOT_HOLD);
 	Dbg("capture card:%d",eMoveNotHold);
-	//2016-11-10 14:30:54 joseph
 	if (eMoveNotHold != Error_Succeed)
 	{
 		SetErrPackage(m_errPkg, "MachineMoveCardBackNotHold::MoveCard(CI_MOVECARD_BACK_NOT_HOLD)", m_csDevSN, eMoveNotHold, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_BACK_NOT_HOLD);
 		AlarmDEC(m_errPkg);
-		return eMoveNotHold;
 	}
-	//oilyang@20170929 根据讨论结果，去掉调用
-
-	//2016-11-10 14:34:44 joseph
-	//GUIConsoleService_ClientBase *pGuiConsoleClient = NULL;
-
-	//pGuiConsoleClient = new GUIConsoleService_ClientBase(dynamic_cast<CCardIssuerEntity*>(GetEntityBase()));
-	//ErrorCodeEnum eAddMaterial = pGuiConsoleClient->Connect();
-	//if (eAddMaterial == Error_Succeed)
-	//{
-	//	if (pGuiConsoleClient)
-	//	{
-	//		Dbg("to add material counter.");
-	//		GUIConsoleService_AddMaterialCounter_Req req;
-	//		GUIConsoleService_AddMaterialCounter_Ans ans;
-	//		req.strMaterialCode = "RetainCard";
-	//		eAddMaterial = pGuiConsoleClient->AddMaterialCounter(req, ans, 10000);
-	//		Dbg("%d", eAddMaterial);
-	//		if (pGuiConsoleClient != NULL)
-	//		{
-	//			pGuiConsoleClient->GetFunction()->CloseSession();
-	//			pGuiConsoleClient->SafeDelete();
-	//			pGuiConsoleClient = NULL;
-	//		}
-	//	}
-	//}
 	return eMoveNotHold;
 }
 ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate()

Module/mod_guiconsole/MaterialMgrCnn.cpp

@@ -362,8 +362,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleModifyEnrollInfoRet(const CSmartPointer<IPa
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
 		LogError(Severity_Middle, rc, dwUserCode, 
-			CSimpleStringA::Format("modify terminal enroll info fail, %s", strErrMsg.c_str()));
+			CSimpleStringA::Format("modify terminal enroll info fail, %s", errStr.c_str()));
 		
 		return rc;
 	}
@@ -380,8 +381,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleAddTradeManageRet(const CSmartPointer<IPack
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
 		LogError(Severity_Middle, rc, dwUserCode,
-			CSimpleStringA::Format("add terminal trade manage fail, %s", strErrMsg.c_str()));
+			CSimpleStringA::Format("add terminal trade manage fail, %s", errStr.c_str()));
 
 		return rc;
 	}
@@ -399,8 +401,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleAddMaterialCounterRet(const CSmartPointer<I
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
 		LogError(Severity_Middle, rc, dwUserCode, 
-			CSimpleStringA::Format("add terminal material counter fail, %s", strErrMsg.c_str()));
+			CSimpleStringA::Format("add terminal material counter fail, %s", errStr.c_str()));
 		
 		return rc;
 	}
@@ -422,7 +425,8 @@ ErrorCodeEnum CMaterialMgrCnn::HandleQueryMaterialInfoRet(const CSmartPointer<IP
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
-		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("query material info fail, %s", strErrMsg.c_str()));
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
+		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("query material info fail, %s", errStr.c_str()));
 
 		return rc;
 	}
@@ -506,7 +510,8 @@ ErrorCodeEnum CMaterialMgrCnn::HandleGetMaterialCounterRet(const CSmartPointer<I
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
-		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("get material counter fail, %s", strErrMsg.c_str()));
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
+		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("get material counter fail, %s", errStr.c_str()));
 
 		return rc;
 	}
@@ -535,8 +540,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleResetMaterialCounterRet(const CSmartPointer
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
 		LogError(Severity_Middle, rc, dwUserCode, 
-			CSimpleStringA::Format("reset material counter fail, %s", strErrMsg.c_str()));
+			CSimpleStringA::Format("reset material counter fail, %s", errStr.c_str()));
 		
 		return rc;
 	}
@@ -552,8 +558,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleMaintainerLoginRet(const CSmartPointer<IPac
 	ErrorCodeEnum rc = Error_Succeed;
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
-		rc = (ErrorCodeEnum)dwSysCode;		
-		LogError(Severity_Middle, rc, dwUserCode,  CSimpleStringA::Format("maintainer login fail, %s", strErrMsg.c_str()));
+		rc = (ErrorCodeEnum)dwSysCode;	
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
+		LogError(Severity_Middle, rc, dwUserCode,  CSimpleStringA::Format("maintainer login fail, %s", errStr.c_str()));
 		
 		return rc;
 	}
@@ -569,8 +576,9 @@ ErrorCodeEnum CMaterialMgrCnn::HandleRegistSwallowedCardRet(const CSmartPointer<
 	ErrorCodeEnum rc = Error_Succeed;
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
+		std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
 		rc = (ErrorCodeEnum)dwSysCode;
-		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("regist swallowed card fail, %s", strErrMsg.c_str()));
+		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("regist swallowed card fail, %s", errStr.c_str()));
 	}
 	else
 		Dbg("regist swallowed card succeed");
@@ -586,7 +594,8 @@ ErrorCodeEnum CMaterialMgrCnn::HandleSyncMaterialCount(const CSmartPointer<IPack
 	if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
 	{
 		rc = (ErrorCodeEnum)dwSysCode;
-		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("sync material count fail, %s", strErrMsg.c_str()));
+        const std::string errStr = SP::Utility::GBK2UTF8(strErrMsg);
+		LogError(Severity_Middle, rc, dwUserCode, CSimpleStringA::Format("sync material count fail, %s", errStr.c_str()));
 	}
 	else
 		Dbg("sync material count succeed");

Module/mod_guiconsole/mod_GuiConsole.h

@@ -9,7 +9,7 @@
 using namespace GUIConsole;
 
 #define ENT_TIMERID_CHECK_LOGDB_SIZE 1
-#define ENT_TIMERINTERVAL_CHECK_LOGDB_SIZE 60 * 1000
+#define ENT_TIMERINTERVAL_CHECK_LOGDB_SIZE 300 * 1000
 
 // 本地控制台 GUIConsole	0x508
 class CGUIConsoleEntity : public CEntityBase, public ILogListener, public ITimerListener

Module/mod_guiconsole/mod_guiconsole.cpp

@@ -622,24 +622,27 @@ void CGUIConsoleEntity::InitializeBeidou()
 void CGUIConsoleEntity::OnTimeout(DWORD dwTimerID)
 {
 	static long oldFileSize = -1;
+	const long maxFileSize = 10000000; //10MB
     const char* defaultDBStoragePath = "/opt/rvc/terminaldbstorage/RVC.LogSdk/RvcLogSdk.db";
 
 	if (dwTimerID == ENT_TIMERID_CHECK_LOGDB_SIZE) {
 		if (ExistsFileA(defaultDBStoragePath)) {
 			struct stat statbuf;
-            if (stat(defaultDBStoragePath, &statbuf)) {
+            if (stat(defaultDBStoragePath, &statbuf) < 0) {
 				int err = errno;
-				LogWarn(Severity_Middle, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
+				LogWarn(Severity_Low, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
 						CSimpleStringA::Format("failed to stat %s: %s", defaultDBStoragePath, strerror(err)));
 			} else {
 				if (oldFileSize != statbuf.st_size) {
-                    LogWarn(Severity_Middle, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
-                            CSimpleStringA::Format("db file changed from: %d to %ld", oldFileSize, statbuf.st_size));
-					oldFileSize = statbuf.st_size;
+					if (statbuf.st_size >= maxFileSize) {
+                        LogWarn(Severity_Low, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
+                                CSimpleStringA::Format("db file changed from: %d to %ld", oldFileSize, statbuf.st_size));
+					}
+                    oldFileSize = statbuf.st_size;
 				}
 			}
 		} else {
-			LogWarn(Severity_Middle, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
+			LogWarn(Severity_Low, Error_Resource, EVENT_MOD_GUICONSOLE_UNIONNETLOG_LOCAL_STORAGE_SIZE,
 					CSimpleStringA::Format("%s does not exist!", defaultDBStoragePath));
 		}
 	}