Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(wireless): ap property when received added,changed,removed signals

Browse Source 
Change-Id: I1af1fd6e221d82630f72abda484d0a8ca7376431
This commit is contained in:
listenerri 2018-06-28 19:06:07 +08:00 committed by ListenerRi
parent 60561a1139
commit b2ff74d2f3
Notes: gerrit 2018-06-29 10:26:07 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: hualet <mr.asianwang@gmail.com>
Submitted-by: ListenerRi <listenerri@gmail.com>
Submitted-at: Fri, 29 Jun 2018 10:26:06 +0800
Reviewed-on: https://cr.deepin.io/36193
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/new-network/item/applet/accesspoint.cpp
View File

@ -53,7 +53,6 @@ AccessPoint::AccessPoint()
bool AccessPoint::operator==(const AccessPoint &ap) const
{
// return m_path == ap.m_path;
return m_ssid == ap.ssid();
}

71
plugins/new-network/item/applet/wirelesslist.cpp
View File

@ -122,9 +122,6 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
});
QMetaObject::invokeMethod(this, "loadAPList", Qt::QueuedConnection);
/* TODO: remove */
//loadAPList();
}
WirelessList::~WirelessList()
@ -141,26 +138,30 @@ QWidget *WirelessList::controlPanel()
void WirelessList::APAdded(const QJsonObject &apInfo)
{
AccessPoint ap(apInfo);
if (m_apList.contains(ap))
return;
const auto mIndex = m_apList.indexOf(ap);
if (mIndex != -1) {
if (ap > m_apList.at(mIndex)) {
m_apList.replace(mIndex, ap);
} else {
return;
}
} else {
m_apList.append(ap);
}
m_apList.append(ap);
m_updateAPTimer->start();
}
void WirelessList::APRemoved(const QJsonObject &apInfo)
{
AccessPoint ap(apInfo);
if (ap.ssid() == m_activeAP.ssid())
return;
/* TODO: <22-06-18, yourname> */
// m_apList.removeOne(ap);
// m_updateAPTimer->start();
// NOTE: if one ap removed, prehaps another ap has same ssid, so we need to refersh ap list instead of remove it
m_apList.clear();
loadAPList();
const auto mIndex = m_apList.indexOf(ap);
if (mIndex != -1) {
if (ap.path() == m_apList.at(mIndex).path()) {
m_apList.removeAt(mIndex);
m_updateAPTimer->start();
}
}
}
void WirelessList::setDeviceInfo(const int index)
@ -179,8 +180,16 @@ void WirelessList::loadAPList()
{
for (auto item : m_device->apList()) {
AccessPoint ap(item.toObject());
if (!m_apList.contains(ap))
const auto mIndex = m_apList.indexOf(ap);
if (mIndex != -1) {
// indexOf() will use AccessPoint reimplemented function "operator==" as comparison condition
// this means that the ssid of the AP is a comparison condition
if (ap > m_apList.at(mIndex)) {
m_apList.replace(mIndex, ap);
}
} else {
m_apList.append(ap);
}
}
m_updateAPTimer->start();
@ -188,28 +197,14 @@ void WirelessList::loadAPList()
void WirelessList::APPropertiesChanged(const QJsonObject &apInfo)
{
const AccessPoint ap(apInfo);
//auto it = std::find_if(m_apList.begin(), m_apList.end(),
//[&] (const AccessPoint &a) {return a == ap;});
//if (it == m_apList.end())
//return;
//*it = ap;
if (m_apList.contains(ap) && m_activeAP.path() == ap.path())
{
m_activeAP = ap;
AccessPoint ap(apInfo);
const auto mIndex = m_apList.indexOf(ap);
if (mIndex != -1) {
if (ap > m_apList.at(mIndex)) {
m_apList.replace(mIndex, ap);
m_updateAPTimer->start();
}
}
// if (*it > ap)
// {
// *it = ap;
// m_activeAP = ap;
// m_updateAPTimer->start();
// emit activeAPChanged();
// }
}
void WirelessList::updateAPList()