Z991239-1500 #comment fix:修改升级管理实体打印日志乱码问题，采用getdata（）方法

Module/mod_UpgradeMgr/UpgradeMgrFSM.cpp

@@ -699,7 +699,7 @@ ErrorCodeEnum CUpgradeMgrFSM::LoadPersistInfo()
 		else
 			m_dwDownloadTime = 0;
 
-		Dbg("recover upgrade state from run config, install pack: {%s}", info.strPackName);
+		Dbg("recover upgrade state from run config, install pack: {%s}", info.strPackName.GetData());
 		m_strIntallingPack = info.strPackName;
 		m_PendingPacks[m_strIntallingPack] = info;
 	}
@@ -1083,7 +1083,7 @@ DWORD CUpgradeMgrFSM::RegistManualPack(const CSimpleStringA &strPackName)
 
 	if (!bManual)
 	{
-		Dbg("[%s]不是手动安装包", strPackName);
+		Dbg("[%s]不是手动安装包", strPackName.GetData());
 		return NOT_MANUALPACK_ERR;
 	}
 	
@@ -1558,7 +1558,7 @@ unsigned int CUpgradeMgrFSM::s4_on_event(FSMEvent* event)
 							if (!bExist)
 							{
 								m_ManualPendingPacks.push_back(m_strIntallingPack);
-								Dbg("pushback[%s] to m_ManualPendingPacks", m_strIntallingPack);
+								Dbg("pushback[%s] to m_ManualPendingPacks", m_strIntallingPack.GetData());
 							}
 							
 							Dbg("send Event_StartPoll 10");
@@ -1578,7 +1578,7 @@ unsigned int CUpgradeMgrFSM::s4_on_event(FSMEvent* event)
 								//检查安装结果，并上报
 								IsManualInstallOk(m_strIntallingPack);
 
-								Dbg("[%s]手动升级完成，从待手动升级列表删除", m_strIntallingPack);
+								Dbg("[%s]手动升级完成，从待手动升级列表删除", m_strIntallingPack.GetData());
 								m_ManualPendingPacks.remove(m_strIntallingPack);
 
 								//更新运行时手动升级任务
@@ -1605,7 +1605,7 @@ unsigned int CUpgradeMgrFSM::s4_on_event(FSMEvent* event)
 							}
 							else
 							{
-								Dbg("未在待手动升级列表中找到[%s]", m_strIntallingPack);
+								Dbg("未在待手动升级列表中找到[%s]", m_strIntallingPack.GetData());
 							}
 
 							// xkm@20161128: 为保证定制上报成功，通过定时器重启
@@ -1917,7 +1917,7 @@ bool CUpgradeMgrFSM::CheckIfCanSwitchNow()
 	bool bOffworkTime = nowTimeTm.tm_hour < 8 || nowTimeTm.tm_hour >= 18;
 #endif
 
-	Dbg("strCustomerHandle=%s, strCallState=%s, bOffworkTime=%d",strCustomerHandle,strCallState,bOffworkTime);
+	Dbg("strCustomerHandle=%s, strCallState=%s, bOffworkTime=%d",strCustomerHandle.GetData(),strCallState.GetData(),bOffworkTime);
 
 	// 或者下班时间且非连线状态 @20151202
 	// 客户关注状态A，不允许切换 by zl 20191113
@@ -2055,7 +2055,7 @@ bool CUpgradeMgrFSM::UpdateManualTaskState()
 			CSimpleStringA strPackName =  *itor;
 			if (IsManualInstallOk(*itor))
 			{
-				Dbg("[%s]手动升级完成，从待手动升级列表删除", strPackName);
+				Dbg("[%s]手动升级完成，从待手动升级列表删除", strPackName.GetData());
 				m_ManualPendingPacks.remove(strPackName);								
 			}
 
@@ -2112,7 +2112,7 @@ bool CUpgradeMgrFSM::IsManualInstallOk(CSimpleStringA strPackName)
 		else
 		{	
 			// 系统补丁包和固件升级包也需上报					
-			Dbg("report SysPatchName:[%s]", strPackName);
+			Dbg("report SysPatchName:[%s]", strPackName.GetData());
 			m_ReportFSM.PostEventFIFO(new CReportMgrFSM::ReportSysCustomVerEvent(strPackName, "", "", strVersion));
 		}
 	}
@@ -2127,7 +2127,7 @@ bool CUpgradeMgrFSM::IsManualInstallOk(CSimpleStringA strPackName)
 		}
 		else
 		{
-			Dbg("report FirmwarePack:[%s]", strPackName);
+			Dbg("report FirmwarePack:[%s]", strPackName.GetData());
 			m_ReportFSM.PostEventFIFO(new CReportMgrFSM::ReportSysCustomVerEvent(strPackName, "", strVersion, ""));
 		}
 	}
