!10850 st2

Merge pull request !10850 from 80174847/ST2

Module/CMakeLists.txt

@@ -243,6 +243,8 @@ add_subdirectory(mod_vtmloader)
 #below should be compiled succesufully.
 add_subdirectory(mod_SalesRecorder)
 add_subdirectory(mod_sipphone)
+#add uos cardissuerstore
+add_subdirectory(mod_cardissuerstore)
 endif(MSVC)
 
 

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -2218,7 +2218,7 @@ int CCardIssuerFSM::CaptureCard(SpReqAnsContext<CardIssuerStandService_Capture_R
 	eErr = MachineMoveCardBackNotHold();
 	if (eErr == Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220305")();
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220304")();
 		bool bCaptured = ToRegistCaptureCardInfo();
 		m_currCardNo = m_addCardNo = "";
 	}
@@ -2812,7 +2812,12 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 				else
 				{
 					//既没有读到磁条，又不是IC，很大概率是插反了
-					LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了");
+					if (m_issueStatus) {
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了，m_issueStatus=1");
+					}
+					else {
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了，m_issueStatus=0");
+					}
 					if (m_issueStatus)
 					{
 						m_mixedEx[m_currentHopper - 1]++;
@@ -2862,7 +2867,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 			return 1;
 	}
 	bICOK = true;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
 	return 0;
 }
 int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req, CardIssuerStandService_Read_Ans>::Pointer ctx)
@@ -3120,7 +3125,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
 		else
 			return 1;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220303")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
 	return 0;
 }
 int CCardIssuerFSM::PreOnline(SpReqAnsContext<CardIssuerStandService_PreOnline_Req, CardIssuerStandService_PreOnline_Ans>::Pointer ctx)
@@ -7438,7 +7443,7 @@ int CCardIssuerFSM::QuickSelfCheckImpl()
 			ret = 0;
 		}
 		pClient->GetFunction()->CloseSession();
-		pClient->SafeDelete();
+		//pClient->SafeDelete();
 		return ret;
 	}
 	else {

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -2416,9 +2416,9 @@ int CCardReadAdapterFSM::NotifyPreonline(SpReqAnsContext<CardReadAdapterService_
 			}
 			else if (ctx->Req.reserved1[0] == CardIssuer_UserErrorCode_DevOpen_Failed || ctx->Req.reserved1[0] == CardIssuerStore_UserErrorCode_DevOpen_Failed)
 			{
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220327").setResultCode("RTA2311")("卡库卡机未成功打开");
-				LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_DevOpen_Failed, "卡库卡机未成功打开");
-				m_crossCtx->Answer(Error_DevNotAvailable, CardIssuer_UserErrorCode_DevOpen_Failed);
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220327").setResultCode("RTA2R04")("卡库卡机未成功打开");
+				LogWarn(Severity_Middle, Error_Unexpect, CardReadAdapter_UserErrorCode_CardIssuerStore_DevOpen_Failed, "卡库卡机未成功打开");
+				m_crossCtx->Answer(Error_DevNotAvailable, CardReadAdapter_UserErrorCode_CardIssuerStore_DevOpen_Failed);
 			}
 			else
 			{

Module/mod_CardReadAdapter/CardReadAdapter_UserErrorCode.h

@@ -16,5 +16,6 @@
 #define CardReadAdapter_UserErrorCode_CardIssuer_Is_Working					(CardReadAdapter_UserErrorCode_Start + 9)	//卡机实体正忙
 #define CardReadAdapter_UserErrorCode_HBService_No_Return					(CardReadAdapter_UserErrorCode_Start + 10)	//心跳服务超时未返回
 #define CardReadAdapter_UserErrorCode_CardActive_Unexpect					(CardReadAdapter_UserErrorCode_Start + 11)	//跨机收到未处理的返回（某些返回可能在后期细化中提供处理）
+#define CardReadAdapter_UserErrorCode_CardIssuerStore_DevOpen_Failed		(CardReadAdapter_UserErrorCode_Start + 12)  //跨机时卡库卡机未成功打开
 
 #endif //_CARDREADADAPTER_USER_ERRORCODE_H

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -719,7 +719,8 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Load, GetBasePath failed (%d).",eErrPath);
 		return Error_Param;
 	}
-	LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_RootInfo, m_adapterInfo.adapterFilePath.GetData());
+	//LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_RootInfo, m_adapterInfo.adapterFilePath.GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(m_adapterInfo.adapterFilePath.GetData());
 	if (Error_Succeed != LoadUpAdapterLibrary()) {
 		errMsg = "非接读卡器加载厂商适配器失败！请检查root.ini配置是否正确。";
 		LogWarn(Severity_Middle, Error_Unexpect, ContactlessCard_UserErrorCode_DllLoadFailed, errMsg.GetData());
@@ -786,7 +787,8 @@ ErrorCodeEnum CContactlessCardFSM::Load()
 	else
 	{
 		m_devInit = true;
-		LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Success, "非接读卡器打开成功");
+		//LogWarn(Severity_Low, Error_Unexpect, ContactlessCard_UserErrorCode_DevOpen_Success, "非接读卡器打开成功");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("非接读卡器打开成功");
 		return Error_Succeed;
 	}
 }

Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -267,7 +267,7 @@ unsigned int CCustMngrAuthFSM::s3_on_event(FSMEvent* pEvt)
 		{
 			pEvt->SetHandled();
 			AuthorizeFinishedEvent* authorEvt = dynamic_cast<AuthorizeFinishedEvent*>(pEvt);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("authorize finished with param1 as %d", authorEvt->param1);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("authorize finished with param1 as %d", authorEvt->param1);
 			if (authorEvt->param1 == 0)
 			{
 				 if (m_authCtx.eAuthByWhich == AuthByFngPrnt)
@@ -299,7 +299,7 @@ unsigned int CCustMngrAuthFSM::s3_on_event(FSMEvent* pEvt)
 		{
 			pEvt->SetHandled();
 			QueryAuthorInfoFinishedEvent* qafEvt = dynamic_cast<QueryAuthorInfoFinishedEvent*>(pEvt);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("authorize finished with param1 as %d", qafEvt->param1);
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("authorize finished with param1 as %d", qafEvt->param1);
 			if (qafEvt->param1 == 0)
 			{
 				 if (m_authCtx.eAuthByWhich == AuthByFngPrnt){
@@ -687,7 +687,7 @@ ErrorCodeEnum CCustMngrAuthFSM::GetImgBlob(CBlob& data, CSimpleStringA imgPath)
 ErrorCodeEnum CCustMngrAuthFSM::MatchFingerPrintEx(SpReqAnsContext<CustMngrAuthService_QueryAuthorInfo_Req, CustMngrAuthService_QueryAuthorInfo_Ans>::Pointer ctx, bool& bStopAuthorize, DWORD& dwUserErrCode)
 {
 	LOG_FUNCTION();
-	LogWarn(Severity_Low, Error_Unexpect, LOG_ERR_CUSTMNGRAUTH_INVOKE_MATCHEx, "web invoke MatchFingerPrintEx");
+	//LogWarn(Severity_Low, Error_Unexpect, LOG_ERR_CUSTMNGRAUTH_INVOKE_MATCHEx, "web invoke MatchFingerPrintEx");
 
 	ErrorCodeEnum errCode;
 	m_pFingerPrint = new FingerPrintService_ClientBase(m_pEntity);

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -376,7 +376,8 @@ int CFingerPrintFSM::Initial()
 		return 0;
 	}
 	FulfillAdapterInfoFrom(pEntity->vendorLibInfo);
-	LogWarn(Severity_Low, Error_Unexpect, FingerPrint_UserErrorCode_ROOT_INFO, m_adapterInfo.adapterFilePath.GetData());
+	//LogWarn(Severity_Low, Error_Unexpect, FingerPrint_UserErrorCode_ROOT_INFO, m_adapterInfo.adapterFilePath.GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(m_adapterInfo.adapterFilePath.GetData());
 	pEntity->InitializeVendorLogSwitch();
 	ErrorCodeEnum err = LoadUpAdapterLibrary();
 	if (!IS_SUCCEED(err))
@@ -437,7 +438,7 @@ int CFingerPrintFSM::Initial()
 	}
 	m_adapterInfo.FulfillCategoryInfo(m_devCatInfo);
 	SetDevInitFlag();
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹仪设备打开成功");
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("指纹仪设备打开成功");
 	return 0;
 }
 

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -330,6 +330,21 @@ void ResourceWatcherFSM::TriggerProccessUpload()
     }
 }
 
+void ResourceWatcherFSM::TriggerFileListUpload()
+{
+    CSmartPointer<IConfigInfo> spCtSettingConfig;
+    GetEntityBase()->GetFunction()->OpenConfig(Config_CenterSetting, spCtSettingConfig);
+    //集中配置读取需要上送的路径
+    CSimpleStringA fileListPath("");
+    spCtSettingConfig->ReadConfigValue(m_pEntity->GetEntityName(), "DirPathToUploadFileList", fileListPath);
+    if (!fileListPath.IsNullOrEmpty())
+    {
+        m_fileListPath = fileListPath.Split('|');
+        UploadDirPathFileListTask* uploadFileListTask = new UploadDirPathFileListTask(this);
+        GetEntityBase()->GetFunction()->PostThreadPoolTask(uploadFileListTask);
+    }
+}
+
 ErrorCodeEnum ResourceWatcherFSM::OnInit()
 {
     neverMainPage = true;		//是否未进入过首页
@@ -4890,7 +4905,7 @@ void ResourceWatcherFSM::ConfirmWindowEffectHasBeenOpen()
 }
 #endif // RVC_OS_LINUX
 
-void ResourceWatcherFSM::GetSystemProccess()
+void ResourceWatcherFSM::UploadSystemProccess()
 {
     if(processName.empty())
     {
@@ -4933,4 +4948,139 @@ void ResourceWatcherFSM::GetSystemProccess()
         }
         
     }
+}
+
+void ResourceWatcherFSM::UploadDirPathFileList(CSimpleStringA dirFilePath)
+{
+    CSimpleStringA realPath(true);
+    int res = ExpandDir(dirFilePath, realPath);
+    switch (res)
+    {
+    case -1: //映射无效，使用原数据
+    {
+        realPath = dirFilePath;
+        break;
+    }
+    case -2: //GetPath映射错误，ExpandDir有报错，这里就不报了
+    {
+        return;
+    }
+    default:
+        break;
+    }
+
+    DWORD attrs = GetFileAttributesA(realPath);
+    if (attrs == INVALID_FILE_ATTRIBUTES)
+    {
+        const DWORD lastError = GetLastError();
+        DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5A15")("Acess to path error：[%s], GLE = %u.", realPath.GetData(), lastError);
+        return;
+    }
+    else  if (!(attrs & FILE_ATTRIBUTE_DIRECTORY))
+    { //非文件夹类型
+        DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5A15")("Path [%s]  is not Directory!", realPath.GetData());
+        return;
+    }
+
+    int len = 0;
+    vector<CSimpleStringA> fileList = GetFileListFromDirectory(realPath);
+    if (!fileList.empty())
+    {
+
+        string tPath = realPath.GetData();
+        string jsonPath;
+        for (char c : tPath) { //替换反斜杠
+            if (c == '\\') {
+                jsonPath += '\\';
+                jsonPath += '\\';
+            }
+            else {
+                jsonPath += c;
+            }
+        }
+        CSimpleStringA curListStr = "";
+        CSimpleStringA endStr = ",";
+        CSimpleStringA totalListStr = CSimpleStringA::Format("{\"path\":\"%s\", \"fileList\":[", jsonPath.c_str());
+
+        if (totalListStr.GetLength() > 1000)
+        {
+            DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Dir Path length over 1000!");
+            DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("%s", totalListStr.SubString(0, 1000));
+            return;
+        }
+
+        for (int i = 0; i < fileList.size(); i++)
+        {
+            curListStr = CSimpleStringA("\"") + fileList[i] + "\"";
+            len = totalListStr.GetLength() + curListStr.GetLength();
+            if (len > 1000 || i == (fileList.size() - 1))
+            {
+                endStr = "]}";
+                if (i == (fileList.size() - 1)) //最后一个
+                {
+                    totalListStr = totalListStr + curListStr + endStr;
+                    DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("GetFileListFromDirectory")(totalListStr.GetData());
+                    break;
+                }
+                else //长度超限
+                {
+                    totalListStr[totalListStr.GetLength() - 1] = ']';
+                    totalListStr = totalListStr + "}";
+                    DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("GetFileListFromDirectory")(totalListStr.GetData());
+                    totalListStr = CSimpleStringA::Format("{\"path\":\"%s\", \"fileList\":[", jsonPath.c_str()) + curListStr + ","; //超过长度则从当前进程开始重新搭建日志
+                }
+            }
+            else
+            {
+                endStr = ",";
+                totalListStr = totalListStr + curListStr + endStr;
+            }
+        }
+    }
+}
+
+vector<CSimpleStringA> ResourceWatcherFSM::GetFileListFromDirectory(CSimpleStringA path)
+{
+    vector<CSimpleStringA> files;
+#ifdef _WIN32
+    WIN32_FIND_DATAA data;
+    HANDLE hFind;
+
+    CSimpleStringA searchPath = path + "\\*";
+    hFind = FindFirstFileA(searchPath.GetData(), &data);
+    if (hFind != INVALID_HANDLE_VALUE) {
+        do {
+            if (strcmp(data.cFileName, ".") == 0 || strcmp(data.cFileName, "..") == 0)
+                continue;
+            
+            files.push_back(data.cFileName);
+
+            if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) { //文件夹类型，只传文件夹名
+                CSimpleStringA fullPath = path + "\\" + data.cFileName;
+                UploadDirPathFileList(fullPath); //上送子文件夹下的文件列表
+            }
+        } while (FindNextFileA(hFind, &data) != 0);
+        FindClose(hFind);
+    }
+#else
+    DIR* dir = opendir(path.GetData());
+    if (!dir) return files;
+
+    struct dirent* entry;
+    while ((entry = readdir(dir)) != nullptr) {
+        if (CSimpleStringA(entry->d_name) == "." || CSimpleStringA(entry->d_name) == "..")
+            continue;
+        
+        files.push_back(entry->d_name);
+
+        CSimpleStringA fullPath = path + "/" + entry->d_name;
+        DWORD attrs = GetFileAttributesA(fullPath);
+        if (attrs & FILE_ATTRIBUTE_DIRECTORY) { //文件夹类型，只传文件夹名
+            UploadDirPathFileList(fullPath); //上送子文件夹下的文件列表
+        }
+    }
+    closedir(dir);
+#endif
+
+    return files;
 }

Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include "CommEntityUtil.hpp"
 #else
 #include <ws2tcpip.h>
 #include <tchar.h>
