Răsfoiți Sursa

Z991239-5754 #comment feat: 优化升级日志

Signed-Off-By: commit-hook
刘文涛80174520 1 an în urmă
părinte
comite
387b06c344

+ 9 - 2
Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -6756,7 +6756,9 @@ void CUpgradeTaskFSM::s4_on_entry()
 {
 	//下载升级包
 	m_bTaskCancel = false;//默认任务非取消
+	m_downloadBreakOffCount = 0;
 	if(m_bDownloadIdle){
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CallState is not O , download is break off , wait a moment");
 		PostEventFIFO(new FSMEvent(CUpgradeTaskFSM::Event_Download_Idle));//进入不可下载状态
 	}else{
 		Task::DownloadPackTask* dTask = new Task::DownloadPackTask(this);
@@ -6801,7 +6803,13 @@ unsigned int CUpgradeTaskFSM::s4_on_event(FSMEvent* event)
 		}else if(event->param1 == 3){
 			//无效状态
 			if(m_bDownloadIdle){
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("upgradeTask download entry idle 10s");
+				if (m_downloadBreakOffCount > 60) {
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CallState is not O , download is break off , wait a moment");
+					m_downloadBreakOffCount = 0;
+				}
+				else {
+					m_downloadBreakOffCount++;
+				}
 				ScheduleTimer(3,10*1000);//等待下次是否空闲		
 			}else{
 				Task::DownloadPackTask* dTask = new Task::DownloadPackTask(this);
@@ -6886,7 +6894,6 @@ unsigned int CUpgradeTaskFSM::s4_on_event(FSMEvent* event)
 
 	}else if (event->iEvt == Event_Download_Idle){
 
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("upgradeTask download entry idle 10s");
 		ScheduleTimer(3,10*1000);//等待下次是否空闲
 
 	}else if (event->iEvt == Event_CancelTask){

+ 2 - 0
Module/mod_UpgradeMgr/UpgradeTaskFSM.h

@@ -348,6 +348,7 @@ public:
 		m_TempDepUpgradeFlag = false;//默认非适配器升级
 		m_queryNewTaskInterval = 240;//默认查询任务时间间隔
 		m_installStopCopyDep = false;//默认拷贝
+		m_downloadBreakOffCount = 0; 
 	}
 	~CUpgradeTaskFSM(){}
 	//具体实现方法
@@ -549,6 +550,7 @@ public:
 	CSimpleStringA m_fileSM3List;//版本文件hash集合字符串
 	DWORD m_beginSendSM3Time;//开始发送sm3hahs时间
 	int m_queryNewTaskCount;//查询新任务时无任务次数
+	int m_downloadBreakOffCount;
 
 	bool m_bDownloadIdle;	//是否下载空闲 true: 不能下载,false: 可下载
 	bool m_bTaskCancel;		//是否任务取消 true: 任务取消,false: 未取消