1、打印时间耗时；

2、修复test_mode问题（由于getmessage返回的host不是测试地址造成的问题）

TCL Copy Tool/TCL Copy Tool/OTA.cpp

@@ -1433,8 +1433,8 @@ void COTA::ShowMessage(LPCTSTR lpMsg, LOG_ENUM logtype)
 
 BOOL COTA::HttpGet(std::string host, std::string context, std::string &result, DATATYPE dt)
 {
-	//host = CharEncoding::EnCode_UTF8URL(host.c_str());
-	//context = CharEncoding::EnCode_UTF8URL(context.c_str());
+	AUTOTIMING;
+	//AutoTiming at(host+"；"+context);
 	context = CharEncoding::ASCII2UTF8(context.c_str());
 	m_curl.SetHeaders("Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/x-silverlight, application/x-ms-application, application/x-ms-xbap, application/vnd.ms-xpsdocument, application/xaml+xml, */*");
 	m_curl.SetHeaders("Accept-Language: zh-cn");
@@ -1455,6 +1455,8 @@ BOOL COTA::HttpGet(std::string host, std::string context, std::string &result, D
 
 BOOL COTA::HttpPost(std::string host, std::string context, std::string &result, DATATYPE dt)
 {
+	AUTOTIMING;
+	//AutoTiming at(host + "；" + context);
 	context = CharEncoding::ASCII2UTF8(context.c_str());
 	m_curl.SetHeaders("Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/x-silverlight, application/x-ms-application, application/x-ms-xbap, application/vnd.ms-xpsdocument, application/xaml+xml, */*");
 	m_curl.SetHeaders("Accept-Language: zh-cn");
@@ -1488,6 +1490,7 @@ BOOL COTA::HttpPost(std::string host, std::string context, std::string &result,
 
 BOOL COTA::GetMIDInfo(MIDInfo &mid, std::string bid, std::string strMacs, std::string iptvid, std::string version)
 {
+	AUTOTIMING;
 	// Json数据;
 	cJSON *pJson = cJSON_CreateObject();
 	cJSON_AddStringToObject(pJson, "clientType", iptvid.c_str());
@@ -1633,6 +1636,7 @@ end:
 
 BOOL COTA::GetKeyInfo(std::string host, std::string context, std::string keyname, std::string valuename, std::string &value)
 {
+	AUTOTIMING;
 	std::string result;
 	if (!HttpPost(host, context, result))
 	{
@@ -1731,6 +1735,7 @@ BOOL COTA::GetKeyInfo(std::string host, std::string context, std::string keyname
 
 void COTA::UpgradeCheck(std::string factoryNum)
 {
+	AUTOTIMING;
 	// 当前文件版本号、产品版本号;
 	WORD sFileVersion[4] = {0};
 	WORD sProductVerion[4] = {0};
@@ -1879,6 +1884,7 @@ void COTA::UpgradeCheck(std::string factoryNum)
 
 void COTA::ReportUpgrade(BOOL bUpgrade, std::string ver, std::string num)
 {
+	AUTOTIMING;
 	// Json数据;
 	cJSON *pJson = cJSON_CreateObject();
 	cJSON_AddStringToObject(pJson, "appid", "SCBC_Factory_Tools");
@@ -1916,6 +1922,7 @@ void COTA::ReportUpgrade(BOOL bUpgrade, std::string ver, std::string num)
 
 BOOL COTA::DownloadFile(std::string url, std::string savePath)
 {
+	AUTOTIMING;
 	std::string result;
 	if (HttpGet(url, "", result))
 	{
@@ -1936,6 +1943,7 @@ BOOL COTA::DownloadFile(std::string url, std::string savePath)
 
 BOOL COTA::ReportLog(TReportData& repdata)
 {
+	AUTOTIMING;
 	// Json数据;
 	cJSON* pJson = cJSON_CreateObject();
 	cJSON_AddStringToObject(pJson, "reportType", repdata.report_type.c_str());

TCL Copy Tool/TCL Copy Tool/OTA.h

@@ -240,5 +240,28 @@ public:
 	BOOL GetVCode(std::string mac, std::string &vcode);
 };
 
+class AutoTiming
+{
+public:
+	AutoTiming(std::string des) {
+		_start = clock();
+		_des = des;
+	}
+
+	~AutoTiming(){
+		_end = clock();
+		LOG4C((LOG_NOTICE, "%s£¬ÇëÇóºÄʱ£º%ld ms", _des.c_str(), _end - _start));
+	}
+
+private:
+	clock_t _start;
+	clock_t _end;
+	std::string _des;
+};
+
+#ifndef AUTOTIMING
+#define AUTOTIMING AutoTiming at(__FUNCTION__)
+#endif
+
 extern std::string HexString2Bytes(std::string strHex, const int& len = 3);
 #endif

TCL Copy Tool/TCL Copy Tool/TCL Copy Tool.cpp

@@ -73,9 +73,9 @@ BOOL CTCLToolsApp::InitInstance()
 	///设置日志级别
 	LOG4C_PARAM_LOG_LEVEL("unknown");
 	///设置日志文件大小
-	LOG4C_PARAM_LOG_FILE_SIZE(102400);
+	LOG4C_PARAM_LOG_FILE_SIZE(1024*1024*10);
 	///设置生成日志文件个数，达到最大个数将自动覆盖最旧的日志
-	LOG4C_PARAM_LOG_FILE_NUM(3);
+	LOG4C_PARAM_LOG_FILE_NUM(100);
 	///设置每次记录日志都重新读取日志配置文件
 	LOG4C_PARAM_REREAD_LOG_CFG_FILE(1);
 	///带参数日志模块初始化,以上所有设置了的参数都将生效，没有设置的采用缺省值

TCL Copy Tool/TCL Copy Tool/TCL Copy ToolDlg.cpp

@@ -14,6 +14,7 @@
 #define new DEBUG_NEW
 #endif
 
+std::string g_true_host;
 HHOOK CTCLCopyToolDlg::m_hHook;
 // 用于应用程序“关于”菜单项的 CAboutDlg 对话框
 
@@ -1303,6 +1304,12 @@ void CTCLCopyToolDlg::UpdateAutoOnlineMode()
 
 			if (g_ota.GetMIDInfo(g_midInfo, strBid.GetString(), Global::g_strMacs))
 			{
+				if (Global::g_bTestHost)
+				{
+					g_true_host = g_midInfo.host;
+					g_midInfo.host = "http://test.admin.ota.qhmoka.com/IDManage";
+				}
+
 				m_pCurChassis = &Global::g_AutoOnlineChassis;
 				// 更新check box状态;
 				UpdateChassisCheckBoxStatus();
@@ -1532,6 +1539,7 @@ BOOL CTCLCopyToolDlg::Siacp_MTKInit()
 
 BOOL CTCLCopyToolDlg::Siacp_EnterFactoryMode()
 {
+	AUTOTIMING;
 	BOOL bRet = FALSE;
 	// 进入工厂模式;
 	if ((bRet = g_siacp.SCBC_EnterFactory()) == TRUE)
@@ -1552,6 +1560,7 @@ BOOL CTCLCopyToolDlg::Siacp_EnterFactoryMode()
 
 BOOL CTCLCopyToolDlg::Siacp_GetClientType(std::string& client_type)
 {
+	AUTOTIMING;
 	BOOL bRet = FALSE;
 	// 获取Client Type;
 	if ((bRet = g_siacp.SCBC_GetClientType(client_type)) == TRUE)
@@ -1578,6 +1587,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetClientType(std::string& client_type)
 
 BOOL CTCLCopyToolDlg::Siacp_GetSofteVersion(std::string& soft_version)
 {
+	AUTOTIMING;
 	BOOL bRet = FALSE;
 	// 时入工厂模式;
 	if ((bRet = g_siacp.SCBC_GetSoftVersion(soft_version)) == TRUE)
@@ -1599,6 +1609,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetSofteVersion(std::string& soft_version)
 
 BOOL CTCLCopyToolDlg::Siacp_SetProjectId()
 {
+	AUTOTIMING;
 	if (!m_check_pid.GetCheck() || m_str_pid.IsEmpty())
 		return FALSE;
 
@@ -1621,6 +1632,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetProjectId()
 
 BOOL CTCLCopyToolDlg::Siacp_GetProjectId()
 {
+	AUTOTIMING;
 	int pid = 0;
 	BOOL bRet = FALSE;
 	if ((bRet = g_siacp.SCBC_GetProjectId(pid)) == TRUE)
@@ -1644,6 +1656,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetProjectId()
 
 BOOL CTCLCopyToolDlg::Siacp_SetWB()
 {
+	AUTOTIMING;
 	BOOL bRet1 = g_siacp.SCBC_SetWBNormal(m_chWBNormalBuffer, WB_MAX);
 
 	// 冷模式色温赋值
@@ -1670,6 +1683,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetWB()
 
 BOOL CTCLCopyToolDlg::Siacp_SetChannel(std::string& channel)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_channel.GetCheck() || (nCurSel = m_cb_channel.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1696,6 +1710,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetChannel(std::string& channel)
 
 BOOL CTCLCopyToolDlg::Siacp_GetChannel(std::string channel)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_channel.GetCheck() || (nCurSel = m_cb_channel.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1724,6 +1739,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetChannel(std::string channel)
 
 BOOL CTCLCopyToolDlg::Siacp_SetOSDLanguage(std::string& language)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_osd_lang.GetCheck() || (nCurSel = m_cb_osd_lang.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1750,6 +1766,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetOSDLanguage(std::string& language)
 
 BOOL CTCLCopyToolDlg::Siacp_GetOSDLanguage(std::string language)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_osd_lang.GetCheck() || (nCurSel = m_cb_osd_lang.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1778,6 +1795,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetOSDLanguage(std::string language)
 
 BOOL CTCLCopyToolDlg::Siacp_SetShopLanguage(std::string& language)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_shop_lang.GetCheck() || (nCurSel = m_cb_shop_lang.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1804,6 +1822,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetShopLanguage(std::string& language)
 
 BOOL CTCLCopyToolDlg::Siacp_GetShopLanguage(std::string language)
 {
+	AUTOTIMING;
 	int nCurSel = 0;
 	if (!m_check_shop_lang.GetCheck() || (nCurSel = m_cb_shop_lang.GetCurSel()) == CB_ERR)
 		return TRUE;
@@ -1832,6 +1851,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetShopLanguage(std::string language)
 
 BOOL CTCLCopyToolDlg::Siacp_SetDeviceId(std::string& deviceid)
 {
+	AUTOTIMING;
 	if (!m_check_did.GetCheck())
 		return TRUE;
 
@@ -1871,6 +1891,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetDeviceId(std::string& deviceid)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckDeviceId()
 {
+	AUTOTIMING;
 	if (!m_check_did.GetCheck())
 		return TRUE;
 
@@ -1893,6 +1914,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckDeviceId()
 
 BOOL CTCLCopyToolDlg::Siacp_GetDeviceId(std::string deviceid)
 {
+	AUTOTIMING;
 	if (!m_check_did.GetCheck())
 		return TRUE;
 
@@ -1919,6 +1941,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetDeviceId(std::string deviceid)
 
 BOOL CTCLCopyToolDlg::Siacp_SetMac(std::string& mac)
 {
+	AUTOTIMING;
 	if (!m_check_mac.GetCheck())
 		return TRUE;
 
@@ -1959,6 +1982,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetMac(std::string& mac)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckMac()
 {
+	AUTOTIMING;
 	if (!m_check_mac.GetCheck())
 		return TRUE;
 
@@ -1980,6 +2004,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckMac()
 
 BOOL CTCLCopyToolDlg::Siacp_GetMac(std::string mac)
 {
+	AUTOTIMING;
 	if (!m_check_mac.GetCheck())
 		return TRUE;
 
@@ -2006,6 +2031,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetMac(std::string mac)
 
 BOOL CTCLCopyToolDlg::Siacp_SetHDCP(std::string& hdcp)
 {
+	AUTOTIMING;
 	if (!m_check_hdcp.GetCheck())
 		return TRUE;
 
@@ -2046,6 +2072,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetHDCP(std::string& hdcp)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckHDCP()
 {
+	AUTOTIMING;
 	if (!m_check_hdcp.GetCheck())
 		return TRUE;
 
@@ -2067,6 +2094,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckHDCP()
 
 BOOL CTCLCopyToolDlg::Siacp_GetHDCP(std::string hdcp)
 {
+	AUTOTIMING;
 	if (!m_check_hdcp.GetCheck())
 		return TRUE;
 
@@ -2093,6 +2121,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetHDCP(std::string hdcp)
 
 BOOL CTCLCopyToolDlg::Siacp_SetHDCP22(std::string& hdcp22)
 {
+	AUTOTIMING;
 	if (!m_check_hdcp22.GetCheck())
 		return TRUE;
 
@@ -2133,6 +2162,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetHDCP22(std::string& hdcp22)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckHDCP22()
 {
+	AUTOTIMING;
 	if (!m_check_hdcp22.GetCheck())
 		return TRUE;
 
@@ -2154,6 +2184,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckHDCP22()
 
 BOOL CTCLCopyToolDlg::Siacp_GetHDCP22(std::string hdcp22)
 {
+	AUTOTIMING;
 	if (!m_check_hdcp22.GetCheck())
 		return TRUE;
 
@@ -2181,6 +2212,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetHDCP22(std::string hdcp22)
 
 BOOL CTCLCopyToolDlg::Siacp_SetWidi(std::string& widi)
 {
+	AUTOTIMING;
 	if (!m_check_widi.GetCheck())
 		return TRUE;
 
@@ -2221,6 +2253,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetWidi(std::string& widi)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckWidi()
 {
+	AUTOTIMING;
 	if (!m_check_widi.GetCheck())
 		return TRUE;
 
@@ -2242,6 +2275,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckWidi()
 
 BOOL CTCLCopyToolDlg::Siacp_GetWidi(std::string widi)
 {
+	AUTOTIMING;
 	if (!m_check_widi.GetCheck())
 		return TRUE;
 
@@ -2268,6 +2302,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetWidi(std::string widi)
 
 BOOL CTCLCopyToolDlg::Siacp_SetWidevine(std::string& widevine)
 {
+	AUTOTIMING;
 	if (!m_check_widevine.GetCheck())
 		return TRUE;
 
@@ -2308,6 +2343,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetWidevine(std::string& widevine)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckWidevine()
 {
+	AUTOTIMING;
 	if (!m_check_widevine.GetCheck())
 		return TRUE;
 
@@ -2329,6 +2365,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckWidevine()
 
 BOOL CTCLCopyToolDlg::Siacp_GetWidevine(std::string widevine)
 {
+	AUTOTIMING;
 	if (!m_check_widevine.GetCheck())
 		return TRUE;
 
@@ -2355,6 +2392,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetWidevine(std::string widevine)
 
 BOOL CTCLCopyToolDlg::Siacp_SetESN(std::string& esn)
 {
+	AUTOTIMING;
 	if (!m_check_esn.GetCheck())
 		return TRUE;
 
@@ -2395,6 +2433,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetESN(std::string& esn)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckESN()
 {
+	AUTOTIMING;
 	if (!m_check_esn.GetCheck())
 		return TRUE;
 
@@ -2416,6 +2455,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckESN()
 
 BOOL CTCLCopyToolDlg::Siacp_GetESN(std::string esn)
 {
+	AUTOTIMING;
 	if (!m_check_esn.GetCheck())
 		return TRUE;
 
@@ -2442,6 +2482,7 @@ BOOL CTCLCopyToolDlg::Siacp_GetESN(std::string esn)
 
 BOOL CTCLCopyToolDlg::Siacp_SetCikey(std::string& cikey)
 {
+	AUTOTIMING;
 	if (!m_check_cikey.GetCheck())
 		return TRUE;
 
@@ -2482,6 +2523,7 @@ BOOL CTCLCopyToolDlg::Siacp_SetCikey(std::string& cikey)
 
 BOOL CTCLCopyToolDlg::Siacp_CheckCikey()
 {
+	AUTOTIMING;
 	if (!m_check_cikey.GetCheck())
 		return TRUE;
 
@@ -2503,6 +2545,7 @@ BOOL CTCLCopyToolDlg::Siacp_CheckCikey()
 
 BOOL CTCLCopyToolDlg::Siacp_GetCikey(std::string cikey)
 {
+	AUTOTIMING;
 	if (!m_check_cikey.GetCheck())
 		return TRUE;
 
@@ -3264,6 +3307,7 @@ void CTCLCopyToolDlg::OnBnClickedStart()  // 开始;
 
 			DWORD dwCount = GetTickCount64() - p->m_dwTickCount;
 			strLog.Format(_T("\rAll key Copy Sucessfull,It took %d milliseconds!\r\r"), dwCount);
+			LOG4C((LOG_INFO, _T("%s"), strLog));
 			p->SetOptionLog(strLog, INFO_LOG);
 			p->DeleteKeyFiles();
 
@@ -3530,6 +3574,20 @@ BOOL CTCLCopyToolDlg::PreTranslateMessage(MSG* pMsg)
 		{
 			Global::g_bTestHost = !Global::g_bTestHost;
 			m_lb_test_mode.ShowWindow(Global::g_bTestHost);
+
+			if (Global::g_bTestHost)
+			{
+				if (g_midInfo.host.size() && _tcsicmp(g_midInfo.host.c_str(), "http://test.admin.ota.qhmoka.com/IDManage") != 0)
+				{
+					g_true_host = g_midInfo.host;
+					g_midInfo.host = "http://test.admin.ota.qhmoka.com/IDManage";
+				}
+			}
+			else
+			{
+				if (_tcsicmp(g_midInfo.host.c_str(), "http://test.admin.ota.qhmoka.com/IDManage") == 0 && g_true_host.size())
+					g_midInfo.host = g_true_host;
+			}
 		}
 		break;
 		// 前置窗口;