@@ -238,6 +237,7 @@ public:
 	//进入首页时触发的功能在此
 	void TriggerAtStatusChanged(bool bMStatus);
 	void TriggerProccessUpload();
+	void TriggerFileListUpload();
 
 	void AfterInit();
 
@@ -272,6 +272,7 @@ private:
 
 	int m_diskLastWarnHour;
 	BOOL m_skipDesktopDetect;
+	CAutoArray<CSimpleStringA> m_fileListPath;
 
 #ifdef RVC_OS_WIN
 	vector<CSimpleStringA>m_nonSignedFiles;
@@ -319,11 +320,16 @@ public:
 		ResourceWatcherService_GetBizLinks_Ans>::Pointer ctx);
 
 	bool GetNeverMainPageFlag() { return neverMainPage; } //是否未进过首页
-	void GetSystemProccess();
 	void GetSystemCPUStatus();
 	void GetSystemMemoryStatus();
 	void GetSystemDiskStatus();
 	void GetDiskStatusFrom(LPCTSTR path);
+
+	vector<CSimpleStringA> GetFileListFromDirectory(CSimpleStringA path);
+	void UploadDirPathFileList(CSimpleStringA dirFilePath);
+	CAutoArray<CSimpleStringA> GetUploadPathList() { return m_fileListPath; }
+	void UploadSystemProccess();
+
 	void HardwareInfoTimer(void* pData);
 	void DiskCheckTimer(void* pData);
 
@@ -519,6 +525,9 @@ struct DiskAndFilesTask : public ITaskSp
 			m_pFSM->GetEntityBase()->GetFunction()->SetTimer(TIMER_DISK_CHECK, pListener, checkTime);
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Set DISK CHECK Timer!");
 		}
+
+		//清理结束后触发
+		m_pFSM->TriggerFileListUpload();
 	}
 };
 
@@ -539,7 +548,6 @@ struct UploadSysProcInfoTask : public ITaskSp
 	UploadSysProcInfoTask(ResourceWatcherFSM* pFSM) : m_pFSM(pFSM) {}
 	void Process()
 	{
-		CSimpleStringA t_terminalState;
 		DWORD elapsed = 0;
 		DWORD dwStart = SP::Module::Comm::RVCGetTickCount();
 		DWORD dwEnd = SP::Module::Comm::RVCGetTickCount();
@@ -551,6 +559,21 @@ struct UploadSysProcInfoTask : public ITaskSp
 			elapsed = dwEnd - dwStart;
 		}
 		m_pFSM->GetSystemCPUStatus();
-		m_pFSM->GetSystemProccess();
+		m_pFSM->UploadSystemProccess();
+	}
+};
+
+//获取指定路径并将文件列表上送
+struct UploadDirPathFileListTask : public ITaskSp
+{
+	ResourceWatcherFSM* m_pFSM;
+	UploadDirPathFileListTask(ResourceWatcherFSM* pFSM) : m_pFSM(pFSM) {}
+	void Process()
+	{
+		CAutoArray<CSimpleStringA> list = m_pFSM->GetUploadPathList();
+		for (int i = 0; i < list.GetCount(); i++)
+		{
+			m_pFSM->UploadDirPathFileList(list[i]);
+		}
 	}
 };

Module/mod_ResourceWatcher/mod_ResourceWatcher.h

@@ -98,11 +98,15 @@ public:
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Terminal has been lastStage(%s) before ResourceWatcher start.", terminalStage);
 			m_fsm.TriggerProccessUpload();
+			if (!(0 == CSimpleStringA("A").Compare(terminalStage, true))) //非首页，已达终态
+			{
+				m_fsm.TriggerFileListUpload();
+			}
 		}
 		else
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Terminal is starting, regist the teminalStage Event.");
-			spEntityFunction->RegistSysVarEvent("terminalStage", this);
+			spEntityFunction->RegistSysVarEvent("TerminalStage", this);
 		}
 		
 
@@ -247,6 +251,10 @@ public:
 			{
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Status changed, teminalStage = %s.", pszValue);
 				m_fsm.TriggerProccessUpload();
+				if (!(0 == CSimpleStringA("A").Compare(pszValue, true))) //非通过准入的情况下，直接开始文件列表获取
+				{
+					m_fsm.TriggerFileListUpload();
+				}
 			}
 		}
 	}

Module/mod_RomoteController/RemoteControllerCnn.cpp

@@ -1582,11 +1582,11 @@ ErrorCodeEnum CRemoteControllerCnn::HandleUpgradePackReq(const CSmartPointer<IPa
 	auto rc = pClient->Connect();
 	if (rc == Error_Succeed)
 	{
-		UpgradeMgrService_RegistLocalPack_Req req = {};
-		req.strPackFile = strPack;
+		//UpgradeMgrService_RegistLocalPack_Req req = {};
+		//req.strPackFile = strPack;
 
-		UpgradeMgrService_RegistLocalPack_Ans ans = {};
-		rc = (*pClient)(EntityResource::getLink().upgradeLink())->RegistLocalPack(req, ans, 10000);
+		//UpgradeMgrService_RegistLocalPack_Ans ans = {};
+		//rc = (*pClient)(EntityResource::getLink().upgradeLink())->RegistLocalPack(req, ans, 10000);
 
 		pClient->GetFunction()->CloseSession();
     } else {
@@ -3387,11 +3387,11 @@ ErrorCodeEnum CRemoteControllerCnn::HandleCancelUpgradeReq(const CSmartPointer<I
 	auto rc = pClient->Connect();
 	if (rc == Error_Succeed)
 	{
-		UpgradeMgrService_CancelUpdate_Req req = {};
-		req.strPackFile = strPack;
+		//UpgradeMgrService_CancelUpdate_Req req = {};
+		//req.strPackFile = strPack;
 
-		UpgradeMgrService_CancelUpdate_Ans ans = {};
-		rc = (*pClient)(EntityResource::getLink().upgradeLink())->CancelUpdate(req, ans, 10000);
+		//UpgradeMgrService_CancelUpdate_Ans ans = {};
+		//rc = (*pClient)(EntityResource::getLink().upgradeLink())->CancelUpdate(req, ans, 10000);
 
 		pClient->GetFunction()->CloseSession();
     } else {

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -582,10 +582,10 @@ int CSalesRecorderEntity::GetRecordCamera()
 	}
 	else {
 		if (0 == iRecordCamera) {
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_SALESRECORD_USE_ENVCAMERA, "remote video record use env camera.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("remote video record use env camera.");
 		}
 		else {
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_SALESRECORD_USE_OPTCAMERA, "remote video record use opt camera.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("remote video record use opt camera.");
 		}
 	}
 
@@ -631,7 +631,7 @@ void CSalesRecorderEntity::OnRecordEntityExcption()
 
 void CSalesRecorderEntity::OnRecordFinished()
 {
-	LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORD_FINISHED, "现场销售双录已完成.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("现场销售双录已完成.");
 }
 
 
@@ -942,7 +942,7 @@ ErrorCodeEnum CSalesRecorderEntity::SaveVideo( const char * videofilename)
 						unsigned long ufilesize = GetFileSize(sourFileName.GetData());
 						char strhash[MAX_PATH] = { 0 };
 						get_file_sm3digest(strhash, MAX_PATH, sourFileName.GetData());
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORD_FILEINFO, CSimpleStringA::Format("%s file size is %u byte,sm3 digest is %s.", sourFileName.GetData(), ufilesize, strhash).GetData());
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s file size is %u byte,sm3 digest is %s.", sourFileName.GetData(), ufilesize, strhash);
 						bRet = rvcMoveFile(sourFileName.GetData(), destFileName.GetData());
 						if (!bRet) {
 							ErrorCode = Error_NotImpl;
@@ -967,7 +967,7 @@ ErrorCodeEnum CSalesRecorderEntity::SaveVideo( const char * videofilename)
 					}
 
 					if (bMoveSucc) {
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORD_SAVED_SUCCESS, CSimpleStringA::Format("succeed to save sales video, move it from %s to %s.", sourFileName.GetData(), destFileName.GetData()).GetData());
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("succeed to save sales video, move it from %s to %s.", sourFileName.GetData(), destFileName.GetData());
 					}
 				}
 			}
@@ -1149,7 +1149,7 @@ ErrorCodeEnum CSalesRecorderEntity::HandleStartRecord(const char *pszMessage, co
 
 	StartRecord(m_SalesVideoName, 90, &subtitleParam, m_bWholeSection, false, eRecordType);
 
-	LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD, CSimpleStringA::Format("start remote record %s.", m_SalesVideoName).GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start remote record %s.", m_SalesVideoName);
 
 	return Error;
 }

Module/mod_UpgradeMgr/UpgradeManager_client_g.h

