diff --git a/HistoryAlarm.cpp b/HistoryAlarm.cpp index 3636851..6da7b7a 100644 --- a/HistoryAlarm.cpp +++ b/HistoryAlarm.cpp @@ -556,6 +556,7 @@ void CHistoryAlarm::downloadProcess_Slot(qint64 byteSend, qint64 byteTotal) downloadProgressDialog->setValue(byteSend); if(byteSend == byteTotal){ disconnect(g_FtpClient,SIGNAL(sigDownloadProcess(qint64 , qint64 )),this,SLOT(downloadProcess_Slot(qint64 , qint64))); + customLogMessageHandler(QtDebugMsg,"HistoryAlarm Open:" + g_LocalFile); OpenDatFile(g_LocalFile); } } diff --git a/ImportConfig.cpp b/ImportConfig.cpp index 1a0404b..e49d571 100644 --- a/ImportConfig.cpp +++ b/ImportConfig.cpp @@ -181,12 +181,9 @@ void CImportConfig::on_pushButton_confirm_clicked() #endif QString strURL = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitWorkConditionsInfo.json"); -// g_FtpClient->SetServerInfo(strURL); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(fileNameInfo,"UnitWorkConditionsInfo.json"); + g_FtpClient->uploadFile(strURL,fileNameInfo,"UnitWorkConditionsInfo.json"); -// Uploader u; -// u.start(strURL,fileNameInfo,"UnitWorkConditionsInfo.json"); + #ifdef Q_OS_WIN32 @@ -197,9 +194,7 @@ void CImportConfig::on_pushButton_confirm_clicked() #endif QString str2 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitConfigurations.json"); -// g_FtpClient->SetServerInfo(str2); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(fileNameUnit,"UnitConfigurations.json"); + g_FtpClient->uploadFile(str2,fileNameUnit,"UnitConfigurations.json"); #ifdef Q_OS_WIN32 QString fileNameUnit2 = QCoreApplication::applicationDirPath() + "\\config\\UnitConfigurations2.json"; @@ -209,9 +204,7 @@ void CImportConfig::on_pushButton_confirm_clicked() #endif QString str22 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitConfigurations2.json"); -// g_FtpClient->SetServerInfo(str22); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(fileNameUnit2,"UnitConfigurations2.json"); + g_FtpClient->uploadFile(str22,fileNameUnit2,"UnitConfigurations2.json"); #ifdef Q_OS_WIN32 @@ -222,9 +215,7 @@ void CImportConfig::on_pushButton_confirm_clicked() #endif QString str1 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("TriggerSettings.json"); -// g_FtpClient->SetServerInfo(str1); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(fileNameTri,"TriggerSettings.json"); + g_FtpClient->uploadFile(str1,fileNameTri,"TriggerSettings.json"); #ifdef Q_OS_WIN32 @@ -235,9 +226,7 @@ void CImportConfig::on_pushButton_confirm_clicked() #endif QString strTri2 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("TriggerSettings2.json"); -// g_FtpClient->SetServerInfo(strTri2); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(fileNameTri2,"TriggerSettings2.json"); + g_FtpClient->uploadFile(strTri2,fileNameTri2,"TriggerSettings2.json"); #ifdef Q_OS_WIN32 @@ -247,9 +236,7 @@ void CImportConfig::on_pushButton_confirm_clicked() QString name = QCoreApplication::applicationDirPath() + "/config/UnitBoardsInfo.json"; #endif QString str = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitBoardsInfo.json"); -// g_FtpClient->SetServerInfo(str); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(name,"UnitBoardsInfo.json"); + g_FtpClient->uploadFile(str,name,"UnitBoardsInfo.json"); #ifdef Q_OS_WIN32 @@ -259,10 +246,8 @@ void CImportConfig::on_pushButton_confirm_clicked() QString fileNameChannel = QCoreApplication::applicationDirPath() + "/config/ChannelSettings.json"; #endif QString strChannelSettings = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("ChannelSettings.json"); -// g_FtpClient->SetServerInfo(str); -// g_FtpClient->SetUserInfo("root","@#cidw!@123456"); -// g_FtpClient->UpLoadFile(name,"UnitBoardsInfo.json"); - g_FtpClient->uploadFile(strChannelSettings,fileNameChannel,"UnitBoardsInfo.json"); + + g_FtpClient->uploadFile(strChannelSettings,fileNameChannel,"ChannelSettings.json"); qApp->exit(0); QProcess::startDetached(qApp->applicationFilePath(), QStringList());