|
|
@@ -5142,7 +5142,7 @@ unsigned int CUpgradeTaskFSM::s2_on_event(FSMEvent* event)
|
|
|
up.CurrentVersion = m_currentVersion;//当前的版本
|
|
|
up.cInstallState = "A";
|
|
|
up.strInstallComment = "启动成功";
|
|
|
- if (m_currentTask.task_type.Compare("U")) {
|
|
|
+ if (m_currentTask.task_type.Compare("U")==0) {
|
|
|
SendUpgradeTaskProgress(up, UpgradeMgr_START_ID);
|
|
|
if (m_currentTask.NewVersion.IsNullOrEmpty()) {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(UpgradeMgr_OUTSIDE_SYSTEM_START_ID)("体系外升级启动成功");
|
|
|
@@ -5164,7 +5164,7 @@ unsigned int CUpgradeTaskFSM::s2_on_event(FSMEvent* event)
|
|
|
upRoll.CurrentVersion = m_currentVersion;//当前的版本
|
|
|
upRoll.cInstallState = "R";
|
|
|
upRoll.strInstallComment = "自动倒回";
|
|
|
- if (m_currentTask.task_type.Compare("U")) {
|
|
|
+ if (m_currentTask.task_type.Compare("U")==0) {
|
|
|
SendUpgradeTaskProgress(upRoll, UpgradeMgr_START_ID, " RTA5667");
|
|
|
if (m_currentTask.NewVersion.IsNullOrEmpty()) {
|
|
|
DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(UpgradeMgr_OUTSIDE_SYSTEM_START_ID).setResultCode("RTA5632")("升级启动失败,回滚上一个版本");
|
|
|
@@ -6074,7 +6074,7 @@ unsigned int CUpgradeTaskFSM::s6_on_event(FSMEvent* event)
|
|
|
up.CurrentVersion = m_currentVersion;//当前的版本
|
|
|
up.cInstallState = "S";
|
|
|
up.strInstallComment = "已设为启动版本";
|
|
|
- if (m_currentTask.task_type.Compare("U")) {
|
|
|
+ if (m_currentTask.task_type.Compare("U")==0) {
|
|
|
SendUpgradeTaskProgress(up,UpgradeMgr_SWTICH_ID);
|
|
|
if (m_currentTask.pack_version.IsNullOrEmpty()) {
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(UpgradeMgr_OUTSIDE_SYSTEM_SWTICH_ID)("体系外切换成功");
|
|
|
@@ -6133,7 +6133,7 @@ unsigned int CUpgradeTaskFSM::s6_on_event(FSMEvent* event)
|
|
|
up.CurrentVersion = m_currentVersion;//当前的版本
|
|
|
up.cInstallState = "C";
|
|
|
up.strInstallComment = "更新active文件失败";//错误信息
|
|
|
- if (m_currentTask.task_type.Compare("U")) {
|
|
|
+ if (m_currentTask.task_type.Compare("U")==0) {
|
|
|
SendUpgradeTaskProgress(up,UpgradeMgr_SWTICH_ID,"RTA5665");
|
|
|
}
|
|
|
else {
|
|
|
@@ -6166,7 +6166,7 @@ unsigned int CUpgradeTaskFSM::s6_on_event(FSMEvent* event)
|
|
|
up.CurrentVersion = m_currentVersion;//当前的版本
|
|
|
up.cInstallState = "C";
|
|
|
up.strInstallComment = "任务策略已取消";
|
|
|
- if (m_currentTask.task_type.Compare("U")) {
|
|
|
+ if (m_currentTask.task_type.Compare("U")==0) {
|
|
|
SendUpgradeTaskProgress(up, UpgradeMgr_SWTICH_ID,"RTA5666");
|
|
|
}
|
|
|
else {
|