@@ -107,104 +107,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum RegistLocalPack(UpgradeMgrService_RegistLocalPack_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UpgradeMgrService_Method_RegistLocalPack, UpgradeMgrService_MethodSignature_RegistLocalPack, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum RegistLocalPack(UpgradeMgrService_RegistLocalPack_Req &Req, UpgradeMgrService_RegistLocalPack_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistLocalPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum RegistLocalPack(UpgradeMgrService_RegistLocalPack_Req &Req, UpgradeMgrService_RegistLocalPack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistLocalPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum RegistLocalPack(UpgradeMgrService_RegistLocalPack_Req &Req, UpgradeMgrService_RegistLocalPack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistLocalPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum CancelUpdate(UpgradeMgrService_CancelUpdate_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UpgradeMgrService_Method_CancelUpdate, UpgradeMgrService_MethodSignature_CancelUpdate, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum CancelUpdate(UpgradeMgrService_CancelUpdate_Req &Req, UpgradeMgrService_CancelUpdate_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CancelUpdate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum CancelUpdate(UpgradeMgrService_CancelUpdate_Req &Req, UpgradeMgrService_CancelUpdate_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CancelUpdate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum CancelUpdate(UpgradeMgrService_CancelUpdate_Req &Req, UpgradeMgrService_CancelUpdate_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = CancelUpdate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum RollbackUpdate(UpgradeMgrService_RollbackUpdate_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
@@ -254,153 +156,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum SwitchUpgrade(UpgradeMgrService_SwitchUpgrade_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UpgradeMgrService_Method_SwitchUpgrade, UpgradeMgrService_MethodSignature_SwitchUpgrade, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum SwitchUpgrade(UpgradeMgrService_SwitchUpgrade_Req &Req, UpgradeMgrService_SwitchUpgrade_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = SwitchUpgrade(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum SwitchUpgrade(UpgradeMgrService_SwitchUpgrade_Req &Req, UpgradeMgrService_SwitchUpgrade_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = SwitchUpgrade(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum SwitchUpgrade(UpgradeMgrService_SwitchUpgrade_Req &Req, UpgradeMgrService_SwitchUpgrade_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = SwitchUpgrade(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum RegistManualPack(UpgradeMgrService_RegistManualPack_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UpgradeMgrService_Method_RegistManualPack, UpgradeMgrService_MethodSignature_RegistManualPack, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum RegistManualPack(UpgradeMgrService_RegistManualPack_Req &Req, UpgradeMgrService_RegistManualPack_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistManualPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum RegistManualPack(UpgradeMgrService_RegistManualPack_Req &Req, UpgradeMgrService_RegistManualPack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistManualPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum RegistManualPack(UpgradeMgrService_RegistManualPack_Req &Req, UpgradeMgrService_RegistManualPack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = RegistManualPack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum GetManualPacks(UpgradeMgrService_GetManualPacks_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UpgradeMgrService_Method_GetManualPacks, UpgradeMgrService_MethodSignature_GetManualPacks, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum GetManualPacks(UpgradeMgrService_GetManualPacks_Req &Req, UpgradeMgrService_GetManualPacks_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetManualPacks(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetManualPacks(UpgradeMgrService_GetManualPacks_Req &Req, UpgradeMgrService_GetManualPacks_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetManualPacks(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetManualPacks(UpgradeMgrService_GetManualPacks_Req &Req, UpgradeMgrService_GetManualPacks_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetManualPacks(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 
 	bool SafeDelete()
 	{

Module/mod_UpgradeMgr/UpgradeManager_def_g.h

@@ -13,28 +13,13 @@ namespace UpgradeManager {
 //
 
 #define UpgradeMgrService_Method_GetUpgradeState 0
-#define UpgradeMgrService_Method_RegistLocalPack 1
-#define UpgradeMgrService_Method_CancelUpdate 2
 #define UpgradeMgrService_Method_RollbackUpdate 3
-#define UpgradeMgrService_Method_SwitchUpgrade 4
-#define UpgradeMgrService_Method_RegistManualPack 5
-#define UpgradeMgrService_Method_GetManualPacks 6
 
 #define UpgradeMgrService_MethodSignature_GetUpgradeState 787774394
-#define UpgradeMgrService_MethodSignature_RegistLocalPack 1118477438
-#define UpgradeMgrService_MethodSignature_CancelUpdate -1276919305
 #define UpgradeMgrService_MethodSignature_RollbackUpdate -1898507850
-#define UpgradeMgrService_MethodSignature_SwitchUpgrade -2116882538
-#define UpgradeMgrService_MethodSignature_RegistManualPack -1924952337
-#define UpgradeMgrService_MethodSignature_GetManualPacks -905215373
 
 #define UpgradeMgrService_LogCode_GetUpgradeState "QLR040250600"
-#define UpgradeMgrService_LogCode_RegistLocalPack "QLR040250601"
-#define UpgradeMgrService_LogCode_CancelUpdate "QLR040250602"
 #define UpgradeMgrService_LogCode_RollbackUpdate "QLR040250603"
-#define UpgradeMgrService_LogCode_SwitchUpgrade "QLR040250604"
-#define UpgradeMgrService_LogCode_RegistManualPack "QLR040250605"
-#define UpgradeMgrService_LogCode_GetManualPacks "QLR040250606"
 
 struct UpgradeMgrService_GetUpgradeState_Req
 {
@@ -62,46 +47,6 @@ struct UpgradeMgrService_GetUpgradeState_Ans
 
 };
 
-struct UpgradeMgrService_RegistLocalPack_Req
-{
-	CSimpleStringA strPackFile;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strPackFile;
-	}
-
-};
-
-struct UpgradeMgrService_RegistLocalPack_Ans
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UpgradeMgrService_CancelUpdate_Req
-{
-	CSimpleStringA strPackFile;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strPackFile;
-	}
-
-};
-
-struct UpgradeMgrService_CancelUpdate_Ans
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
 struct UpgradeMgrService_RollbackUpdate_Req
 {
 	CSimpleStringA strVersion;
@@ -122,71 +67,6 @@ struct UpgradeMgrService_RollbackUpdate_Ans
 
 };
 
-struct UpgradeMgrService_SwitchUpgrade_Req
-{
-	CSimpleStringA strPackFile;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strPackFile;
-	}
-
-};
-
-struct UpgradeMgrService_SwitchUpgrade_Ans
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UpgradeMgrService_RegistManualPack_Req
-{
-	CSimpleStringA strPackFile;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strPackFile;
-	}
-
-};
-
-struct UpgradeMgrService_RegistManualPack_Ans
-{
-	double Errcode;
-	CSimpleStringA ErrMsg;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & Errcode & ErrMsg;
-	}
-
-};
-
-struct UpgradeMgrService_GetManualPacks_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UpgradeMgrService_GetManualPacks_Ans
-{
-	CSimpleStringA strPackFileList;
-	double Errcode;
-	CSimpleStringA ErrMsg;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strPackFileList & Errcode & ErrMsg;
-	}
-
-};
-
 
 ///////////////////////////
 

Module/mod_UpgradeMgr/UpgradeManager_msg_g.h

@@ -10,11 +10,9 @@
 
 namespace UpgradeManager {
 #define eMsg_UpgradeStateEvent 0
-#define eMsg_ManualTaskEvent 1
 #define eMsg_UpgradeDownloadProgress 2
 
 #define eMsgSig_UpgradeStateEvent -1650087685
-#define eMsgSig_ManualTaskEvent 1253338878
 #define eMsgSig_UpgradeDownloadProgress -498820347
 
 struct UpgradeStateEvent
@@ -35,19 +33,6 @@ struct UpgradeStateEvent
 
 ///////////////////////////
 
-struct ManualTaskEvent
-{
-	int nTaskNum;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & nTaskNum;
-	}
-
-};
-
-///////////////////////////
-
 struct UpgradeDownloadProgress
 {
 	CSimpleStringA currentFile;

Module/mod_UpgradeMgr/UpgradeManager_server_g.h

@@ -37,20 +37,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_RegistLocalPack:
-			if (dwSignature == UpgradeMgrService_MethodSignature_RegistLocalPack) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_CancelUpdate:
-			if (dwSignature == UpgradeMgrService_MethodSignature_CancelUpdate) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case UpgradeMgrService_Method_RollbackUpdate:
 			if (dwSignature == UpgradeMgrService_MethodSignature_RollbackUpdate) {
 				bOverlap = true;
@@ -58,27 +44,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_SwitchUpgrade:
-			if (dwSignature == UpgradeMgrService_MethodSignature_SwitchUpgrade) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_RegistManualPack:
-			if (dwSignature == UpgradeMgrService_MethodSignature_RegistManualPack) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_GetManualPacks:
-			if (dwSignature == UpgradeMgrService_MethodSignature_GetManualPacks) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -95,36 +60,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_RegistLocalPack:
-			if (dwSignature != UpgradeMgrService_MethodSignature_RegistLocalPack) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_CancelUpdate:
-			if (dwSignature != UpgradeMgrService_MethodSignature_CancelUpdate) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case UpgradeMgrService_Method_RollbackUpdate:
 			if (dwSignature != UpgradeMgrService_MethodSignature_RollbackUpdate) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_SwitchUpgrade:
-			if (dwSignature != UpgradeMgrService_MethodSignature_SwitchUpgrade) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_RegistManualPack:
-			if (dwSignature != UpgradeMgrService_MethodSignature_RegistManualPack) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_GetManualPacks:
-			if (dwSignature != UpgradeMgrService_MethodSignature_GetManualPacks) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -137,36 +77,11 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_RegistLocalPack(SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req, UpgradeMgrService_RegistLocalPack_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CancelUpdate(SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req, UpgradeMgrService_CancelUpdate_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_RollbackUpdate(SpReqAnsContext<UpgradeMgrService_RollbackUpdate_Req, UpgradeMgrService_RollbackUpdate_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_SwitchUpgrade(SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req, UpgradeMgrService_SwitchUpgrade_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_RegistManualPack(SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req, UpgradeMgrService_RegistManualPack_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_GetManualPacks(SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req, UpgradeMgrService_GetManualPacks_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		CAutoBuffer Buf;
@@ -193,26 +108,6 @@ public:
 						Handle_GetUpgradeState(ctx);
 					}
 					break;
-				case UpgradeMgrService_Method_RegistLocalPack:
-					{
-						SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req,UpgradeMgrService_RegistLocalPack_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req,UpgradeMgrService_RegistLocalPack_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_RegistLocalPack(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_CancelUpdate:
-					{
-						SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req,UpgradeMgrService_CancelUpdate_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req,UpgradeMgrService_CancelUpdate_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CancelUpdate(ctx);
-					}
-					break;
 				case UpgradeMgrService_Method_RollbackUpdate:
 					{
 						SpReqAnsContext<UpgradeMgrService_RollbackUpdate_Req,UpgradeMgrService_RollbackUpdate_Ans>::Pointer ctx;
@@ -223,36 +118,6 @@ public:
 						Handle_RollbackUpdate(ctx);
 					}
 					break;
-				case UpgradeMgrService_Method_SwitchUpgrade:
-					{
-						SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req,UpgradeMgrService_SwitchUpgrade_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req,UpgradeMgrService_SwitchUpgrade_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_SwitchUpgrade(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_RegistManualPack:
-					{
-						SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req,UpgradeMgrService_RegistManualPack_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req,UpgradeMgrService_RegistManualPack_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_RegistManualPack(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_GetManualPacks:
-					{
-						SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req,UpgradeMgrService_GetManualPacks_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req,UpgradeMgrService_GetManualPacks_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_GetManualPacks(ctx);
-					}
-					break;
 				default:
 					assert(0);
 					break;

Module/mod_UpgradeMgr/UpgradeTaskFSM.h

@@ -10,7 +10,7 @@
 #include "IHttpFunc.h"
 #define DOWNLOAD_CONTENT_EACH_LEN 512*1024
 #define DOWNLOAD_TIMEOUT 2*60
-#define QUERY_NO_TASK_WARN_LIMIT 10
+#define QUERY_NO_TASK_WARN_LIMIT 15
 #define	QUERY_IS_WORK_WARN_LIMIT 10
 using namespace std;
 
@@ -19,7 +19,7 @@ using namespace std;
 #define ERR_TASK_QUERY_CONTINUE_NEW_TASK_FAIL 0x50620024 //查询继续新任务报错
 #define ERR_TASK_QUERY_CONTINUE_NEW_TASK_ERR 0x50620025 //查询继续新任务异常
 
-#define WARN_BLACK_FILE_SUM 0x50600023 //黑名单文件数量
+//#define WARN_BLACK_FILE_SUM 0x50600023 //黑名单文件数量
 
 #define UpgradeMgr_VERSION_DOWNLOAD_ID "QLR0402506Z10101"
 #define UpgradeMgr_VERSION_INSTALL_ID "QLR0402506Z10201"

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -64,7 +64,7 @@ namespace Task
 					return;
 				}
 				else {
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("InitFSMTask")("init new upgradeTaskMgr FSM succ");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("InitFSMTask")("init new upgradeTaskMgr FSM succ");
 					Mgr->m_initSucc = true;
 				}
 
@@ -92,10 +92,10 @@ namespace Task
 				int rollbackTemp = 0;
 				if (ret == Error_Succeed) {
 					spConfig->ReadConfigValueInt("UpgradeManager", "RollbackFlag", rollbackTemp);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("RollbackUpdate")("get centerSetting RollbackFlag=%d", rollbackTemp);
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("RollbackUpdate")("get centerSetting RollbackFlag=%d", rollbackTemp);
 				}
 				else {
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("RollbackUpdate")("get centerSetting RollbackFlag fail");
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("RollbackUpdate")("get centerSetting RollbackFlag fail,use default value 0");
 				}
 				if (rollbackTemp == 0) {
 					//立即回退模式
@@ -155,7 +155,7 @@ namespace Task
 				int rollbackTemp = 0;
 				if (ret == Error_Succeed) {
 					spConfig->ReadConfigValueInt("UpgradeManager", "RollbackFlag", rollbackTemp);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get centerSetting RollbackFlag=%d", rollbackTemp);
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("get centerSetting RollbackFlag=%d", rollbackTemp);
 				}
 				else {
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("get centerSetting RollbackFlag fail");
@@ -218,7 +218,7 @@ void CUpgradeMgrEntity::OnStarted()
 	if (pFunc->GetSysVar("UIState", strValue) == Error_Succeed && strValue.Compare("M") ==0)
 	{
 		// 已经进入首页状态
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("system page isStartup 1");
+		DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("system page isStartup 1");
 		m_bStartUp =true;
 	}		
 	else
@@ -230,7 +230,7 @@ void CUpgradeMgrEntity::OnStarted()
 			LogWarn(Severity_Middle, rc, ERR_WRAN_REGIST_SYS_VAR_FAIL, CSimpleStringA::Format("RegistSysVarEvent UIState  is fail,%d",(int)rc).GetData());
 			m_testResult=Error_InvalidState;//自检失败
 		}else{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent UIState succ");
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistSysVarEvent UIState succ");
 		}
 
 	}
@@ -267,7 +267,7 @@ void CUpgradeMgrEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,c
 	if(strcmp("UIState",pszKey)==0){
 		if(!m_bStartUp){
 			if (strcmp(pszValue, "M") ==0){
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("system page isStartup 2");
+				DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("system page isStartup 2");
 				m_bStartUp = true;				
 			}
 		}
@@ -317,50 +317,12 @@ char CUpgradeMgrEntity::GetInstallStateVal(const InstallStateEnum enumVal)
 	return ' ';  // error
 }
 
-//新状态机不处理
-ErrorCodeEnum CUpgradeMgrEntity::RegistLocalPack(const CSimpleStringA &strPackFile)
-{
-	if(m_initSucc){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistLocalPack new UpgradeMgr is not deal with");
-		return Error_NotImpl;
-	}else{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("initFSM is not end");
-		return Error_Pending;//状态机还未启动
-	}
-	
-}
-
-//新状态机不处理
-DWORD CUpgradeMgrEntity::RegistManualPack(const CSimpleStringA &strPackFile)
-{
-	if(m_initSucc){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RegistManualPack new UpgradeMgr is not deal with");
-		return UPGRADE_MGR_NOT_IMPLEMENT;
-	}else{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("initFSM is not end");
-		return Error_Pending;//状态机还未启动
-	}
-}
-
-
-//新状态机不处理
-ErrorCodeEnum CUpgradeMgrEntity::CancelUpdate(const CSimpleStringA &strPackFile)
-{
-	if(m_initSucc){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CancelUpdate new UpgradeMgr is not deal with");
-		return Error_NotImpl;
-	}else{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("initFSM is not end");
-		return Error_Pending;//状态机还未启动
-	}
-}
-
 //新状态机处理
 ErrorCodeEnum CUpgradeMgrEntity::RollbackUpdate(const CSimpleStringA &strVersion)
 {
 	if(m_initSucc){
 		if(bNewUpgradeMgr){
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackUpdate new UpgradeMgr deal with");
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackUpdate new UpgradeMgr deal with");
 			if(strVersion.GetLength()==0){
 				LogWarn(Severity_Low, Error_NotImpl, ERR_TASK_ROLLBACK_FAIL, "version is empty , rollback upgrade fail");
 				return Error_NotImpl;
@@ -392,7 +354,7 @@ ErrorCodeEnum CUpgradeMgrEntity::RollbackUpdate(const CSimpleStringA &strVersion
 								Task::RollBackTask* rTask = new Task::RollBackTask(this, CVersion(w1, w2, w3, w4));
 								ErrorCodeEnum rc = this->GetFunction()->PostThreadPoolTask(rTask);
 								if (Error_Succeed == rc) {
-									DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackFlag thread start succ");
+									DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackFlag thread start succ");
 									m_taskFSM.m_bRollbackTask = true;//启动线程
 									return Error_Succeed;
 								}
@@ -413,7 +375,7 @@ ErrorCodeEnum CUpgradeMgrEntity::RollbackUpdate(const CSimpleStringA &strVersion
 							Task::RollBackDepTask* rTask = new Task::RollBackDepTask(this, strVersion);
 							ErrorCodeEnum rc = this->GetFunction()->PostThreadPoolTask(rTask);
 							if (Error_Succeed == rc) {
-								DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackFlag Dep thread start succ");
+								DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("RollbackFlag Dep thread start succ");
 								m_taskFSM.m_bRollbackTask = true;//启动线程
 								return Error_Succeed;
 							}
@@ -439,34 +401,11 @@ ErrorCodeEnum CUpgradeMgrEntity::RollbackUpdate(const CSimpleStringA &strVersion
 	}
 }
 
-//新状态机不处理
-DWORD CUpgradeMgrEntity::GetManualPacks(CSimpleStringA &strManualPacks)
-{	
-	if(m_initSucc){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("GetManualPacks new UpgradeMgr is not deal with");
-		return UPGRADE_MGR_NOT_IMPLEMENT;
-	}else{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("initFSM is not end");
-		return Error_Pending;//状态机还未启动
-	}
-}
-
 CServerSessionBase* CUpgradeMgrEntity::OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/)
 {
 	return new CUpgradeMgrSession(this);
 }
 
-//新状态机不处理
-ErrorCodeEnum CUpgradeMgrEntity::SwitchUpgrade(const CSimpleStringA &strPack)
-{
-	if(m_initSucc){
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("SwitchUpgrade new UpgradeMgr is not deal with");
-		return Error_NotImpl;
-	}else{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("initFSM is not end");
-		return Error_Pending;//状态机还未启动
-	}
-}
 
 //新状态机处理
 ErrorCodeEnum CUpgradeMgrEntity::GetUpgradeState(bool &bInstalling, CSimpleStringA &strPackFile, CSimpleStringA &strExecID,
@@ -509,75 +448,76 @@ ErrorCodeEnum CUpgradeMgrEntity::testActive()
 
 ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 {
-#ifdef RVC_OS_WIN
-	// 通知媒体停止播放广告和声音
-	LocalMediaPlay::PlayService_ClientBase *pClient = new LocalMediaPlay::PlayService_ClientBase(this);
-	ErrorCodeEnum rc = pClient->Connect();
-	if (rc == Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to entity [LocalMediaPlay] succeed, start StopMediaPlay now");
-		//采用新接口停止所有音视频播放
-		LocalMediaPlay::PlayService_StopPlayAllMedias_Req req1 = {};
-		LocalMediaPlay::PlayService_StopPlayAllMedias_Ans ans1 = {};
-		if (Error_Succeed == (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAllMedias(req1, ans1, 10000))
-		{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias success");
-		}else{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias fail");
-			pClient->GetFunction()->CloseSession();
-			pClient->SafeDelete();
-			return rc;
-		}
-		pClient->GetFunction()->CloseSession();
-	}
-	else
-	{
-		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
-	}
-	pClient->SafeDelete();
-	return rc;
-#else
+//#ifdef RVC_OS_WIN
+//	// 通知媒体停止播放广告和声音
+//	LocalMediaPlay::PlayService_ClientBase *pClient = new LocalMediaPlay::PlayService_ClientBase(this);
+//	ErrorCodeEnum rc = pClient->Connect();
+//	if (rc == Error_Succeed)
+//	{
+//		DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to entity [LocalMediaPlay] succeed, start StopMediaPlay now");
+//		//采用新接口停止所有音视频播放
+//		LocalMediaPlay::PlayService_StopPlayAllMedias_Req req1 = {};
+//		LocalMediaPlay::PlayService_StopPlayAllMedias_Ans ans1 = {};
+//		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAllMedias(req1, ans1, 30000);
+//		if (Error_Succeed == rc )
+//		{
+//			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias success");
+//		}else{
+//			DbgWithLink(LOG_LEVEL_WARN,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias fail, err=%d",(int)rc);
+//			pClient->GetFunction()->CloseSession();
+//			pClient->SafeDelete();
+//			return rc;
+//		}
+//		pClient->GetFunction()->CloseSession();
+//	}
+//	else
+//	{
+//		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
+//	}
+//	pClient->SafeDelete();
+//	return rc;
+//#else
 		// 通知媒体停止播放广告和声音
 	LocalMediaPlay::PlayService_ClientBase *pClient = new LocalMediaPlay::PlayService_ClientBase(this);
 	ErrorCodeEnum rc = pClient->Connect();
 	if (rc == Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to entity [LocalMediaPlay] succeed, start StopMediaPlay now");
+		DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to entity [LocalMediaPlay] succeed, start StopMediaPlay now");
 		LocalMediaPlay::PlayService_StopPlayVideo_Req req1 = {};
 		LocalMediaPlay::PlayService_StopPlayVideo_Ans ans1 = {};
 		req1.CfgInx = 1;
-		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayVideo(req1, ans1, 10000);
+		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayVideo(req1, ans1, 30000);
 		if (Error_Succeed == rc)
 		{
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayVideo success");
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayVideo success");
 		}else{
-			Dbg("StopPlayVideo fail");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayVideo fail, err=%d", (int)rc);
 			pClient->GetFunction()->CloseSession();
-			pClient->SafeDelete();
 			return rc;
 		}
 
 		LocalMediaPlay::PlayService_StopPlayAudio_Req req2 = {};
 		LocalMediaPlay::PlayService_StopPlayAudio_Ans ans2 = {};
-		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAudio(req2, ans2, 10000);
+		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAudio(req2, ans2, 30000);
 		if (Error_Succeed == rc)
 		{
-			Dbg("StopPlayAudio success");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAudio success");
 		}else{
-			Dbg("StopPlayAudio fail");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAudio fail, err=%d", (int)rc);
 			pClient->GetFunction()->CloseSession();
-			pClient->SafeDelete();
 			return rc;
 		}
 		pClient->GetFunction()->CloseSession();
+		return rc;
 	}
 	else
 	{
 		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
 		pClient->SafeDelete();
+		return rc;
 	}
-	return rc;
-#endif
+	
+//#endif
 	
 }
 SP_BEGIN_ENTITY_MAP()

Module/mod_UpgradeMgr/mod_UpgradeMgr.h

@@ -52,12 +52,10 @@ public:
 	virtual void OnSysVarEvent(const char *pszKey, const char *pszValue,const char *pszOldValue,const char *pszEntityName);
 	static char GetInstallStateVal(const InstallStateEnum enumVal);
 	
-	ErrorCodeEnum RegistLocalPack(const CSimpleStringA &strPackFile);
-	DWORD RegistManualPack(const CSimpleStringA &strPackFile);
-	DWORD GetManualPacks(CSimpleStringA &strManualPacks);
-	ErrorCodeEnum CancelUpdate(const CSimpleStringA &strPackName);
+	
+
 	ErrorCodeEnum RollbackUpdate(const CSimpleStringA &strVersion);
-	ErrorCodeEnum SwitchUpgrade(const CSimpleStringA &strPack);
+	
 	ErrorCodeEnum GetUpgradeState(bool &bInstalling, CSimpleStringA &strPackFile, CSimpleStringA &strExecID,
 		char &nInstallState, bool &bSysInstall, bool &bLightPack, CSimpleStringA &strNewVersion);
 	//检测active文件是否被锁
@@ -98,36 +96,6 @@ public:
 	CUpgradeMgrSession(CUpgradeMgrEntity *pEntity) : m_pEntity(pEntity) {}
 	virtual ~CUpgradeMgrSession() {}
 
-	virtual void Handle_RegistLocalPack(SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req, UpgradeMgrService_RegistLocalPack_Ans>::Pointer ctx)
-	{
-		DbgToBeidou(ctx->link, __FUNCTION__)();
-		ErrorCodeEnum rc = m_pEntity->RegistLocalPack(ctx->Req.strPackFile);
-		ctx->Answer(rc);
-	}
-
-	virtual void Handle_RegistManualPack(SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req, UpgradeMgrService_RegistManualPack_Ans>::Pointer ctx)
-	{
-		LOG_FUNCTION();
-		DbgToBeidou(ctx->link, __FUNCTION__)();
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("RegistManualPack received!");
-		DWORD dwRet = 0;
-		CSimpleStringA strErrmsg="RegistManualPack new UpgradeMgr is not deal with";
-		
-		dwRet = m_pEntity->RegistManualPack(ctx->Req.strPackFile);
-
-		ctx->Ans.Errcode = dwRet;
-		ctx->Ans.ErrMsg = strErrmsg;
-		ctx->Answer(Error_Succeed);
-	}
-
-	virtual void Handle_CancelUpdate(SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req, UpgradeMgrService_CancelUpdate_Ans>::Pointer ctx)
-	{
-		DbgToBeidou(ctx->link, __FUNCTION__)();
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("CancelUpdate received!");
-		ErrorCodeEnum rc = m_pEntity->CancelUpdate(ctx->Req.strPackFile);
-		ctx->Answer(rc);
-	}
-
 	virtual void Handle_RollbackUpdate(SpReqAnsContext<UpgradeMgrService_RollbackUpdate_Req, UpgradeMgrService_RollbackUpdate_Ans>::Pointer ctx)
 	{
 		DbgToBeidou(ctx->link, __FUNCTION__)();
@@ -145,29 +113,6 @@ public:
 		ctx->Answer(rc);
 	}
 
-	virtual void Handle_SwitchUpgrade(SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req, UpgradeMgrService_SwitchUpgrade_Ans>::Pointer ctx)
-	{
-		DbgToBeidou(ctx->link, __FUNCTION__)();
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("SwitchUpgrade received!");
-		auto rc = m_pEntity->SwitchUpgrade(ctx->Req.strPackFile);
-		ctx->Answer(rc);
-	}
-
-	virtual void Handle_GetManualPacks(SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req, UpgradeMgrService_GetManualPacks_Ans>::Pointer ctx)
-	{
-		LOG_FUNCTION();
-		DbgToBeidou(ctx->link, __FUNCTION__)();
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("GetManualPacks received!");
-		DWORD dwRet = 0;
-		CSimpleStringA strErrmsg= "GetManualPacks new UpgradeMgr is not deal with";
-		CSimpleStringA strPackList="";
-		dwRet = m_pEntity->GetManualPacks(strPackList);
-
-		ctx->Ans.Errcode = dwRet;
-		ctx->Ans.ErrMsg = strErrmsg;
-		ctx->Answer(Error_Succeed);
-	}
-
 private:
 	CUpgradeMgrEntity *m_pEntity;
 };

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -1045,7 +1045,7 @@ CSimpleStringA CAccessAuthFSM::GetOsVersion()
 	ErrorCodeEnum eErr = GetEntityBase()->GetFunction()->GetPath("runinfo", runInfoPath);
 	if (eErr != Error_Succeed) {
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("GetPath runinfo error=%s.", SpStrError(eErr));
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		errMsg = generateJsonStr(errInfo).second.c_str();
 		return errMsg;
 	}
@@ -1056,7 +1056,7 @@ CSimpleStringA CAccessAuthFSM::GetOsVersion()
 	{
 		DWORD dwErr = GetLastError();
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("open runcfg\\osverion file failed. [%d]", dwErr);
-		errInfo["getLastErr"] = dwErr;
+		errInfo["getLastErr"] = to_string(dwErr);
 		errMsg = generateJsonStr(errInfo).second.c_str();
 		return errMsg;
 	}
@@ -1071,7 +1071,7 @@ CSimpleStringA CAccessAuthFSM::GetOsVersion()
 			continue;
 	}
 
-	errInfo["getLastErr"] = GetLastError();
+	errInfo["getLastErr"] = to_string(GetLastError());
 	errMsg = generateJsonStr(errInfo).second.c_str();
 	return errMsg;
 #else
@@ -1107,12 +1107,12 @@ void CAccessAuthFSM::GetIPandMac(CSimpleStringA& ip, CSimpleStringA& mac)
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Get sys netinfo failed!. rc=%d.", rc);
 		errInfo["errcode"] = "RTA5216";
 		errInfo["msg"] = "调用系统api获取ip失败";
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		ip = generateJsonStr(errInfo).second.c_str();
 
 		errInfo["errcode"] = "RTA5217";
 		errInfo["msg"] = "调用系统api获取mac地址失败";
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		mac = generateJsonStr(errInfo).second.c_str();
 
 		auto pEntity = (CAccessAuthEntity*)m_pEntity;

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -782,7 +782,7 @@ ErrorCodeEnum CAccessAuthEntity::GetPinPadModel(CSimpleStringA& pinpadModel, boo
 
 		errInfo["errcode"] = "RTA5204";
 		errInfo["msg"] = "PinPad超时未打开";
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		pinpadModel = generateJsonStr(errInfo).second.c_str();
 
 	}
@@ -797,7 +797,7 @@ ErrorCodeEnum CAccessAuthEntity::GetPinPadModel(CSimpleStringA& pinpadModel, boo
 
 		errInfo["errcode"] = "RTA5218";
 		errInfo["msg"] = "PinPad打开失败";
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		pinpadModel = generateJsonStr(errInfo).second.c_str();
 	}
 	else if(rc != Error_Succeed)
@@ -811,7 +811,7 @@ ErrorCodeEnum CAccessAuthEntity::GetPinPadModel(CSimpleStringA& pinpadModel, boo
 
 		errInfo["errcode"] = "RTA5205";
 		errInfo["msg"] = "连接PinPad取数据异常";
-		errInfo["getLastErr"] = GetLastError();
+		errInfo["getLastErr"] = to_string(GetLastError());
 		pinpadModel = generateJsonStr(errInfo).second.c_str();
 	}
 
@@ -1347,7 +1347,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5213";
 			errInfo["msg"] = "调用系统api获取CPU序号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_cpuId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;
@@ -1373,7 +1373,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5214";
 			errInfo["msg"] = "调用系统api获取主板ID号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_mainBoardId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;
@@ -1400,7 +1400,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5215";
 			errInfo["msg"] = "调用系统api获取硬盘ID号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_hardDiskId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;
@@ -1434,7 +1434,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5213";
 			errInfo["msg"] = "调用系统api获取CPU序号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_cpuId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;
@@ -1461,7 +1461,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5214";
 			errInfo["msg"] = "调用系统api获取主板ID号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_mainBoardId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;
@@ -1489,7 +1489,7 @@ void CAccessAuthEntity::GetHardWareInfo()
 		{
 			errInfo["errcode"] = "RTA5215";
 			errInfo["msg"] = "调用系统api获取硬盘ID号失败";
-			errInfo["getLastErr"] = GetLastError();
+			errInfo["getLastErr"] = to_string(GetLastError());
 			m_hardDiskId = generateJsonStr(errInfo).second.c_str();
 
 			m_iGetTermSysInfo = -1;

Module/mod_alarm/AlarmFSM.cpp

@@ -323,7 +323,8 @@ void AlarmFSM::s0_on_entry()
 {
 	if(!m_initAlarm){
 		m_initAlarm=true;
-		LogWarn(Severity_Low,Error_Exception,WARN_ALARM_START_NEW_MODE,CSimpleStringA::Format("init alarm new model,model=%d",m_CenterModel));
+		//LogWarn(Severity_Low,Error_Exception,WARN_ALARM_START_NEW_MODE,CSimpleStringA::Format("init alarm new model,model=%d",m_CenterModel));
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("init alarm new model,model=%d", m_CenterModel);
 	}
 
 	//新模式

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -14,6 +14,7 @@
 #pragma comment(lib, "libpublicFun.lib")
 #include <algorithm>
 #include <map>
+#include <list>
 #ifdef RVC_OS_WIN
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #include <atltime.h>
@@ -2965,7 +2966,12 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStoreService_Read
 				else
 				{
 					//既没有读到磁条，又不是IC，很大概率是插反了
-					LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了");
+					if (m_issueStatus) {
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了，m_issueStatus=1");
+					}
+					else {
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_Maybe_InsertCard_InWrongStyle, "<ReadCard>, 既没读到磁条，又没检测到IC，可能插反了，m_issueStatus=0");
+					}
 					if (m_issueStatus)
 					{
 						m_mixedEx[m_currentHopper - 1]++;
@@ -3015,7 +3021,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStoreService_Read
 			return 1;
 	}
 	bICOK = true;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
 	return 0;
 }
 int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStoreService_Read_Req, CardIssuerStoreService_Read_Ans>::Pointer ctx)
@@ -3274,7 +3280,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStoreService_Read_Req,
 		else
 			return 1;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d", ctx->Ans.ICType);
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222003")("ReadCard suc. cardType:%d. m_issueStatus:%d", ctx->Ans.ICType, m_issueStatus);
 	return 0;
 }
 int CCardIssuerFSM::PreOnline(SpReqAnsContext<CardIssuerStoreService_PreOnline_Req, CardIssuerStoreService_PreOnline_Ans>::Pointer ctx)
@@ -3397,7 +3403,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStoreService_Pre
 		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCardFromSlot").setCostTime(l_endTime - l_beginTime)("PreOnline_Contact::MoveCardFromSlot");
 		}
-		LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCardFromSlot, "PreOnline_Contact MoveCardFromSlot suc.");
+		//LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCardFromSlot, "PreOnline_Contact MoveCardFromSlot suc.");
 		CardNo card;
 		ZeroMemory(card.account, sizeof(card.account));
 		ZeroMemory(card.track2, sizeof(card.track2));
@@ -6073,7 +6079,7 @@ int CCardIssuerFSM::AddCardToStoreStepFirst(SpReqAnsContext<CardIssuerStoreServi
 	m_addCardSerial = "";
 	ErrorCodeEnum eErr = Error_Unexpect;
 	long l_beginTime, l_endTime;
-	LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_AddCardToStoreStepFirst, "AddCardToStoreStepFirst");
+	//LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_AddCardToStoreStepFirst, "AddCardToStoreStepFirst");
 	l_beginTime = GetTickCountRVC();
 	eErr = m_hDevHelper->MoveCard(CI_MOVECARD_FROM_HOPPER,99);
 	l_endTime = GetTickCountRVC();
@@ -6442,7 +6448,7 @@ void CCardIssuerFSM::AfterPreOnlineOnStore(ErrorCodeEnum err, const int slot)
 		if (eErr == Error_Succeed)
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCardToSlot").setCostTime(l_endTime - l_beginTime)("AfterPreOnlineOnStore::MoveCardToSlot, slot:%d", slot);
-			LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCardToSlot, "AfterPreOnlineOnStore MoveCardToSlot suc.");
+			//LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_MoveCardToSlot, "AfterPreOnlineOnStore MoveCardToSlot suc.");
 			m_cardPos = 1;
 		}
 		else
@@ -10903,7 +10909,7 @@ int CCardIssuerFSM::QuickSelfCheckImpl()
 			ret = 0;
 		}
 		pClient->GetFunction()->CloseSession();
-		pClient->SafeDelete();
+		//pClient->SafeDelete();
 		return ret;
 	}
 	else {

Module/mod_counterconnector/ConnectorFSM.cpp

@@ -164,7 +164,7 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 	int iCount = 0;
 
 	if (Error != Error_Succeed) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("on_error");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("on_error");
 		FSMEvent* e = new FSMEvent(USER_EVT_ERROR);
 		PostEventFIFO(e); // jump to error state
 		return Error;
@@ -173,7 +173,7 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 	GetEntityBase()->GetFunction()->SetSysVar("CallState", "O"); // set to offline state 
 	Error = LoadTerminalId();
 	if (Error != Error_Succeed) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("on_error");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("on_error");
 		FSMEvent* e = new FSMEvent(USER_EVT_ERROR);
 		PostEventFIFO(e); // jump to error state
 		return Error;
@@ -329,7 +329,7 @@ int ACMCallFSM::GetCallRouteList()
 			http_callinfo.strAddClientLevel = NULL;
 		}
 
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_QUEUE_INFO, CSimpleStringA::Format("call type is %d, http call route queue name is %s, and client level is %s.", m_CallingParam.nCallType, http_callinfo.strQueueName.GetData(), http_callinfo.strAddClientLevel.GetData()).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call type is %d, http call route queue name is %s, and client level is %s.", m_CallingParam.nCallType, http_callinfo.strQueueName.GetData(), http_callinfo.strAddClientLevel.GetData());
 
 		http_callinfo.strTerminalNo = m_strTerminalId;
 
@@ -550,7 +550,7 @@ int ACMCallFSM::LogFailedWarns(int iFailedCode, const char* strmsg)
 {
 	int iRet = 0;
 	if (m_bHangup){
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_FAILED_USER_HANGUP, strmsg);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s",strmsg);
 	}
 	else{
 		switch (iFailedCode) {
@@ -635,13 +635,13 @@ void ACMCallFSM::OnStateTrans(int iSrcState, int iDstState)
 					//LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_BROADCAST_CALL_STATE, strmsg);
 				} 
 				else{
-					LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_AUTO_RECONNECT,CSimpleString::Format("state from %d to %d, auto reconnect, not broadcast state to ui.", st1, st2).GetData());
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleString::Format("state from %d to %d, auto reconnect, not broadcast state to ui.", st1, st2).GetData());
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR0402304C5")("system auto reconnect.");
 				}
 
 				if (eState_HandFree == st2 || eState_Pickup == st2){
 					if (eState_Connecting == st1){
-						LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CONNECT_SUCCESS, "connect success!");
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("connect success!");
 					}
 				}
 			}
@@ -696,13 +696,13 @@ unsigned int ACMCallFSM::s0_on_event(FSMEvent* event)
 	if (event->iEvt == USER_EVT_PICKUP_CALL) 
 	{
 		memset(&m_CallingParam,0,sizeof(m_CallingParam));  //正常呼叫
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_PICKUPCALL,"begin pickup call");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin pickup call");
 		m_nStarttime = y2k_time_now();
 	} 
 	else if (event->iEvt == USER_EVT_HANDFREE_CALL) 
 	{
 		memset(&m_CallingParam,0,sizeof(m_CallingParam));							// 正常呼叫
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_HANDFREECALL,"begin hand free call");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin hand free call");
 		m_nStarttime = y2k_time_now();
 	}
 	else if (event->iEvt == USER_EVT_ASSISTCHAN_IDEL)
@@ -749,7 +749,7 @@ unsigned int ACMCallFSM::s0_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_DOUBLE_RECORD_CALL)
 	{
 		m_CallingParam.nCallType = DOUBLERECORD_CALLTYPE;
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_DOUBLERECORDCALL,"begin double record call");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin double record call");
 		m_nStarttime = y2k_time_now();
 	}
 	else if (event->iEvt == USER_EVT_STOPLOACALREMOTEVIDEO) 
@@ -861,7 +861,7 @@ void ACMCallFSM::s11_on_entry()
 {
 	m_LastSipError = Error_Succeed;
 
-	LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_MAKECALL,"begin make call");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin make call");
 	m_uConnectTime = y2k_time_now();
 	m_bConnected = false;
 
@@ -946,7 +946,7 @@ unsigned int ACMCallFSM::s11_on_event(FSMEvent* event)
 	if (event->iEvt == USER_EVT_HANGUP)
 	{
 		m_bHangup = true;
-		LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_COUNTERCONNECT_SIPCONNECT_HANGUP, CSimpleStringA::Format("sip connecting, customer active hangup after %ds.", y2k_time_now()- m_nStarttime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("sip connecting, customer active hangup after %ds.", y2k_time_now()- m_nStarttime);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR0402304C6")("connect failed for user hangup");
 	}
 	else if (event->iEvt == USER_EVT_SIP_STATE_IDLE) 
@@ -1424,7 +1424,7 @@ void ACMCallFSM::s3_on_entry()
 	if (false == m_bConnected) {
 		m_bConnected = true;
 		unsigned int unowtime = y2k_time_now();
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECTING_TIME, CSimpleStringA::Format("handfree call connecting time is %us.", unowtime - m_uConnectTime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("handfree call connecting time is %us.", unowtime - m_uConnectTime);
 		m_uConnectTime = unowtime;
 	}
 }
@@ -1476,7 +1476,7 @@ void ACMCallFSM::s4_on_entry()
 	if (false == m_bConnected) {
 		m_bConnected = true;
 		unsigned int unowtime = y2k_time_now();
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECTING_TIME, CSimpleStringA::Format("pickup call connecting time is %us.", unowtime - m_uConnectTime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("pickup call connecting time is %us.", unowtime - m_uConnectTime);
 		m_uConnectTime = unowtime;
 	}
 }
@@ -1547,7 +1547,7 @@ void ACMCallFSM::s51_on_entry()
 {
 	if (m_bConnected) {
 		m_bConnected = false;
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECT_TIME, CSimpleStringA::Format("call connected time is %us.", y2k_time_now() - m_uConnectTime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call connected time is %us.", y2k_time_now() - m_uConnectTime);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setCostTime(SP::Module::Comm::RVCGetTickCount() - m_lConnectCostTime).setLogCode("QLR0402304C4")("disconnect the video connection.");
 	}
 }
@@ -1567,7 +1567,7 @@ void ACMCallFSM::s52_on_entry()
 	ScheduleTimer(52,RELEASEING_SIP_TIMER);
 	if (m_bConnected) {
 		m_bConnected = false;
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECT_TIME, CSimpleStringA::Format("call connected time is %us.", y2k_time_now() - m_uConnectTime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call connected time is %us.", y2k_time_now() - m_uConnectTime);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setCostTime(SP::Module::Comm::RVCGetTickCount() - m_lConnectCostTime).setLogCode("QLR0402304C4")("disconnect the video connection.");
 	}
 }
@@ -1652,7 +1652,7 @@ void ACMCallFSM::s60_on_entry()
 	HangupCall();
 	if (m_bConnected) {
 		m_bConnected = false;
-		LogWarn(Severity_Low, Error_Debug, LOG_WARN_COUNTERCONNECT_CALL_CONNECT_TIME, CSimpleStringA::Format("call connected time is %us.", y2k_time_now() - m_uConnectTime).GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call connected time is %us.", y2k_time_now() - m_uConnectTime);
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setCostTime(SP::Module::Comm::RVCGetTickCount() - m_lConnectCostTime).setLogCode("QLR0402304C4")("disconnect the video connection.");
 	}
 }

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -133,7 +133,7 @@ ErrorCodeEnum CCounterConnectorEntity::ConnectAssistChannel()
 	
 	ErrorCodeEnum Error = m_pCounterConnectorChannel->Connect();
 	if (Error != Error_Succeed) {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_CONNECT_ASSIST_ERROR, "connect assistant channel error");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("connect assistant channel error");
 #ifdef RVC_OS_WIN
 		m_pCounterConnectorChannel->SafeDelete();
 #endif
@@ -315,7 +315,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 			}
 			CSimpleStringA strValue;
 			GetFunction()->GetSysVar("CallState", strValue);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("摘机,and CallState is %s.", strValue.GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("摘机,and CallState is %s.", strValue.GetData());
 			HandlePickUpMicroPhoneEvent(1, "pick up microphone.");
 		}
 		break;
@@ -328,7 +328,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 			}
 			CSimpleStringA strValue;
 			GetFunction()->GetSysVar("CallState", strValue);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("挂机,and CallState is %s.", strValue.GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("挂机,and CallState is %s.", strValue.GetData());
 			HandlePickUpMicroPhoneEvent(0, "hang up microphone.");
 		}
 		break;
@@ -336,7 +336,7 @@ void CCounterConnectorEntity ::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUI
 		{
 			bool brenderstate = m_fsm.IsCameraRenderState();
 			if (m_bHasLaunched && !brenderstate){
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("提机呼叫");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("提机呼叫");
 				HandlePickUpCallEvent();
 			}
 			else{

Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -428,7 +428,7 @@ int CHeartBeatFSM::DoNewHandShake() {
 	while (true)
 	{
 		if (warnSum == 50) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("HandShakeHttp")("HandShakeHttp send 50 times");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("HandShakeHttp")("HandShakeHttp send 50 times");
 			warnSum = 0;
 		}		
 		IHttpFunc* client;

Module/mod_initiativetransfer/FlowControlFSM.cpp

@@ -178,12 +178,12 @@ unsigned int CFlowControlFSM::s0_on_event(FSMEvent* event)
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S0_ANSACMFLOW, "s0 receive ANSACMFLOW");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s0 receive ANSACMFLOW");
 	} else if (event->iEvt == USER_EVT_REQAGENTFLOW) {
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S0_REQAGENTFLOW, "s0 receive REQAGENTFLOW");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s0 receive REQAGENTFLOW");
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL)
 	{
@@ -218,7 +218,7 @@ unsigned int CFlowControlFSM::s1_on_event(FSMEvent* event)
 		} 
 		else {
 			Error = Error_NetBroken;
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S1_REQAGENTFLOW_FAILED, "s1 receive REQAGENTFLOW but chan is off.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s1 receive REQAGENTFLOW but chan is off.");
 		}
 		return Error == Error_Succeed ? 1 : 0;
 	} 
@@ -229,7 +229,7 @@ unsigned int CFlowControlFSM::s1_on_event(FSMEvent* event)
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL)
 	{
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S1_ASSIS_IDEL, "s1 ASSIS_IDEL.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s1 ASSIS_IDEL.");
 		if (Error_Succeed == ConnectToAssistchan(false)) {
 			m_bConnectAssit = true;
 		}
@@ -244,7 +244,7 @@ unsigned int CFlowControlFSM::s2_on_event(FSMEvent* event)
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S2_CHAN_OFF, "s2 chan off.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s2 chan off.");
 	} 
 	else if (event->iEvt == USER_EVT_ANSAGENTFLOW) {
 		AnsAgentFlowEvent *afe = static_cast<AnsAgentFlowEvent*>(event);
@@ -257,7 +257,7 @@ unsigned int CFlowControlFSM::s2_on_event(FSMEvent* event)
 #endif //RVC_OS_WIN
 		evt.error = afe->err ? Error_Unexpect : Error_Succeed;
 		if (evt.error != Error_Succeed){
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S2_ANSAGENTFLOW_FAILED, "s2 receive ANSAGENTFLOW error.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s2 receive ANSAGENTFLOW error.");
 		}
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
 	}
@@ -275,11 +275,11 @@ unsigned int CFlowControlFSM::s2_on_event(FSMEvent* event)
 	else if (event->iEvt == USER_EVT_NTFENTFLOW) {
 		ErrorCodeEnum result = DisallowControl();
 		if (result != Error_Succeed){
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S2_NTFENTFLOW_FAILED, "s2 send NTFENTFLOW error.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s2 send NTFENTFLOW error.");
 		}
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL){
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S2_ASSIS_IDEL, "s2 ASSIS_IDEL.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s2 ASSIS_IDEL.");
 		if (Error_Succeed == ConnectToAssistchan(false)) {
 			m_bConnectAssit = true;
 		}
@@ -320,7 +320,7 @@ unsigned int CFlowControlFSM::s3_on_event(FSMEvent* event)
 		} 
 		else {
 			Error = Error_NetBroken;
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S3_ANSACMFLOW_FAILED, "s3 send ANSACMFLOW error.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s3 send ANSACMFLOW error.");
 		}
 		return Error == Error_Succeed ? 1 : 0;
 	} 
@@ -328,11 +328,11 @@ unsigned int CFlowControlFSM::s3_on_event(FSMEvent* event)
 		AgentFlowResult evt;
 		evt.error = Error_NetBroken;
 		SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(AgentFlowResult), SP_MSG_SIG_OF(AgentFlowResult), evt);
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S3_CHAN_OFF, "s3 chan off.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s3 chan off.");
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL)
 	{
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S3_ASSIS_IDEL, "s3 ASSIS_IDEL.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s3 ASSIS_IDEL.");
 		if (Error_Succeed == ConnectToAssistchan(false)) {
 			m_bConnectAssit = true;
 		}
@@ -351,7 +351,7 @@ unsigned int CFlowControlFSM::s5_on_event(FSMEvent* event)
 	if (event->iEvt == USER_EVT_DISCTRL) {
 		ErrorCodeEnum result = DisallowControl();
 		if (result != Error_Succeed) {
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S5_DISCTRL_FAILED, "s5 send DISCTRL error.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s5 send DISCTRL error.");
 		}
 	}
 	else if (event->iEvt == USER_EVT_REQAGENTFLOW) {
@@ -376,13 +376,13 @@ unsigned int CFlowControlFSM::s5_on_event(FSMEvent* event)
 		}
 		else {
 			Error = Error_NetBroken;
-			LogWarn(Severity_Low, Error_Debug, LOG_ERR_S5_REQAGENTFLOW_FAILED, "s5 send REQAGENTFLOW error.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s5 send REQAGENTFLOW error.");
 		}
 		return Error == Error_Succeed ? 1 : 0;
 	}
 	else if (event->iEvt == USER_EVT_ASSIS_IDEL)
 	{
-		LogWarn(Severity_Low, Error_Debug, LOG_ERR_S5_ASSIS_IDEL, "s5 ASSIS_IDEL.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s5 ASSIS_IDEL.");
 		if (Error_Succeed == ConnectToAssistchan(false)) {
 			m_bConnectAssit = true;
 		}
@@ -392,7 +392,7 @@ unsigned int CFlowControlFSM::s5_on_event(FSMEvent* event)
 
 void CFlowControlFSM::s7_on_entry()
 {
-	LogWarn(Severity_Low, Error_Debug, LOG_ERR_S7_ENTRY, "s7 ENTRY.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("s7 ENTRY.");
 }
 
 unsigned int CFlowControlFSM::s7_on_event(FSMEvent* event)

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -2264,7 +2264,6 @@ void UIServiceSession::Handle_VideoAppendWaterMark(SpReqAnsContext<UIService_Vid
 		ErrorCodeEnum Error = m_pEntity->AppendWaterMark(ctx->Req.videoName, ctx->Req.appendstr);
 		ctx->Answer(Error);
 		if (Error_Succeed == Error) {
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORD_APPEND_WATERMARK_SUCCESS, "record append water mark success!");
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040230BZ70501")("record append water mark success.");
 		}
 	}
@@ -2288,7 +2287,6 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
 				ctx->Ans.ErrorCode = 0;
 				ctx->Ans.ErrorMsg = CSimpleStringA2W("");
 				m_pEntity->m_bSalesRecording = true;
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_SUCCESS, "start remote record success!");
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040230BZ70101")("start remote record success.");
 			}
 			else {
@@ -2321,7 +2319,6 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
 				ctx->Ans.ErrorCode = 0;
 				ctx->Ans.ErrorMsg = CSimpleStringA2W("");
 				m_pEntity->m_bSalesRecording = true;
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_START_REMOTERECORD_SUCCESS, "start remote record success!");
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040230BZ70101")("start remote record success.");
 			}
 			else {
@@ -2364,13 +2361,12 @@ void UIServiceSession::Handle_StopRemoteRecord(SpReqAnsContext<UIService_StopRem
 		ErrorCodeEnum Error = m_pEntity->StopRecord(CSimpleStringW2A(ctx->Req.content));
 		ctx->Answer(Error);
 		if (Error_Succeed == Error) {
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOP_REMOTERECORD_SUCCESS, "stop remote record success!");
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040230BZ70201")("stop remote record success.");
 		}
 	}
 	else {
 		ctx->Answer(Error_DevNotAvailable);
-		LogWarn(Severity_Low, Error_Debug, LOG_EVT_CALL_STOP_REMOTERECORD_MULTITIMES, "call stop remote record multitimes!");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call stop remote record multitimes!");
 	}
 }
 
@@ -2524,7 +2520,7 @@ void UIServiceSession::Handle_StopPlayNotice(SpReqAnsContext<UIService_StopPlayN
 		}
 		else {
 			ctx->Answer(Error_DevNotAvailable);
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_CALL_STOP_NOTICEPLAY_MULTITIMES, "call stop notice play multitimes!");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("call stop notice play multitimes!");
 		}
 	}
 }

Module/mod_livenessdetection/RvcWsServer.cpp

@@ -425,7 +425,7 @@ namespace LivenessDetection {
 			m_bstarttrans = false;
 
 			unsigned int utranstime = y2k_time_now() - m_utranstime;
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOPVIDEOTRANS, CSimpleStringA::Format("stop video trans for session close, and transmit time is %us.", utranstime).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("stop video trans for session close, and transmit time is %us.", utranstime);
 
 			if (RVC_MIN_VIDEO_TRANS_TIME >= utranstime) {
 				LogWarn(Severity_Middle, Error_Debug, LOG_EVT_AUTO_FACE_FAILED, CSimpleStringA::Format("auto face failed and transmit time is %us.", utranstime).GetData());
@@ -433,7 +433,7 @@ namespace LivenessDetection {
 			}
 
 			if (RVC_MAX_VIDEO_TRANS_TIME <= utranstime) {
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_AUTO_FACE_TIMEOUT, CSimpleStringA::Format("auto face timeout and transmit time is %us.", utranstime).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("auto face timeout and transmit time is %us.", utranstime);
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3E05")("流媒体传输时长不小于15秒.");
 			}
 		}
@@ -519,7 +519,7 @@ namespace LivenessDetection {
 		}
 
 		iRet = 0;
-		LogWarn(Severity_Low, Error_Debug, LOG_EVT_STARTVIDEOTRANS, "start video trans.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start video trans.");
 		m_utranstime = y2k_time_now();
 
 		return iRet;
@@ -551,15 +551,15 @@ namespace LivenessDetection {
 #endif //RVC_OS_WIN
 
 			unsigned int utranstime = y2k_time_now() - m_utranstime;
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_STOPVIDEOTRANS, CSimpleStringA::Format("stop video trans for user operation, and transmit time is %us.", utranstime).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("stop video trans for user operation, and transmit time is %us.", utranstime);
 
 			if (RVC_MIN_VIDEO_TRANS_TIME >= utranstime) {
-				LogWarn(Severity_Middle, Error_Debug, LOG_EVT_AUTO_FACE_FAILED, CSimpleStringA::Format("auto face failed and transmit time is %us.", utranstime).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("auto face failed and transmit time is %us.", utranstime);
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3E04")("流媒体传输时长不大于2秒.");
 			}
 
 			if (RVC_MAX_VIDEO_TRANS_TIME <= utranstime) {
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_AUTO_FACE_TIMEOUT, CSimpleStringA::Format("auto face timeout and transmit time is %us.", utranstime).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("auto face timeout and transmit time is %us.", utranstime);
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3E05")("流媒体传输时长不小于15秒.");
 			}
 		}
@@ -572,7 +572,7 @@ namespace LivenessDetection {
 
 	int RvcWsServer::StartVideoCapTransmit()
 	{
-		LogWarn(Severity_Low, Error_Debug, LOG_EVT_STARTVIDEOCAPTURE, "start video capture transmit.");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start video capture transmit.");
 		return on_send(this, eCapture_Type);
 	}
 

Module/mod_mediacontroller/Event.h

@@ -117,4 +117,6 @@
 #define LOG_WARN_ALLCAMERA_ERRORS								0x208A0002	//摄像头都故障
 #define LOG_WARN_ENVCAMERA_ERROR								0x208A0003	//上摄像头故障
 #define LOG_WARN_OPTCAMERA_ERROR								0x208A0004	//下摄像头故障
-#define LOG_ERROR_ENTITY_ALLOC_MEM_FAILED						0x208A0005	//实体分配内存失败
+#define LOG_ERROR_ENTITY_ALLOC_MEM_FAILED						0x208A0005	//实体分配内存失败
+#define LOG_INFO_KERNEL_VERSION									0x208B0009	//机器内核版本信息
+#define LOG_INFO_UNEXPECTED_KERNEL_VERSION						0x208B000A	//与预期不符的内核版本信息

Module/mod_mediacontroller/capture.cpp

@@ -1594,7 +1594,7 @@ namespace MediaController {
 					else
 					{
 						cap->opt_video->ustarttime = y2k_time_now();
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_OPEN, "start optcam success.");
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start optcam success.");
 						return Error_EnvCamera;
 					}
 				}
@@ -1607,7 +1607,7 @@ namespace MediaController {
 			else
 			{
 				cap->env_video->ustarttime = y2k_time_now();
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_OPEN, "start envcam success.");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start envcam success.");
 				if (cap->opt_video) 
 				{
 					if (cap->env_video) 
@@ -1626,7 +1626,7 @@ namespace MediaController {
 					else
 					{
 						cap->opt_video->ustarttime = y2k_time_now();
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_OPEN, "start optcam success.");
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start optcam success.");
 						return Error_Succeed;
 					}		
 				}
@@ -1656,7 +1656,7 @@ namespace MediaController {
 				else
 				{
 					cap->opt_video->ustarttime = y2k_time_now();
-					LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_OPEN, "start optcam success.");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start optcam success.");
 					return Error_EnvCamera;
 				}
 			}
@@ -1700,7 +1700,7 @@ namespace MediaController {
 			}
 			else{
 				cap->env_video->ustarttime = y2k_time_now();
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_OPEN, "start envcam success.");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start envcam success.");
 				return Error_Succeed;
 			}
 		}
@@ -1713,7 +1713,7 @@ namespace MediaController {
 			}
 			else{
 				cap->opt_video->ustarttime = y2k_time_now();
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_OPEN, "start optcam success.");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start optcam success.");
 				return Error_Succeed;
 			}
 		}
@@ -1786,7 +1786,7 @@ namespace MediaController {
 				//LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_CLOSE, CSimpleStringA::Format("stop envcam, and camera open time is %us.", ienvtime).GetData());
 				if (ienvtime >= 1) {
 					float fenvframerate = (float)((float)cap->env_video->frame_id / (float)ienvtime);
-					LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_FRAME_INFO, CSimpleStringA::Format("env camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d, real frmerate is %.2ffps.", ienvtime * cap->config.video_env_fps, ienvtime, cap->env_video->frame_id, ienvtime * cap->config.video_env_fps - cap->env_video->frame_id, fenvframerate).GetData());
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("env camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d, real frmerate is %.2ffps.", ienvtime * cap->config.video_env_fps, ienvtime, cap->env_video->frame_id, ienvtime * cap->config.video_env_fps - cap->env_video->frame_id, fenvframerate);
 				}
 			}
 			video_capture_stop(cap->env_video);
@@ -1797,7 +1797,7 @@ namespace MediaController {
 				//LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_CLOSE, CSimpleStringA::Format("stop optcam, and camera open time is %us.", iopttime).GetData());
 				if (iopttime >= 1) {	
 					float foptframerate = (float)((float)cap->opt_video->frame_id / (float)iopttime);
-					LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_FRAME_INFO, CSimpleStringA::Format("opt camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d, real frmerate is %.2ffps.", iopttime * cap->config.video_opt_fps, iopttime, cap->opt_video->frame_id, iopttime * cap->config.video_opt_fps - cap->opt_video->frame_id, foptframerate).GetData());
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("opt camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d, real frmerate is %.2ffps.", iopttime * cap->config.video_opt_fps, iopttime, cap->opt_video->frame_id, iopttime * cap->config.video_opt_fps - cap->opt_video->frame_id, foptframerate);
 				}
 			}
 			video_capture_stop(cap->opt_video);
