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

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -3973,16 +3973,16 @@ ErrorCodeEnum CUpgradeTaskFSM::loadCenterCfgInfo()
 			return rc;
 		}
 
-		int installCopyDepFlag = 0;
-		rc = spConfig->ReadConfigValueInt("UpgradeManager", "InstallCopyDepFlag", installCopyDepFlag);
+		int installStopCopyDep = 0;
+		rc = spConfig->ReadConfigValueInt("UpgradeManager", "installStopCopyDep", installStopCopyDep);
 		if (rc == Error_Succeed) {
-			if (installCopyDepFlag == 1) {
-				m_installCopyDepFlag = true;//配置1时拷贝
+			if (installStopCopyDep == 1) {
+				m_installStopCopyDep = true;//配置1时停止拷贝
 			}
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("loadCenterCfgInfo")("init read CenterSetting.ini InstallCopyDepFlag=%d", m_installCopyDepFlag);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("loadCenterCfgInfo")("init read CenterSetting.ini installStopCopyDep=%d", m_installStopCopyDep);
 		}
 		else {
-			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini InstallCopyDepFlag error");
+			LogWarn(Severity_Middle, rc, ERR_TASK_READ_INI_FAIL, "get CenterSetting.ini installStopCopyDep error");
 			return rc;
 		}
 
@@ -4587,8 +4587,11 @@ int CUpgradeTaskFSM::ExecDepInstall(CSimpleStringA& strErrMsg)
 			m_currentTask.depNewVersion = m_currentTask.pack_version.GetData();
 		}
 
-		if (m_installCopyDepFlag) {
-
+		if (m_installStopCopyDep) {
+			//不需要拷贝dep公共库
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("installStopCopyDep is %d , No need to copy common Dep dir", m_installStopCopyDep);
+		}
+		else {
 			//兼容拷贝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());
@@ -4605,10 +4608,6 @@ int CUpgradeTaskFSM::ExecDepInstall(CSimpleStringA& strErrMsg)
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("ExecDepInstall")("CreateInstallDepVersion,version[%s] succ", m_currentTask.depNewVersion.GetData());
 			}
 		}
-		else {
-			//不需要拷贝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,7 +347,7 @@ public:
 		m_bRollbackTask = false;
 		m_TempDepUpgradeFlag = false;//默认非适配器升级
 		m_queryNewTaskInterval = 240;//默认查询任务时间间隔
-		m_installCopyDepFlag = false;//默认不拷贝
+		m_installStopCopyDep = false;//默认拷贝
 	}
 	~CUpgradeTaskFSM(){}
 	//具体实现方法
@@ -562,6 +562,6 @@ public:
 
 	bool m_TempDepUpgradeFlag;//临时适配器升级安装的判定标志 true 适配器 false 非适配器
 	int m_queryNewTaskInterval;//查询任务时间间隔，默认是240s
-	bool m_installCopyDepFlag;//安装时是否拷贝应用dep公共文件夹
+	bool m_installStopCopyDep;//安装时是否停止拷贝应用dep公共文件夹
 };
 #endif //RVC_MOD_UPGRADETASK_FSM_H_