From 75a9312fcb5ed3658da70b9dc5f1c27b13f9e984 Mon Sep 17 00:00:00 2001 From: zhaoyingzhen Date: Tue, 13 Dec 2022 11:02:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E5=8D=8F=E5=90=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=8F=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 协同后端修改导致问题。 Log: Bug: https://pms.uniontech.com/bug-view-176323.html Influence: 协同设备列表显示 Change-Id: I804ce4c3f8d8dab8f3c998664fa742b3f18aa67b --- plugins/display/collaborationdevmodel.cpp | 38 +++++++++++----------- plugins/display/collaborationdevmodel.h | 6 ++-- plugins/display/devcollaborationwidget.cpp | 8 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/display/collaborationdevmodel.cpp b/plugins/display/collaborationdevmodel.cpp index e9bbe3609..89cadfe65 100644 --- a/plugins/display/collaborationdevmodel.cpp +++ b/plugins/display/collaborationdevmodel.cpp @@ -135,7 +135,7 @@ CollaborationDevice::CollaborationDevice(const QString &devPath, QObject *parent : QObject(parent) , m_path(devPath) , m_OS(-1) - , m_isPaired(false) + , m_isConnected(false) , m_isCooperated(false) , m_isValid(false) , m_isCooperating(false) @@ -145,8 +145,8 @@ CollaborationDevice::CollaborationDevice(const QString &devPath, QObject *parent if (m_devDbusInter->isValid()) { m_name = m_devDbusInter->property("Name").toString(); m_OS = m_devDbusInter->property("OS").toInt(); - m_isPaired = m_devDbusInter->property("Paired").toBool(); - m_isCooperated = m_devDbusInter->property("Cooperating").toBool(); + m_isConnected = m_devDbusInter->property("Connected").toBool(); + m_isCooperated = m_devDbusInter->property("DeviceSharing").toBool(); m_uuid = m_devDbusInter->property("UUID").toString(); m_isValid = true; } else { @@ -182,22 +182,22 @@ QString CollaborationDevice::deviceIcon() const switch (m_OS) { case DeviceType::Android: { if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) - return QString(":/icons/resources/ICON_Device_Headphone_dark.svg"); + return QString(":/ICON_Device_Headphone_dark.svg"); - return QString(":/icons/resources/ICON_Device_Headphone.svg"); + return QString(":/ICON_Device_Headphone.svg"); } default: { if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) - return QString(":/icons/resources/ICON_Device_Laptop_dark.svg"); + return QString(":/ICON_Device_Laptop_dark.svg"); - return QString(":/icons/resources/ICON_Device_Laptop.svg"); + return QString(":/ICON_Device_Laptop.svg"); } } } -bool CollaborationDevice::isPaired() const +bool CollaborationDevice::isConnected() const { - return m_isPaired; + return m_isConnected; } bool CollaborationDevice::isCooperated() const @@ -221,19 +221,19 @@ void CollaborationDevice::onPropertyChanged(const QDBusMessage &msg) return; QVariantMap changedProps = qdbus_cast(arguments.at(1).value()); - if (changedProps.contains("Paired")) { - bool isPaired = changedProps.value("Paired").value(); - m_isPaired = isPaired; - if (isPaired && m_isCooperating) { + if (changedProps.contains("Connected")) { + bool isConnected = changedProps.value("Connected").value(); + m_isConnected = isConnected; + if (isConnected && m_isCooperating) { // paired 成功之后再去请求cooperate requestCooperate(); } - if (!isPaired){ + if (!isConnected){ Q_EMIT pairedStateChanged(false); } - } else if (changedProps.contains("Cooperating")) { - m_isCooperated = changedProps.value("Cooperating").value(); + } else if (changedProps.contains("DeviceSharing")) { + m_isCooperated = changedProps.value("DeviceSharing").value(); Q_EMIT pairedStateChanged(m_isCooperated); } @@ -241,7 +241,7 @@ void CollaborationDevice::onPropertyChanged(const QDBusMessage &msg) void CollaborationDevice::requestCooperate() const { - callMethod("RequestCooperate"); + callMethod("RequestDeviceSharing"); } void CollaborationDevice::disconnectDevice() const @@ -249,9 +249,9 @@ void CollaborationDevice::disconnectDevice() const callMethod("Disconnect"); } -void CollaborationDevice::pair() const +void CollaborationDevice::connect() const { - callMethod("Pair"); + callMethod("Connect"); } QDBusMessage CollaborationDevice::callMethod(const QString &methodName) const diff --git a/plugins/display/collaborationdevmodel.h b/plugins/display/collaborationdevmodel.h index 013624211..6313d04dc 100644 --- a/plugins/display/collaborationdevmodel.h +++ b/plugins/display/collaborationdevmodel.h @@ -76,7 +76,7 @@ signals: public: bool isValid() const; - void pair() const; + void connect() const; void requestCooperate() const; void disconnectDevice() const; @@ -84,7 +84,7 @@ public: QString uuid() const; QString machinePath() const; QString deviceIcon() const; - bool isPaired() const; + bool isConnected() const; bool isCooperated() const; void setDeviceIsCooperating(bool isCooperating); @@ -109,7 +109,7 @@ private: QString m_uuid; int m_OS; - bool m_isPaired; + bool m_isConnected; bool m_isCooperated; bool m_isValid; diff --git a/plugins/display/devcollaborationwidget.cpp b/plugins/display/devcollaborationwidget.cpp index 12706a6ee..cc3568fdd 100644 --- a/plugins/display/devcollaborationwidget.cpp +++ b/plugins/display/devcollaborationwidget.cpp @@ -195,9 +195,9 @@ void DevCollaborationWidget::itemClicked(const QModelIndex &index) if (!device) return; - if (!device->isPaired()) { + if (!device->isConnected()) { device->setDeviceIsCooperating(true); - device->pair(); + device->connect(); if (!m_connectingDevices.contains(machinePath)) m_connectingDevices.append(machinePath); } else if (!device->isCooperated()) { @@ -226,12 +226,12 @@ void DevCollaborationWidget::itemStatusChanged() // 更新item的连接状态 int resultState = device->isCooperated() ? DevItemDelegate::Connected : DevItemDelegate::None; m_deviceItemMap[machinePath]->setData(resultState, DevItemDelegate::ResultDataRole); - if (device->isCooperated() || !device->isPaired()) + if (device->isCooperated() || !device->isConnected()) m_deviceItemMap[machinePath]->setData(0, DevItemDelegate::DegreeDataRole); m_deviceListView->update(m_deviceItemMap[machinePath]->index()); - if ((resultState == DevItemDelegate::Connected || !device->isPaired()) && m_connectingDevices.contains(machinePath)) { + if ((resultState == DevItemDelegate::Connected || !device->isConnected()) && m_connectingDevices.contains(machinePath)) { m_connectingDevices.removeAll(machinePath); } }