@@ -1887,17 +1887,17 @@ namespace MediaController {
 #ifdef RVC_OS_WIN
 		int n = videocap_get_device_count();
 		for (int i = 0; i < n; ++i) {
-			WCHAR tmp[256];
-			char t[256];
-			WCHAR tmp1[256];
-			char t1[256];
+			WCHAR tmp[MAX_PATH] = {0};
+			char t[MAX_PATH] = { 0 };
+			WCHAR tmp1[MAX_PATH] = { 0 };
+			char t1[MAX_PATH] = { 0 };
 			videocap_get_device_name(i, tmp, ARRAYSIZE(tmp));
 			WideCharToMultiByte(CP_ACP, 0, tmp, -1, t, sizeof(t), 0, NULL);
 			videocap_get_device_path(i, tmp1, ARRAYSIZE(tmp1));
 			WideCharToMultiByte(CP_ACP, 0, tmp1, -1, t1, sizeof(t1), 0, NULL);
 
-			char t2[256];
-			strcpy(t2,t1);
+			char t2[MAX_PATH] = {0};
+			strcpy(t2, t1);
 			for (int j = 0; j < strlen(t2); ++j)
 			{
 				t2[j] = toupper(t2[j]);
@@ -1981,12 +1981,12 @@ namespace MediaController {
 			icamnum = videocap_get_device_count();
 			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("camera count is %d.", icamnum);
 			for (int i = 0; i < icamnum; ++i) {
-				WCHAR tmp[256] = {0};
-				char t[256] = {0};
-				WCHAR tmp1[256] ={0};
-				char t1[256] = {0};
-				WCHAR tmp2[256] = { 0 };
-				char t2[256] = { 0 };
+				WCHAR tmp[MAX_PATH] = {0};
+				char t[MAX_PATH] = {0};
+				WCHAR tmp1[MAX_PATH] ={0};
+				char t1[MAX_PATH] = {0};
+				WCHAR tmp2[MAX_PATH] = { 0 };
+				char t2[MAX_PATH] = { 0 };
 				videocap_get_device_name(i, tmp, ARRAYSIZE(tmp));
 				WideCharToMultiByte(CP_ACP, 0, tmp, -1, t, sizeof(t), 0, NULL);
 				videocap_get_device_path(i, tmp1, ARRAYSIZE(tmp1));
@@ -2018,15 +2018,15 @@ namespace MediaController {
 			rc = audio_get_dev_count(&icnt, &ocnt);
 			if (rc == 0) {
 				int i;
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio input devices(%d):", icnt);
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("audio input devices(%d):", icnt);
 				for (i = 0; i < icnt; ++i) {
 					CSimpleStringA str = audio_get_dev_name(true, i);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, str.GetData());
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%d = %s", i, str.GetData());
 				}
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio output devices(%d):", ocnt);
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("audio output devices(%d):", ocnt);
 				for (i = 0; i < ocnt; ++i) {
 					CSimpleStringA str = audio_get_dev_name(false, i);
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", i, str.GetData());
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%d = %s", i, str.GetData());
 				}
 			}
 		}
@@ -2041,7 +2041,7 @@ namespace MediaController {
 				char strpath[MAX_PATH] = { 0 };
 
 				if (0 == rvc_videocap_get_device_fullpathname(i, strcamera, 2 * MAX_PATH)){
-					//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", inumber, strcamera);
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", inumber, strcamera);
 					strCamInfoJson += CSimpleStringA::Format("\"%d\":\"%s\",", inumber, strcamera);
 					inumber++;
 
@@ -2060,7 +2060,7 @@ namespace MediaController {
 #endif // RVC_OS_WIN
 
 		if (icamnum > 0) {
-			LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_COUNT, CSimpleStringA::Format("camera number is %d.", icamnum).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("camera number is %d.", icamnum);
 			if (strCamInfoJson.GetLength() > 0) {
 				strCamInfoJson[strCamInfoJson.GetLength() - 1] = '\0';
 			}
@@ -2361,7 +2361,7 @@ namespace MediaController {
 			if (0 != cap->env_video->ustarttime) {
 				int ienvtime = y2k_time_now() - cap->env_video->ustarttime;
 				//LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_CLOSE, CSimpleStringA::Format("stop envcam, and camera open time is %us.", ienvtime).GetData());
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_ENVCAM_FRAME_INFO, CSimpleStringA::Format("env camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d.", ienvtime * cap->config.video_env_fps, ienvtime, cap->env_video->frame_id, ienvtime * cap->config.video_env_fps - cap->env_video->frame_id).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("env camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d.", ienvtime * cap->config.video_env_fps, ienvtime, cap->env_video->frame_id, ienvtime * cap->config.video_env_fps - cap->env_video->frame_id);
 			}
 
 			video_capture_destroy(cap->env_video);
@@ -2374,7 +2374,7 @@ namespace MediaController {
 			if (0 != cap->opt_video->ustarttime) {
 				int iopttime = y2k_time_now() - cap->opt_video->ustarttime;
 				//LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_CLOSE, CSimpleStringA::Format("stop optcam, and camera open time is %us.", iopttime).GetData());
-				LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_OPTCAM_FRAME_INFO, CSimpleStringA::Format("opt camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d.", iopttime * cap->config.video_opt_fps, iopttime, cap->opt_video->frame_id, iopttime * cap->config.video_opt_fps - cap->opt_video->frame_id).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("opt camera frame info is dest frame number is %d(%us), real frame number is %d, difference is %d.", iopttime * cap->config.video_opt_fps, iopttime, cap->opt_video->frame_id, iopttime * cap->config.video_opt_fps - cap->opt_video->frame_id);
 			}
 
 			video_capture_destroy(cap->opt_video);

Module/mod_mediacontroller/capture.h

@@ -142,6 +142,7 @@ namespace MediaController {
 		Clibvideoqueue *snapshot_shm_queue;
 		Clibvideoqueue *preview_shm_queue;
 		Clibvideoqueue *rtp_shm_queue;
+		
 		capture_t *parent;
 		int camera_type; // CAMERA_TYPE_xxx
 		int frame_id;

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -3,6 +3,7 @@
 #include "capture.h"
 #include "Event.h"
 #include "CommEntityUtil.hpp"
+#include "SpUtility.h"
 #include "fileutil.h"
 #include "brightnessinfo.h"
 #include "SpDefine.h"
@@ -51,6 +52,9 @@
 #ifndef RVC_DEFAULT_CAMERA_BRIGHNESS
 #define RVC_DEFAULT_CAMERA_BRIGHNESS 50
 #endif // !RVC_DEFAULT_CAMERA_BRIGHNESS
+#ifndef RVC_DEFAULT_KERNEL_VERSION
+#define RVC_DEFAULT_KERNEL_VERSION "4.19.0-arm64-desktop"
+#endif
 
 #ifdef RVC_OS_WIN
 static void __audio_render_log(audiorender_loglevel elevel, void* user_data, const char* fmt, va_list arg)
@@ -230,6 +234,25 @@ void CMediaControllerEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmar
 	pTransactionContext->SendAnswer(Error_Succeed);
 }
 
+#ifdef RVC_OS_WIN
+#else
+static void GetOSKernelVersionInfo()
+{
+	std::string sucContent, failedContent;
+	CSimpleStringA strCmd("uname -r");
+	bool ret = SP::Module::Util::ShellExecute(strCmd.GetData(), sucContent, failedContent);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("{%s}:{%s}{%s}", strCmd.GetData(), sucContent.c_str(), failedContent.c_str());
+	if (ret) {
+		LogWarn(Severity_Low, Error_Debug, LOG_INFO_KERNEL_VERSION, sucContent.c_str() ? sucContent.c_str() : "get kernel version failed.");
+		if (0 != sucContent.compare(RVC_DEFAULT_KERNEL_VERSION)) {
+			LogWarn(Severity_Low, Error_Debug, LOG_INFO_UNEXPECTED_KERNEL_VERSION, CSimpleStringA::Format("unexpected kernel version %s.", sucContent.c_str() ? sucContent.c_str() : "get kernel version failed.").GetData());
+		}
+	}
+	else {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("获取系统内核版本信息失败");
+	}
+}
+#endif
 
 void CMediaControllerEntity::OnStarted()
 {
@@ -274,7 +297,7 @@ void CMediaControllerEntity::OnStarted()
 	if (Error == Error_Succeed)
 	{
 		RvcGetAudioDevice();
-		RvcCheckCameraInfo(icamnum);
+		//RvcCheckCameraInfo(icamnum);
 		Error = LoadConfig(&conf);
 		if (Error != Error_Succeed)
 		{
@@ -947,23 +970,23 @@ void CMediaControllerEntity::OnReceivePkt(int sub_type, const char *buffer, int
 				if (eStand2sType == m_eDeviceType) {
 					if (capture_adj_brightness(m_capture, ibrightness, m_nCameraErrorCode) == true){
 						SendCameraBright(eStand2sType);
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_INFO, CSimpleStringA::Format("set camera brightness to %d success.", ibrightness).GetData());
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("set camera brightness to %d success.", ibrightness);
 						PostCameraBrightnessInfos(ibrightness);
 					}
 					else{
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ACM_SET_CAMERABRIGHT fail!");
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_FAILED, CSimpleStringA::Format("set camera brightness to %d failed.", ibrightness).GetData());
+						LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_FAILED, CSimpleStringA::Format("set camera brightness to %d failed.", ibrightness).GetData());
 					}
 				}
 				else {
 					if (0 == capture_set_camera_brightness(ibrightness, m_capture, m_nCameraErrorCode, 0)) {
 						SendCameraBright(eStand1SPlusType);
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_INFO, CSimpleStringA::Format("set camera brightness to %d success.", ibrightness).GetData());
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("set camera brightness to %d success.", ibrightness);
 						PostCameraBrightnessInfos(ibrightness);
 					}
 					else {
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ACM_SET_CAMERABRIGHT fail!");
-						LogWarn(Severity_Low, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_FAILED, CSimpleStringA::Format("set camera brightness to %d failed.", ibrightness).GetData());
+						LogWarn(Severity_Middle, Error_Debug, LOG_EVT_SET_CAMERA_BRIGHTNESS_FAILED, CSimpleStringA::Format("set camera brightness to %d failed.", ibrightness).GetData());
 					}
 				}
 
@@ -1398,7 +1421,7 @@ ErrorCodeEnum CMediaControllerEntity::LoadConfig(capture_config_t *conf)
 			Error = AutoGetVideoDeviceName(conf);
 			CSimpleStringA strInfo = CSimpleStringA::Format("env = %s,opt = %s", conf->strVideoEnv.GetData(), conf->strVideoOpt.GetData());
 			if (Error_Succeed == Error){
-				LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_SUCCESS, strInfo.GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", strInfo.GetData());
 			}
 			else {
 				LogWarn(Severity_Middle, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_FAILED, strInfo.GetData());
@@ -2202,7 +2225,7 @@ void CMediaControllerEntity::OnCameraStarted()
 	int ioptbrightness = 0;
 	capture_get_camera_brightness(&ioptbrightness, m_capture, m_nCameraErrorCode, 1);
 
-	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("current env camera brightness is %d, opt camera brightness is %d.", ienvbrightness, ioptbrightness).GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("current env camera brightness is %d, opt camera brightness is %d.", ienvbrightness, ioptbrightness);
 }
 
 

Module/mod_recorder/mod_recorder.cpp

@@ -88,7 +88,7 @@ static void LogRecordFileInfo(const char* pszMessage)
 	char strhash[MAX_PATH] = { 0 };
 	get_file_sm3digest(strhash, MAX_PATH, pszMessage);
 
-	LogWarn(Severity_Low, Error_Debug, LOG_EVT_RECORDER_VIDEO_INFO, CSimpleStringA::Format("%s file size is %u byte,sm3 digest is %s.", pszMessage, ufilesize, strhash).GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s file size is %u byte,sm3 digest is %s.", pszMessage, ufilesize, strhash);
 }
 
 static void rvcDbg(filecrypt_loglevel elevel, const char* fmt, ...)
@@ -606,7 +606,7 @@ void CRecorderEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,
 		break;
 
 	case LOG_EVT_UI_RETURNMENU:
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_UI_RETURNMENU event");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("recv LOG_EVT_UI_RETURNMENU event");
 		break;
 
 	case LOG_EVT_UI_STARTCAMERACAPTURE:

Module/mod_sipphone/audio_session.cpp

@@ -579,7 +579,7 @@ static int phonemedia_stop(audio_session_t *session)
 		rtp_session_get_local_rtp_port(media->rtpsess, &ilocal_port);
 		rtp_session_destroy(media->rtpsess);
 		{
-			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_RTP_DESTROY, CSimpleStringA::Format("audio rtp(media->rtpsess) destroy and local port is %u.", ilocal_port).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("audio rtp(media->rtpsess) destroy and local port is %u.", ilocal_port);
 		}
 		media->rtpsess = NULL;
 	}

Module/mod_sipphone/endpoint.cpp

@@ -184,7 +184,7 @@ static const char *state_desc[] = {
 static void endpoint_media_change_audio_dev(endpoint_call_t *call, e_dev_type current_dev_type)
 {
 	if (call->audio) {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DEVICE_SWITCH, CSimpleStringA::Format("change audio device to %s mode.", DEV_PICKUP == current_dev_type ? "pickup" : "hand free").GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("change audio device to %s mode.", DEV_PICKUP == current_dev_type ? "pickup" : "hand free");
 		audio_session_change_dev(call->audio, current_dev_type);
 	}
 }
@@ -1080,12 +1080,13 @@ static void endpoint_callback(nua_event_t   event,
 
 	default:
 		if (status > 100) { /* unknown event -> print out error message */
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown event %d: %03d %s.",
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("unknown event %d: %03d %s.",
 			event,
 			status,
 			phrase);
-		} else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown event %d.", event);
+		} 
+		else {
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("unknown event %d.", event);
 		}
 		break;
 	}

Module/mod_sipphone/mod_sipphone.cpp

@@ -605,7 +605,7 @@ void CSIPEntity::OnStarted()
 	}
 	
 	LogEvent(Severity_Middle, LOG_EVT_MOD_SIPPHONE_STARTED_SUCCESS, "sipphone entity started successfully.");
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("sipphone entity started.");
 
 #ifdef RVC_OS_WIN
 	if (!m_pAudioMgr || !m_bAudioMgrInited){
@@ -1554,7 +1554,7 @@ ErrorCodeEnum CSIPEntity::GetLocalIP()
 					if (strstr(p, "198.168.") == NULL)
 					{
 						strcpy(m_localip, p);
-						LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_GET_LOCAL_IP, CSimpleStringA::Format("local ip == %s", m_localip).GetData());
+						DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("local ip == %s", m_localip);
 						return Error_Succeed;
 					}
 					else {
@@ -2097,10 +2097,10 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			rvc_snprintf(conf->audio_pickup_in_dev, MAX_PATH, "%s", strPickupIn.GetData());
 			rvc_snprintf(conf->audio_pickup_out_dev, MAX_PATH, "%s", strPickupOut.GetData());
 
-			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DSP_INFO, generateAudioDspFlags(conf->audio_dsp).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", generateAudioDspFlags(conf->audio_dsp).GetData());
 
 			AudioDspFlagsUseCentersetting(conf);
-			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CENTER_AUDIO_DSP_FLAGS, generateAudioDspFlags(conf->audio_dsp).GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", generateAudioDspFlags(conf->audio_dsp).GetData());
 			
 			conf->ref_active_camera = &m_stVideoParam.iActiveCamera;
 			conf->ref_camera_switch = &m_stVideoParam.iCameraSwitch;
@@ -2422,7 +2422,7 @@ int CSIPEntity::StartCameraRender(int icamid, int ivideoview_x, int ivideoview_y
 	render_param.erender_queue = eSnapshot_Queue;
 
 	m_render->plocal_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("local video render create.");
 
 	memcpy(&m_render->render_param, &render_param, sizeof(rvc_video_render_params_t));
 
@@ -2509,10 +2509,10 @@ int CSIPEntity::StartBothCameraRender(SpReqAnsContext<PhoneService_StartBothCame
 	render_param.erender_queue = eSnapshot_Queue;
 
 	m_render->plocal_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("local video render create.");
 
 	m_render->premote_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("remote video render create.");
 
 	memcpy(&m_render->render_param, &render_param, sizeof(rvc_video_render_params_t));
 
@@ -2567,7 +2567,7 @@ void CSIPPhoneSession::OnClose( ErrorCodeEnum eErrorCode )
 void CSIPPhoneSession::Handle_MakeCall( SpReqAnsContext<PhoneService_MakeCall_Req, PhoneService_MakeCall_Ans>::Pointer ctx )
 {
 	DbgToBeidou(ctx->link, __FUNCTION__)();
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_CALL_URL, CSimpleStringA::Format("make call [%s]", ctx->Req.to_uri.GetData()).GetData());
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("make call [%s]", ctx->Req.to_uri.GetData());
 
 	int rc = Error_Succeed;
 	MakeCallCommand_t *cmd = new MakeCallCommand_t();
@@ -3223,10 +3223,10 @@ int CSIPPhoneSession::start_video_render(rvc_video_render_params_t* render_param
 	t_callback.debug = &__video_render_log;
 
 	m_pEntity->m_render->plocal_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_LOCAL_VIDEO_RENDER_CREATE, "local video render create.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("local video render create.");
 
 	m_pEntity->m_render->premote_render = CreateVideoRenderObj(&t_callback);
-	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_CREATE, "remote video render create.");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("remote video render create.");
 
 	memcpy(&m_pEntity->m_render->render_param, render_param, sizeof(rvc_video_render_params_t));
 	m_pEntity->m_render->local_render_threadid = 0;

Module/mod_sipphone/unix/video_session.cpp

@@ -118,10 +118,10 @@ static void __dbg(void *user_data, const char *fmt, va_list arg)
 static void __logevent(void* user_data, int itype, const char* strmessage)
 {
 	if (0 == itype) {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_CREATE, strmessage);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("create %s", strmessage);
 	}
 	else {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_DESTROY, strmessage);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("destroy %s", strmessage);
 	}
 }
 
@@ -433,7 +433,7 @@ static int on_rx_frame(video_frame *frame, void *user_data)
 		used = 1;
 
 		if (false == session->bremoterender) {
-			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_REMOTE_VIDEO_RENDER_STARTED, "start remote video render.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start remote video render.");
 			session->bremoterender = true;
 		}
 
@@ -1081,9 +1081,6 @@ static int start_video(video_session_t *session)
 			session->remote_player = pg_last_session->remote_player;
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("double record call remote_player reuse.");
 		}
-		else{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("pg_last_session is NULL, and call type is %d.", session->conf.nCallType);
-		}
 	}
 
 		BOOL bIsActiveInspect = FALSE;

Module/mod_sipphone/win/video_session.cpp

@@ -77,10 +77,10 @@ static void __dbg(void *user_data, const char *fmt, va_list arg)
 static void __logevent(void* user_data, int itype, const char* strmessage)
 {
 	if (0 == itype) {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_CREATE, strmessage);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("create %s", strmessage);
 	}
 	else {
-		LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_VIDEO_RTP_DESTROY, strmessage);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("destroy %s", strmessage);
 	}
 }
 

Module/mod_upload/UploadFSM.cpp

@@ -365,7 +365,8 @@ namespace Task
 			//调用上传接口
 			//最后一次上传时，文件hash和长度告警
 			if (m_fsm->m_currUploadFile->lastMD5Str.length() != 0) {
-				LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_INFO, CSimpleStringA::Format("upload %s file size is %s byte,sm3 digest is %s.", m_fsm->m_currUploadFile->fileName.c_str(), lastFileLength.c_str(), m_fsm->m_currUploadFile->lastMD5Str.c_str()).GetData());
+				//LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_INFO, CSimpleStringA::Format("upload %s file size is %s byte,sm3 digest is %s.", m_fsm->m_currUploadFile->fileName.c_str(), lastFileLength.c_str(), m_fsm->m_currUploadFile->lastMD5Str.c_str()).GetData());
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("upload %s file size is %s byte,sm3 digest is %s.", m_fsm->m_currUploadFile->fileName.c_str(), lastFileLength.c_str(), m_fsm->m_currUploadFile->lastMD5Str.c_str());
 			}
 			PROCESS_LINK_CONTEXT("LR0402104UploadFile")
 			if (!client->UploadFileBlock(qTempReq, qTempRet, &nextLink)) {
@@ -750,7 +751,7 @@ namespace Task
 
 void UploadFSM::OnStateTrans( int iSrcState, int iDstState )
 {
-	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("trans from %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
+	DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("trans from %s to %s", GetStateName(iSrcState), GetStateName(iDstState));
 
 }
 
@@ -1089,7 +1090,7 @@ unsigned int UploadFSM::s2_on_event(FSMEvent* event)
 			scanFile();
 		}
 		if (m_uploadList->size() == 0) {
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("m_uploadList is 0,wait for 8 min retry scan");
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("m_uploadList is 0,wait for 8 min retry scan");
 			ScheduleTimer(1, 480000);
 		} else {
 			PostEventLIFO(new FSMEvent(USER_EVT_JMP_NEW_UPLOAD));//跳到新的上传状态
@@ -1221,7 +1222,7 @@ unsigned int UploadFSM::s7_on_event(FSMEvent* event)
 			}else{
 				m_uploadReport.isBreak =false;
 				reportBatchMsg();
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("NewUpload m_uploadList is empty,wait 240s retry scan");
+				DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("NewUpload m_uploadList is empty,wait 240s retry scan");
 				ScheduleTimer(7, 240000);// goto s2
 			}
 
@@ -1262,7 +1263,7 @@ unsigned int UploadFSM::s7_on_event(FSMEvent* event)
 			}else{
 				m_uploadReport.isBreak =false;
 				reportBatchMsg();
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("NewUpload m_uploadList is empty,wait 240s retry scan");
+				DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("NewUpload m_uploadList is empty,wait 240s retry scan");
 				ScheduleTimer(7, 240000);// goto s2
 			}
 		}else{
@@ -1274,7 +1275,7 @@ unsigned int UploadFSM::s7_on_event(FSMEvent* event)
 		
 	}else if (event->iEvt == EVT_TIMER) {
 		// goto s2
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("NewUpload ,jump to s2");
+		DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("NewUpload ,jump to s2");
 	}
 	
 	return 0;
@@ -1874,7 +1875,8 @@ void UploadFSM::reportBatchMsg()
 		strReport =CSimpleStringA::Format("batch=succ isbreak=%d sum=%d succ=%d fail=%d detail fail: uploadFail=%d updateState=%d operateFileFail=%d (decodeFail=%d queryTempFail=%d)",
 			m_uploadReport.isBreak, m_uploadReport.sum, m_uploadReport.succ, m_uploadReport.fail, m_uploadReport.uploadFail, m_uploadReport.updateState,
 			m_uploadReport.operateFileFail, m_uploadReport.decodeFail, m_uploadReport.queryTempFail);
-		LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_REPORT, strReport.GetData());
+		//LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_REPORT, strReport.GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(strReport.GetData());
 	}else{
 		strReport =CSimpleStringA::Format("batch=fail isbreak=%d sum=%d succ=%d fail=%d detail fail: uploadFail=%d updateState=%d operateFileFail=%d (decodeFail=%d queryTempFail=%d)",
 			m_uploadReport.isBreak, m_uploadReport.sum, m_uploadReport.succ, m_uploadReport.fail, m_uploadReport.uploadFail, m_uploadReport.updateState,

Other/libvideoqueue/libvideoqueue.cpp

@@ -147,7 +147,7 @@ public:
 	}
 
 	//往视频循环队列尾部插节点
-	bool InsertVideo(videoq_frame* Video, int flags,unsigned int nowtime)
+	bool InsertVideo(videoq_frame* Video, int flags, unsigned int nowtime)
 	{
 		if(m_ShareMem.IsValid())
 		{
@@ -679,9 +679,9 @@ Clibvideoqueue::~Clibvideoqueue()
 	return;
 }
 
-bool Clibvideoqueue::InsertVideo(videoq_frame* Video, int flags,unsigned int nowtime)
+bool Clibvideoqueue::InsertVideo(videoq_frame* Video, int flags, unsigned int nowtime)
 {
-	bool bRst = m_pImpl->InsertVideo(Video, flags,nowtime);
+	bool bRst = m_pImpl->InsertVideo(Video, flags, nowtime);
 	return bRst;
 }
 

Other/libvideorecord/libvideorecord_impl.cpp

@@ -819,7 +819,7 @@ bool libvideorecord_impl::GetRecordVideoFrameSize()
 		}
 		else {
 			if (i > 0) {
-				m_pHostApi->Debug(RECORD_LOG_INFO, "get video framesize success, and failed times is %d.", i);
+				m_pHostApi->Debug(RECORD_LOG_DEBUG, "get video framesize success, and failed times is %d.", i);
 			}
 			bRet = true;
 			break;
@@ -853,7 +853,7 @@ bool libvideorecord_impl::GetRecordAudioFrameSize()
 		}
 		else {
 			if (i > 0) {
-				m_pHostApi->Debug(RECORD_LOG_INFO, "get audio framesize success, and failed times is %d.", i);
+				m_pHostApi->Debug(RECORD_LOG_DEBUG, "get audio framesize success, and failed times is %d.", i);
 			}
 			bRet = true;
 			break;

Other/unix/libbizchan/bizchan.cpp

@@ -917,13 +917,10 @@ static void process(bizchan_t *chan)
 	}
 
 on_error:
-	//OutputDebugStringA("on_error");
-	bizlog(chan, "%s", "on_error");
 	if (!chan->connected) {
 		invoke_on_connect(chan, -1); // connect failed!
 	} else {
 		//....
-		//OutputDebugStringA("connected, and error!");
 		bizlog(chan, "%s", "connected, and error!");
 	}
 
@@ -1289,9 +1286,6 @@ static void process(bizchan_t* chan) {
 	}
 
 on_error:
-	//OutputDebugStringA("on_error");
-	bizlog(chan, "on_error");
-
 	if (!chan->connected) {
 		invoke_on_connect(chan, -1); // connect failed!
 	}

Other/win/libbizchan/bizchan.c

@@ -856,7 +856,6 @@ static void process(bizchan_t *chan)
 	}
 
 on_error:
-	bizlog(chan, "%s", "on_error");
 	if (!chan->connected) {
 		invoke_on_connect(chan, -1); // connect failed!
 	} else {