Z991239-5733 #comment feat: 安装时兼容拷贝公共dep库开关，默认不拷贝

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -3969,7 +3969,20 @@ ErrorCodeEnum CUpgradeTaskFSM::loadCenterCfgInfo()
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("loadCenterCfgInfo")("init read CenterSetting.ini queryNewTaskInterval=%d", m_queryNewTaskInterval);
 		}
 		else {
-			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini StartFlag error");
+			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini queryNewTaskInterval error");
+			return rc;
+		}
+
+		int installCopyDepFlag = 0;
+		rc = spConfig->ReadConfigValueInt("UpgradeManager", "InstallCopyDepFlag", installCopyDepFlag);
+		if (rc == Error_Succeed) {
+			if (installCopyDepFlag == 1) {
+				m_installCopyDepFlag = true;//配置1时拷贝
+			}
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("loadCenterCfgInfo")("init read CenterSetting.ini InstallCopyDepFlag=%d", m_installCopyDepFlag);
+		}
+		else {
+			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini InstallCopyDepFlag error");
 			return rc;
 		}
 
@@ -4574,20 +4587,27 @@ int CUpgradeTaskFSM::ExecDepInstall(CSimpleStringA& strErrMsg)
 			m_currentTask.depNewVersion = m_currentTask.pack_version.GetData();
 		}
 
-		//兼容拷贝dep公共库
-		CSimpleStringA strErrInfo = "";
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("begin CreateInstallDepVersion,version[%s],pack[%s]", m_currentTask.depNewVersion.GetData(), m_currentTask.pack_name.GetData());
-		ErrorCodeEnum rc = CreateInstallDepVersion(m_currentTask.depNewVersion, strErrInfo);
-		if (rc != Error_Succeed)
-		{
-			strErrMsg = CSimpleStringA::Format("CreateInstallDepVersion fail:%s", strErrInfo.GetData());
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("CreateInstallDepVersion,version[%s] fail:%s", m_currentTask.depNewVersion.GetData(), strErrInfo.GetData());
-			//清理临时版本文件夹
-			ClearUpgradeFailDepVersion(m_currentTask.depNewVersion);
-			return 0;
+		if (m_installCopyDepFlag) {
+
+			//兼容拷贝dep公共库
+			CSimpleStringA strErrInfo = "";
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("begin CreateInstallDepVersion,version[%s],pack[%s]", m_currentTask.depNewVersion.GetData(), m_currentTask.pack_name.GetData());
+			ErrorCodeEnum rc = CreateInstallDepVersion(m_currentTask.depNewVersion, strErrInfo);
+			if (rc != Error_Succeed)
+			{
+				strErrMsg = CSimpleStringA::Format("CreateInstallDepVersion fail:%s", strErrInfo.GetData());
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("CreateInstallDepVersion,version[%s] fail:%s", m_currentTask.depNewVersion.GetData(), strErrInfo.GetData());
+				//清理临时版本文件夹
+				ClearUpgradeFailDepVersion(m_currentTask.depNewVersion);
+				return 0;
+			}
+			else {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("CreateInstallDepVersion,version[%s] succ", m_currentTask.depNewVersion.GetData());
+			}
 		}
 		else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("CreateInstallDepVersion,version[%s] succ", m_currentTask.depNewVersion.GetData());
+			//不需要拷贝dep公共库
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("installCopyDepFlag is %d , No need to copy common Dep dir", m_installCopyDepFlag);
 		}
 	}
 

Module/mod_UpgradeMgr/UpgradeTaskFSM.h

@@ -347,6 +347,7 @@ public:
 		m_bRollbackTask = false;
 		m_TempDepUpgradeFlag = false;//默认非适配器升级
 		m_queryNewTaskInterval = 240;//默认查询任务时间间隔
+		m_installCopyDepFlag = false;//默认不拷贝
 	}
 	~CUpgradeTaskFSM(){}
 	//具体实现方法
@@ -561,5 +562,6 @@ public:
 
 	bool m_TempDepUpgradeFlag;//临时适配器升级安装的判定标志 true 适配器 false 非适配器
 	int m_queryNewTaskInterval;//查询任务时间间隔，默认是240s
+	bool m_installCopyDepFlag;//安装时是否拷贝应用dep公共文件夹
 };
 #endif //RVC_MOD_UPGRADETASK_FSM_H_