Z991239-6383 #comment feat: 优化埋点日志

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -1616,16 +1616,16 @@ namespace Task
 			}else{
 				//停止广告、提示音播放
 				// 终端置为升级状态。1:升级状态，0：非升级状态。处于升级状态时调用播放接口不生效
-				ErrorCodeEnum rc = ((CUpgradeMgrEntity*)m_fsm->GetEntityBase())->NewStopMediaPlay();
-				if(rc==Error_Succeed){
-					DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopMediaPlayTask stop media play succ");
-				}else{
-					DbgWithLink(LOG_LEVEL_WARN,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__).setResultCode("RTA5674")("StopMediaPlayTask stop media play fail");
-					//m_fsm->PostEventFIFO(new CUpgradeTaskFSM::StopMediaPlayTaskEvent(false));//返回处理结果
-				}
+				//ErrorCodeEnum rc = ((CUpgradeMgrEntity*)m_fsm->GetEntityBase())->NewStopMediaPlay();
+				//if(rc==Error_Succeed){
+				//	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopMediaPlayTask stop media play succ");
+				//}else{
+				//	DbgWithLink(LOG_LEVEL_WARN,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__).setResultCode("RTA5674")("StopMediaPlayTask stop media play fail");
+				//	//m_fsm->PostEventFIFO(new CUpgradeTaskFSM::StopMediaPlayTaskEvent(false));//返回处理结果
+				//}
 				// 终端置为升级状态。1:升级状态，0：非升级状态。处于升级状态时调用播放接口不生效
 
-				rc = m_fsm->GetEntityBase()->GetFunction()->SetSysVar("UpdateState", "1", false);
+				ErrorCodeEnum rc = m_fsm->GetEntityBase()->GetFunction()->SetSysVar("UpdateState", "1", false);
 				if(rc==Error_Succeed){
 					DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopMediaPlayTask set UpdateState to 1 succ");
 				}else{
@@ -1633,6 +1633,16 @@ namespace Task
 					m_fsm->PostEventFIFO(new CUpgradeTaskFSM::StopMediaPlayTaskEvent(false));//返回处理结果
 					return;
 				}
+				//停止广告、提示音播放
+				rc = ((CUpgradeMgrEntity*)m_fsm->GetEntityBase())->NewStopMediaPlay();
+				if (rc == Error_Succeed) {
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopMediaPlayTask stop media play succ");
+				}
+				else {
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopMediaPlayTask stop media play fail");
+					//m_fsm->PostEventFIFO(new CUpgradeTaskFSM::StopMediaPlayTaskEvent(false));//返回处理结果
+				}
+
 				m_fsm->PostEventFIFO(new CUpgradeTaskFSM::StopMediaPlayTaskEvent(true));//返回处理结果
 			}
 		}

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -458,7 +458,7 @@ ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 		//采用新接口停止所有音视频播放
 		LocalMediaPlay::PlayService_StopPlayAllMedias_Req req1 = {};
 		LocalMediaPlay::PlayService_StopPlayAllMedias_Ans ans1 = {};
-		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAllMedias(req1, ans1, 10000);
+		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAllMedias(req1, ans1, 30000);
 		if (Error_Succeed == rc )
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias success");