@@ -2159,7 +2159,7 @@ CSimpleStringA CUpgradeMgrFSM::GetSysPatchNameFromPackName(const char *pszPackNa
 		}
 		else
 		{
-			Dbg("升级包名[%s]不符合规范, 格式必须是：[包类型_日期_补丁名]",  str);
+			Dbg("升级包名[%s]不符合规范, 格式必须是：[包类型_日期_补丁名]",  str.GetData());
 		}
 	}
 
@@ -2251,13 +2251,13 @@ bool CUpgradeMgrFSM::GetFirmwarePackUpgradeResult(const char *pszPackageName, CS
 									CSimpleStringA strPackName = pszPackageName;
 									if (strPackName.IndexOf(strFWID.GetData()) > 0)
 									{
-										Dbg("find FWID[%] from strPackName[%s]", strFWID, strPackName);										
+										Dbg("find FWID[%] from strPackName[%s]", strFWID.GetData(), strPackName.GetData());										
 										strVerison = strFWID;
 										bUpdate = true;
 									}
 									else
 									{
-										Dbg("can not find FWID[%] from strPackName[%s]", strFWID, strPackName);
+										Dbg("can not find FWID[%] from strPackName[%s]", strFWID.GetData(), strPackName.GetData());
 										strErrMsg = "can not find FWID from PackName";
 										bUpdate = false;
 									}
@@ -2324,7 +2324,7 @@ ErrorCodeEnum CUpgradeMgrFSM::UpdateInstallFailedPackInfo(CSimpleStringA strPack
 	CSimpleStringA strPackInfoList;
 	CSimpleStringA strNewPackInfoList;
 
-	Dbg("UpdateInstallFailedPackInfo, %s",strPackName);
+	Dbg("UpdateInstallFailedPackInfo, %s",strPackName.GetData());
 	if (Error_Succeed != GetInstallFailedPackInfo(strPackInfoList)
 		|| strPackInfoList.IsNullOrEmpty())
 	{
@@ -2335,7 +2335,7 @@ ErrorCodeEnum CUpgradeMgrFSM::UpdateInstallFailedPackInfo(CSimpleStringA strPack
 	}
 	else
 	{
-		Dbg("old FailedPackInfo is [%s]", strPackInfoList);
+		Dbg("old FailedPackInfo is [%s]", strPackInfoList.GetData());
 
 		//add by zl 20191113 运行时最长支持65000，大于这个长度直接清空
 		if (strPackInfoList.GetLength() >= 65000)
@@ -2358,12 +2358,12 @@ ErrorCodeEnum CUpgradeMgrFSM::UpdateInstallFailedPackInfo(CSimpleStringA strPack
 			CAutoArray<CSimpleStringA> arr = strPackInfoList.Split(';');
 			for(int i=0; i< arr.GetCount(); i++)
 			{
-				Dbg("arr[%d]=[%s]", i,arr[i]);	
+				Dbg("arr[%d]=[%s]", i,arr[i].GetData());	
 				int nPos = arr[i].IndexOf(",");
 				CSimpleStringA strName = arr[i].SubString(0,nPos);
 				CSimpleStringA strConut = arr[i].SubString(nPos+1, arr[i].GetLength()-nPos-1);
 
-				Dbg("strName=%s, strConut=%s", strName,strConut);	
+				Dbg("strName=%s, strConut=%s", strName.GetData(),strConut.GetData());	
 				if (0 == strName.Compare(strPackName, false))
 					//if (strName.IsStartWith(strPackName))
 				{
@@ -2381,7 +2381,7 @@ ErrorCodeEnum CUpgradeMgrFSM::UpdateInstallFailedPackInfo(CSimpleStringA strPack
 					strNew += buf;
 
 					arr[i] = strNew;
-					Dbg("strNew=%s", strNew);
+					Dbg("strNew=%s", strNew.GetData());
 				}
 
 				strNewPackInfoList += arr[i];	
@@ -2390,7 +2390,7 @@ ErrorCodeEnum CUpgradeMgrFSM::UpdateInstallFailedPackInfo(CSimpleStringA strPack
 		}
 	}
 
-	Dbg("new FailedPackInfo is [%s]", strNewPackInfoList);
+	Dbg("new FailedPackInfo is [%s]", strNewPackInfoList.GetData());
 
 	return SetInstallFailedPackInfo(strNewPackInfoList);
 }