From 43d3e50aad9955582acd533a6a956864034faaf7 Mon Sep 17 00:00:00 2001 From: fengshaoxiong Date: Tue, 30 Jun 2020 09:54:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 记录打印信息的文本中不能有告警信息 Log：将打印的告警信息转为调试信息 Bug：https://pms.uniontech.com/zentao/bug-view-20977.html --- frame/util/abstractpluginscontroller.cpp | 4 ++-- frame/window/mainwindow.cpp | 4 ++-- plugins/keyboard-layout/dbusadaptors.cpp | 4 ++-- plugins/shutdown/shutdownplugin.cpp | 2 +- plugins/trash/popupcontrolwidget.cpp | 2 +- plugins/tray/indicatortray.cpp | 4 ++-- plugins/tray/snitraywidget.cpp | 2 +- plugins/tray/trayplugin.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frame/util/abstractpluginscontroller.cpp b/frame/util/abstractpluginscontroller.cpp index 6b76addfa..cb6745294 100644 --- a/frame/util/abstractpluginscontroller.cpp +++ b/frame/util/abstractpluginscontroller.cpp @@ -165,7 +165,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) const QString &pluginApi = meta.value("api").toString(); bool pluginIsValid = true; if (pluginApi.isEmpty() || !CompatiblePluginApiList.contains(pluginApi)) { - qWarning() << objectName() + qDebug() << objectName() << "plugin api version not matched! expect versions:" << CompatiblePluginApiList << ", got version:" << pluginApi << ", the plugin file is:" << pluginFile; @@ -175,7 +175,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile) PluginsItemInterface *interface = qobject_cast(pluginLoader->instance()); if (!interface) { - qWarning() << objectName() << "load plugin failed!!!" << pluginLoader->errorString() << pluginFile; + qDebug() << objectName() << "load plugin failed!!!" << pluginLoader->errorString() << pluginFile; pluginLoader->unload(); pluginLoader->deleteLater(); diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 72109a3b1..5b3fd0b2f 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -686,8 +686,8 @@ void MainWindow::setStrutPartial() ++count; } if (count > 0) { - qWarning() << "strutArea is intersects with another screen."; - qWarning() << maxScreenHeight << maxScreenWidth << m_dockPosition << p << s; + qDebug() << "strutArea is intersects with another screen."; + qDebug() << maxScreenHeight << maxScreenWidth << m_dockPosition << p << s; return; } diff --git a/plugins/keyboard-layout/dbusadaptors.cpp b/plugins/keyboard-layout/dbusadaptors.cpp index caf1db222..e00ed6bbc 100644 --- a/plugins/keyboard-layout/dbusadaptors.cpp +++ b/plugins/keyboard-layout/dbusadaptors.cpp @@ -55,7 +55,7 @@ QString DBusAdaptors::layout() const if (m_currentLayout.isEmpty()) { // refetch data QTimer::singleShot(1000, m_keyboard, &Keyboard::currentLayout); - qWarning() << Q_FUNC_INFO << "currentLayout is Empty!!"; + qDebug() << Q_FUNC_INFO << "currentLayout is Empty!!"; } return m_currentLayout; @@ -103,7 +103,7 @@ void DBusAdaptors::initAllLayoutList() QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this); connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] { if (call.isError()) { - qWarning() << "failed to get all keyboard list: " << call.error().message(); + qDebug() << "failed to get all keyboard list: " << call.error().message(); } else { QDBusReply reply = call.reply(); m_allLayoutList = reply.value(); diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index 787a95058..45a1f435a 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -298,7 +298,7 @@ bool ShutdownPlugin::checkSwap() file.close(); } else { - qWarning() << "open /proc/swaps failed! please check permission!!!"; + qDebug() << "open /proc/swaps failed! please check permission!!!"; } return hasSwap; diff --git a/plugins/trash/popupcontrolwidget.cpp b/plugins/trash/popupcontrolwidget.cpp index ec9484c98..1c8996067 100644 --- a/plugins/trash/popupcontrolwidget.cpp +++ b/plugins/trash/popupcontrolwidget.cpp @@ -127,7 +127,7 @@ void PopupControlWidget::clearTrashFloder() if (DTrashManager::instance()->cleanTrash()) { DDesktopServices::playSystemSoundEffect(DDesktopServices::SSE_EmptyTrash); } else { - qWarning() << "Clear trash failed"; + qDebug() << "Clear trash failed"; } // DFMGlobal::instance()->clearTrash(); } diff --git a/plugins/tray/indicatortray.cpp b/plugins/tray/indicatortray.cpp index b0511e5df..a9a3fa57f 100644 --- a/plugins/tray/indicatortray.cpp +++ b/plugins/tray/indicatortray.cpp @@ -84,13 +84,13 @@ public: callback(v); return; } else if (3 != arguments.count()) { - qWarning() << "arguments count must be 3"; + qDebug() << "arguments count must be 3"; return; } QString interfaceName = msg.arguments().at(0).toString(); if (interfaceName != propertyInterfaceNames.value(key)) { - qWarning() << "interfaceName mismatch" << interfaceName << propertyInterfaceNames.value(key) << key; + qDebug() << "interfaceName mismatch" << interfaceName << propertyInterfaceNames.value(key) << key; return; } QVariantMap changedProps = qdbus_cast(arguments.at(1).value()); diff --git a/plugins/tray/snitraywidget.cpp b/plugins/tray/snitraywidget.cpp index 4f699c546..f3b6ece5c 100644 --- a/plugins/tray/snitraywidget.cpp +++ b/plugins/tray/snitraywidget.cpp @@ -585,7 +585,7 @@ void SNITrayWidget::showHoverTips() QProcess p; p.start("qdbus", {m_dbusService}); if (!p.waitForFinished(1000)) { - qWarning() << "sni dbus service error : " << m_dbusService; + qDebug() << "sni dbus service error : " << m_dbusService; return; } diff --git a/plugins/tray/trayplugin.cpp b/plugins/tray/trayplugin.cpp index 89b0370df..2d62b0d27 100644 --- a/plugins/tray/trayplugin.cpp +++ b/plugins/tray/trayplugin.cpp @@ -417,7 +417,7 @@ void TrayPlugin::traySNIAdded(const QString &itemKey, const QString &sniServiceP QProcess p; p.start("qdbus", {nsiServerName}); if (!p.waitForFinished(1000)) { - qWarning() << "sni dbus service error : " << nsiServerName; + qDebug() << "sni dbus service error : " << nsiServerName; return; }