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

feat(wpa-wifi): Add hidden wpa wifi. 

Description: 修改添加隐藏企业wifi的弹窗为与连接企业wifi弹窗一致

Log: 修改添加隐藏企业wifi的弹窗为与连接企业wifi弹窗一致
This commit is contained in:
zhangjiaping 2020-12-18 17:13:04 +08:00
parent d81238b699
commit 0596b77768
4 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainwindow.h
View File

@ -183,6 +183,7 @@ public slots:
void on_btnHotspot_clicked();
void on_btnHotspotState();
void on_btnWifiList_clicked();
//flag =0或1为普通点击、2为收到打开信息、3为收到关闭信息、4为无线网卡插入、5为无线网卡拔出
void onBtnWifiClicked(int flag = 0);
@ -280,7 +281,7 @@ private slots:
void iconActivated(QSystemTrayIcon::ActivationReason reason);
void on_btnNet_clicked();
void on_btnWifiList_clicked();
// void on_btnWifiList_clicked();
void onBtnNetListClicked(int flag=0);
void getLanListDone(QStringList slist);

2
src/oneconnform.cpp
View File

@ -532,10 +532,12 @@ void OneConnForm::toConnectWirelessNetwork()
connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
QString txt(tr("Conn Wifi Success"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
return;
}

31
src/wpawifidialog.cpp
View File

@ -39,6 +39,8 @@ UpConnThread::~UpConnThread() {
void UpConnThread::run() {
QString cmdStr = "nmcli connection up " + this->conn_name;
qDebug()<<"qDebug: 激活连接: \n"<<
"qDebug: nmcli connection up " + this->conn_name;
int res = Utils::m_system(cmdStr.toUtf8().data());
emit connRes(res);
}
@ -98,7 +100,13 @@ void WpaWifiDialog::initUI() {
nameLabel->setFixedWidth(100);
nameLabel->setText(tr("Connection name"));
nameEditor->setText(connectionName);
nameEditor->setEnabled(false);//暂时不允许编辑wifi名
if (connectionName == "") {
//添加隐藏wifi时
nameEditor->setEnabled(true);//允许编辑wifi名
} else {
//连接现有wifi时
nameEditor->setEnabled(false);//暂时不允许编辑wifi名
}
nameLyt->addWidget(nameLabel);
nameLyt->addWidget(nameEditor);
nameFrame->setLayout(nameLyt);
@ -255,6 +263,10 @@ void WpaWifiDialog::initCombox() {
for (int i = 0; i < innerStringList.length(); i++) {
innerCombox->addItem(innerStringList.at(i), QString(innerStringList.at(i)).toLower());
}
if (connectionName == "") {
askPwdBtn->setChecked(true);
return;
}
// //读配置文件
wifi_info = getWifiInfo(connectionName);
if (wifi_info.length() < 4) {
@ -327,6 +339,9 @@ void WpaWifiDialog::slot_on_connectBtn_clicked() {
int res = Utils::m_system(cmdStr.toUtf8().data());
if (res == 0) {
//有网络配置文件，密码已修改，接下来修改用户名和其他配置，然后激活连接
qDebug()<<"qDebug: 有配置文件，修改配置后激活:"<<"\n"<<
"qDebug: nmcli connection modify " + nameEditor->text() + " 802-1x.identity " + userEditor->text() + " 802-1x.password " + pwdEditor->text()
+ " 802-1x.eap " + eapCombox->currentData().toString() + " 802-1x.phase2-auth " + innerCombox->currentData().toString();
QString cmdStr_1 = "nmcli connection modify " + nameEditor->text() + " 802-1x.identity " + userEditor->text()
+ " 802-1x.eap " + eapCombox->currentData().toString() + " 802-1x.phase2-auth " + innerCombox->currentData().toString();
Utils::m_system(cmdStr_1.toUtf8().data());
@ -337,12 +352,13 @@ void WpaWifiDialog::slot_on_connectBtn_clicked() {
//获取网卡名称
KylinDBus mkylindbus;
QString wifi_card_name= mkylindbus.dbusWiFiCardName;
// qDebug()<<"qDebug: con-name & ssid: "<<nameEditor->text()<<"\n"<<
// "qDebug: wifi card name(ifname): "<<wifi_card_name<<"\n"<<
// "qDebug: 802-1x.eap: "<<eapCombox->currentData().toString()<<"\n"<<
// "qDebug: 802-1x.phase2-auth: "<<innerCombox->currentData().toString()<<"\n"<<
// "qDebug: 802-1x.identity: "<<userEditor->text()<<"\n"<<
// "qDebug: 802-1x.password: "<<pwdEditor->text();
qDebug()<<"qDebug: 无配置文件，使用如下配置新建配置文件:"<<"\n"<<
"qDebug: con-name & ssid: "<<nameEditor->text()<<"\n"<<
"qDebug: wifi card name(ifname): "<<wifi_card_name<<"\n"<<
"qDebug: 802-1x.eap: "<<eapCombox->currentData().toString()<<"\n"<<
"qDebug: 802-1x.phase2-auth: "<<innerCombox->currentData().toString()<<"\n"<<
"qDebug: 802-1x.identity: "<<userEditor->text()<<"\n"<<
"qDebug: 802-1x.password: "<<pwdEditor->text();
QString create_cmd;
create_cmd = "nmcli connection add con-name " + nameEditor->text() + " ifname "
+ wifi_card_name + " ipv4.method auto type wifi ssid " + nameEditor->text()
@ -394,6 +410,7 @@ void WpaWifiDialog::activateConnection() {
Utils::m_system(cmdStr_2.toUtf8().data());
syslog(LOG_DEBUG, "execute 'nmcli connection up' in function 'activateConnection' time out");
qDebug() << "qDebug: activate time out!";
qDebug() << "qDebug: 连接超时（12秒超时时间）";
});
//设置超时时间
timeout->start(12 * 1000);

31
wireless-security/dlghidewifi.cpp
View File

@ -23,8 +23,10 @@
#include "src/backthread.h"
#include "src/mainwindow.h"
#include "src/kylin-dbus-interface.h"
#include "src/wpawifidialog.h"
#include <unistd.h>
#include <QPoint>
#include <QStandardItemModel>
#include <QDir>
@ -150,8 +152,31 @@ void DlgHideWifi::changeDialog()
} else if(ui->cbxSecurity->currentIndex()==2) {
QApplication::setQuitOnLastWindowClosed(false);
this->hide();
DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, 0, mw);
connHidWifiEapPeap->show();
WpaWifiDialog * wpadlg = new WpaWifiDialog(mw, "");
QPoint pos = QCursor::pos();
QRect primaryGeometry;
for (QScreen *screen : qApp->screens()) {
if (screen->geometry().contains(pos)) {
primaryGeometry = screen->geometry();
}
}
if (primaryGeometry.isEmpty()) {
primaryGeometry = qApp->primaryScreen()->geometry();
}
wpadlg->move(primaryGeometry.width() / 2 - wpadlg->width() / 2, primaryGeometry.height() / 2 - wpadlg->height() / 2);
wpadlg->show();
connect(wpadlg, &WpaWifiDialog::conn_done, this, [ = ]() {
QString txt(tr("Conn Wifi Success"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
connect(wpadlg, &WpaWifiDialog::conn_failed, this, [ = ]() {
QString txt(tr("Confirm your Wi-Fi password or usable of wireless card"));
mw->objKyDBus->showDesktopNotify(txt);
mw->on_btnWifiList_clicked();
});
// DlgHideWifiEapPeap *connHidWifiEapPeap = new DlgHideWifiEapPeap(1, 0, mw);
// connHidWifiEapPeap->show();
} else if(ui->cbxSecurity->currentIndex()==3) {
QApplication::setQuitOnLastWindowClosed(false);
this->hide();
@ -219,7 +244,7 @@ void DlgHideWifi::changeWindow(){
ui->lbNetName->setEnabled(false);
ui->leNetName->setEnabled(false);
ui->lbSecurity->setEnabled(false);
ui->cbxSecurity->setEnabled(false);
ui->cbxSecurity->setEnabled(false);mw->on_btnWifiList_clicked();
ui->btnConnect->setEnabled(true);
}
}