c-my/NEU-Monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

update tooltip

Browse Source
This commit is contained in:
c-my
2018-05-19 10:27:04 +08:00
parent 8e27b85fc4
commit 2ed45b4a86
4 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintray.cpp
+40 -21
View File
@@ -19,29 +19,34 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
netctrl->setUsername(settings.value("id",0).toByteArray());
netctrl->setPassword(settings.value("password", 0).toByteArray());
connect(&opWindow, OptionsWindow::saveSettings, this, updataUserInfo);
connect(&opWindow, OptionsWindow::saveSettings, this, updateUserInfo);
//连接controller状态改变信号
connect(netctrl, NetController::stateChanged, this, [this](NetController::Status state){
connect(netctrl, NetController::stateChanged, this, [this](NetController::State state){
switch (state) {
case NetController::Online:
if(!isMute)
if(!muteAction->isChecked())
showMessage(tr("网络已连接"),tr("校园网登陆成功"), this->icon(), msgDur);
setToolTip(tr("当前状态：连接"/*\n自动重连：") + (isAutoLogin? tr("开启"):tr("关闭")*/));
loginAction->setEnabled(true);
logoutAction->setEnabled(true);
break;
case NetController::Offline:
if(!isMute)
if(!muteAction->isChecked())
showMessage(tr("网络已断开"),tr("校园网已注销"), this->icon(), msgDur);
setToolTip(tr("当前状态：断开"/*\n自动重连：") + (isAutoLogin? tr("开启"):tr("关闭")*/));
loginAction->setEnabled(true);
logoutAction->setEnabled(true);
break;
case NetController::Disconnected:
if(!isMute)
if(!muteAction->isChecked())
showMessage(tr("网络已断开"),tr("无法连接至校园网"), this->icon(), msgDur);
setToolTip(tr("当前状态：无法连接"/*\n自动重连：") + (isAutoLogin? tr("开启"):tr("关闭")*/));
loginAction->setDisabled(true);
logoutAction->setDisabled(true);
break;
default:
break;
}
currentState = state;
showToolTip(state);
qDebug()<<currentState;
});
connect(netctrl, NetController::sendInfo, this, handleInfo);
@@ -68,6 +73,7 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
muteAction->setToolTip(tr("勿扰模式下不会发出通知"));
connect(loginAction, QAction::triggered, this,[this](){
netctrl->sendLogoutRequest();
netctrl->sendLoginRequest();
isForceLogout = false;
});
@@ -76,12 +82,12 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
isForceLogout = true;
});
connect(autoLogin, QAction::toggled, this, [this](bool set){
isAutoLogin = set;
settings.setValue("isAutoLogin", set);
isForceLogout = false;
showToolTip(currentState);
});
connect(muteAction, QAction::toggled, this, [this](bool set){
settings.setValue("isMute", set);
isMute = set;
});
connect(bootAction, QAction::toggled, this, [this](bool set){
settings.setValue("isOnBoot", set);
@@ -95,8 +101,6 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
bootAction->setChecked(settings.value("isOnBoot", false).toBool());
muteAction->setChecked(settings.value("isMute", false).toBool());
isAutoLogin = autoLogin->isChecked();
isMute = muteAction->isChecked();
settingsMenu->setTitle(tr("设置"));
settingsMenu->addAction(optionsAction);
@@ -126,14 +130,12 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
autoLoginTimer->setInterval(checkInterval);
autoLoginTimer->start();
connect(autoLoginTimer,QTimer::timeout, this, [this](){
netctrl->checkStatus(); //可只使用一个定时器
netctrl->checkState();
//Offline状态下自动重连
if(currentState == NetController::Offline && isAutoLogin && !isForceLogout){
netctrl->sendLogoutRequest(); //防止已经在线的情况登录失败
netctrl->sendLoginRequest();
if(currentState == NetController::Offline && autoLogin->isChecked() && !isForceLogout){
loginAction->trigger();
}
});
}
MainTray::~MainTray()
@@ -142,15 +144,32 @@ MainTray::~MainTray()
delete infoMenu;
}
void MainTray::showToolTip(NetController::State state)
{
switch (state) {
case NetController::Online:
setToolTip(tr("当前状态：连接\n自动重连：") + (autoLogin->isChecked()? tr("开启"):tr("关闭")));
break;
case NetController::Offline:
setToolTip(tr("当前状态：断开\n自动重连：") + (autoLogin->isChecked()? tr("开启"):tr("关闭"))+tr("\n双击以登陆"));
break;
case NetController::Disconnected:
setToolTip(tr("当前状态：无法连接\n自动重连：") + (autoLogin->isChecked()? tr("开启"):tr("关闭")));
break;
default:
break;
}
}
void MainTray::handleActivated(QSystemTrayIcon::ActivationReason reason)
{
switch (reason) {
case QSystemTrayIcon::DoubleClick:
loginAction->trigger();
break;
case QSystemTrayIcon::Trigger:
contextMenu()->popup(this->geometry().topRight());
break;
case QSystemTrayIcon::DoubleClick:
netctrl->sendLoginRequest();
break;
default:
break;
}
@@ -190,7 +209,7 @@ void MainTray::setAutoStart(bool set)
delete settings;
}
void MainTray::updataUserInfo(QByteArray id, QByteArray pass)
void MainTray::updateUserInfo(QByteArray id, QByteArray pass)
{
netctrl->setUsername(id);
netctrl->setPassword(pass);
maintray.h
+5 -4
View File
@@ -29,9 +29,10 @@ private:
QTimer *autoLoginTimer; //自动重连定时器
bool isForceLogout = false; //自动重连flag
bool isAutoLogin; //手动注销flag
bool isMute; //勿扰模式flag
NetController::Status currentState = NetController::Unknown; //当前状态
NetController::State currentState = NetController::Unknown; //当前状态
void showToolTip(NetController::State state);
void handleActivated(QSystemTrayIcon::ActivationReason reason);//处理左键单击、双击
void showOptions(); //显示选项窗口
void showAbout(); //显示关于窗口
@@ -46,7 +47,7 @@ signals:
void exit();
private slots:
void updataUserInfo(QByteArray id, QByteArray pass);
void updateUserInfo(QByteArray id, QByteArray pass);
void handleInfo(QString mb, QString sec, QString balance, QString ip);
};
netcontroller.cpp
+16 -13
View File
@@ -1,7 +1,7 @@
#include "netcontroller.h"
NetController::NetController(QByteArray id, QByteArray passwd, QObject *parent) : QObject(parent),
username(id), password(passwd), NEUStatus(Unknown), flag(Unknown),
username(id), password(passwd), NEUState(Unknown), lastState(Unknown),
manager(this)
{
checkParam.append("action=get_online_info");
@@ -21,22 +21,23 @@ NetController::NetController(QByteArray id, QByteArray passwd, QObject *parent)
connect(&manager, QNetworkAccessManager::finished, this, handleResponse);
}
void NetController::checkStatus()
void NetController::checkState()
{
sendCheckRequest();
if(NEUStatus==Offline&&flag!=Offline)
if(NEUState==Offline&&lastState!=Offline)
{
flag = Offline;
emit stateChanged(flag);
lastState = Offline;
emit stateChanged(lastState);
}
else if(NEUStatus == Online && flag != Online)
else if(NEUState == Online && lastState != Online)
{
flag = Online;
emit stateChanged(flag);
lastState = Online;
emit stateChanged(lastState);
}
else if(NEUStatus == Disconnected && flag != Disconnected)
else if(NEUState == Disconnected && lastState != Disconnected)
{
flag = Disconnected;
lastState = Disconnected;
emit stateChanged(lastState);
}
}
@@ -63,6 +64,7 @@ void NetController::sendLoginRequest()
loginParam.append(username);
manager.post(request, loginParam);
qDebug()<<"logout";
}
void NetController::sendLogoutRequest()
@@ -78,6 +80,7 @@ void NetController::sendLogoutRequest()
logoutParam.append(username);
manager.post(request, logoutParam);
qDebug()<<"logout";
}
void NetController::handleResponse(QNetworkReply *reply)
@@ -92,18 +95,18 @@ void NetController::handleResponse(QNetworkReply *reply)
QString status = reply->readAll();
if(status==offlineString)
{
NEUStatus = Offline;
NEUState = Offline;
}
else
{
NEUStatus = Online;
NEUState = Online;
QStringList infoList = status.split(',');
emit sendInfo(infoList[0], infoList[1], infoList[2], infoList[5]);
}
}
else
{
NEUStatus = Disconnected;
NEUState = Disconnected;
}
}
else if(url==loginUrl)
netcontroller.h
+5 -4
View File
@@ -6,13 +6,14 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QTimer>
#include <QDebug>
class NetController : public QObject
{
Q_OBJECT
public:
explicit NetController(QByteArray username, QByteArray password, QObject *parent = nullptr);
void checkStatus();
void checkState();
void sendCheckRequest();
void sendLoginRequest();
void sendLogoutRequest();
@@ -20,20 +21,20 @@ public:
void setUsername(QByteArray newName) { username = newName; }
void setPassword(QByteArray newPass) { password = newPass; }
enum Status {Unknown, Offline, Online, Disconnected};
enum State {Unknown, Offline, Online, Disconnected};
private:
QString checkUrl = "http://ipgw.neu.edu.cn/include/auth_action.php";
QString loginUrl = "http://ipgw.neu.edu.cn/srun_portal_pc.php?ac_id=1&";
QString offlineString = "not_online";
QByteArray checkParam, username, password;
Status NEUStatus = Unknown, flag = Unknown;
State NEUState = Unknown, lastState = Unknown;
QNetworkAccessManager manager;
QNetworkRequest request;
signals:
void stateChanged(Status newState);
void stateChanged(State newState);
void sendInfo(QString mb, QString sec, QString balance, QString ip);
public slots: