openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug switch state of kylin-nm is different from control-center

This commit is contained in:
chenlelin 2020-08-25 16:39:54 +08:00
parent d6f8ecd09b
commit f7d1658bba
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kylin-dbus-interface.cpp
View File

@ -846,11 +846,11 @@ void KylinDBus::getWifiSwitchState()
if (isWirelessCardOn) {
bool judge = getSwitchStatus(key);
if (judge) {
mw->onBtnWifiClicked(1); //打开wifi开关
mw->onBtnWifiClicked(2); //打开wifi开关
qDebug()<<"receive a signal to turn on wifi switch from control-center";
syslog(LOG_DEBUG, "receive a signal to turn on wifi switch from control-center");
} else {
mw->onBtnWifiClicked(2); //关闭wifi开关
mw->onBtnWifiClicked(3); //关闭wifi开关
qDebug()<<"receive a signal to turn off wifi switch from control-center";
syslog(LOG_DEBUG, "receive a signal to turn off wifi switch from control-center");
}
@ -876,6 +876,7 @@ bool KylinDBus::getSwitchStatus(QString key) {
//通知控制面板wifi开关的信息
void KylinDBus::setWifiSwitchState(bool signal)
{
qDebug() << "111aaa";
if (!m_gsettings) {
return ;
}
@ -885,7 +886,9 @@ void KylinDBus::setWifiSwitchState(bool signal)
if (!list.contains("switchor")) {
return ;
}
qDebug() << "111bbb";
m_gsettings->set("switchor",signal);
qDebug() << "111ccc";
}
//通知控制面板无线网卡的状态信息

16
src/mainwindow.cpp
View File

@ -935,7 +935,7 @@ void MainWindow::onNetworkDeviceAdded(QDBusObjectPath objPath)
syslog(LOG_DEBUG,"wireless device is already plug in");
qDebug()<<"wireless device is already plug in";
is_wireless_adapter_ready = 1;
onBtnWifiClicked(3);
onBtnWifiClicked(4);
}
}
}
@ -950,7 +950,7 @@ void MainWindow::onNetworkDeviceRemoved(QDBusObjectPath objPath)
syslog(LOG_DEBUG,"wireless device is already plug out");
qDebug()<<"wireless device is already plug out";
is_wireless_adapter_ready = 0;
onBtnWifiClicked(4);
onBtnWifiClicked(5);
} else {
syslog(LOG_DEBUG,"wireless device is already plug out, but one more wireless exist");
qDebug()<<"wireless device is already plug out, but one more wireless exist";
@ -1049,10 +1049,11 @@ void MainWindow::onBtnWifiClicked(int flag)
if (is_wireless_adapter_ready == 1) {
// 当连接上无线网卡时才能打开wifi开关
// 网络开关关闭时，点击Wifi开关时，程序先打开有线开关
if (flag == 0 || flag == 3 || flag == 4) {
if (flag == 0 || flag == 1 || flag == 4 || flag == 5) {
if (checkWlOn()) {
if (flag != 3) { //以防第二张无线网卡插入时断网
if (flag != 4) { //以防第二张无线网卡插入时断网
is_stop_check_net_state = 1;
qDebug() << "aaa111";
objKyDBus->setWifiSwitchState(false);
lbTopWifiList->hide();
btnAddNet->hide();
@ -1072,15 +1073,16 @@ void MainWindow::onBtnWifiClicked(int flag)
if (is_fly_mode_on == 0) {
//on_btnWifiList_clicked();
is_stop_check_net_state = 1;
qDebug() << "aaa222";
objKyDBus->setWifiCardState(true);
objKyDBus->setWifiSwitchState(true);
//lbTopWifiList->show();
//btnAddNet->show();
btnWireless->setSwitchStatus(true);
QThread *t = new QThread();
BackThread *bt = new BackThread();
bt->moveToThread(t);
btnWireless->setSwitchStatus(true);
connect(t, SIGNAL(finished()), t, SLOT(deleteLater()));
connect(t, SIGNAL(started()), bt, SLOT(execEnWifi()));
connect(bt, SIGNAL(enWifiDone()), this, SLOT(enWifiDone()));
@ -1090,7 +1092,7 @@ void MainWindow::onBtnWifiClicked(int flag)
this->startLoading();
}
}
} else if(flag == 1) {
} else if(flag == 2) {
if (is_fly_mode_on == 0) {
//on_btnWifiList_clicked();
is_stop_check_net_state = 1;
@ -1109,7 +1111,7 @@ void MainWindow::onBtnWifiClicked(int flag)
t->start();
this->startLoading();
}
} else if(flag == 2) {
} else if(flag == 3) {
is_stop_check_net_state = 1;
lbTopWifiList->hide();
btnAddNet->hide();

2
src/mainwindow.h
View File

@ -180,7 +180,7 @@ public slots:
void on_btnHotspot_clicked();
void on_btnHotspotState();
//flag =0为普通点击、1为收到打开信息、2为收到关闭信息、3为无线网卡插入、4为无线网卡拔出
//flag =0或1为普通点击、2为收到打开信息、3为收到关闭信息、4为无线网卡插入、5为无线网卡拔出
void onBtnWifiClicked(int flag = 0);
protected: