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

fix

Browse Source
This commit is contained in:
c-my
2018-06-30 11:39:17 +08:00
parent 555c40e8a4
commit e226c7eeea
7 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintray.cpp
+101 -112
View File
@@ -1,50 +1,49 @@
#include "maintray.h"
MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): QSystemTrayIcon(parent),
//初始化menu
menu(new QMenu()),
infoMenu(new QMenu()),
settingsMenu(new QMenu()),
//初始化settings
settings(QSettings::IniFormat, QSettings::UserScope, "Cai.MY", "NEU-Monitor"),
//初始化optionswindow
opWindow(settings.value("id", "").toByteArray(), settings.value("password", "").toByteArray(), settings.value("total traffic", 60).toInt()),
logFileName("NEU_Monitor.log"),
logFile(logFileName, this),
user(username),
passwd(password)
MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent) : QSystemTrayIcon(parent),
//初始化menu
menu(new QMenu()),
infoMenu(new QMenu()),
settingsMenu(new QMenu()),
//初始化settings
settings(QSettings::IniFormat, QSettings::UserScope, "Cai.MY", "NEU-Monitor"),
//初始化optionswindow
opWindow(settings.value("id", "").toByteArray(), settings.value("password", "").toByteArray(), settings.value("total traffic", 60).toInt()),
logFileName("NEU_Monitor.log"),
logFile(logFileName, this),
user(username),
passwd(password)
{
openLogFile();
opWindow.hide();
setIcon(QIcon(olIconPath));
netctrl = new NetController(user,passwd,this);
netctrl = new NetController(user, passwd, this);
connect(netctrl, NetController::sendLog, this, writeLog);
user = settings.value("id",0).toByteArray();
user = settings.value("id", 0).toByteArray();
passwd = settings.value("password", 0).toByteArray();
totalTraffic = settings.value("total traffic", 60).toInt();
netctrl->setUsername(user);
netctrl->setPassword(passwd);
netctrl->setTotalTraffic(totalTraffic);
writeLog(tr("Load username[")+user+tr("] traffic[")+QString::number(totalTraffic) + tr("]."));
writeLog(tr("Load username[") + user + tr("] traffic[") + QString::number(totalTraffic) + tr("]."));
connect(&opWindow, OptionsWindow::saveSettings, this, updateUserInfo);
//连接controller状态改变信号
connect(netctrl, NetController::sendState, this, handleState);
connect(this, QSystemTrayIcon::messageClicked, this, [this](){
if(currentState == NetController::WrongPass)
connect(this, QSystemTrayIcon::messageClicked, this, [this]() {
if (currentState == NetController::WrongPass)
opWindow.show();
});
connect(netctrl, NetController::sendInfo, this, handleInfo);
//菜单Action
loginAction = new QAction(tr("连接网络"),this);
logoutAction = new QAction(tr("断开网络"),this);
loginAction = new QAction(tr("连接网络"), this);
logoutAction = new QAction(tr("断开网络"), this);
autoLogin = new QAction(tr("自动登陆"), this);
optionsAction = new QAction(tr("选项"), this);
bootAction = new QAction(tr("开机启动"), this);
@@ -52,14 +51,14 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
aboutAction = new QAction(tr("关于"), this);
quitAction = new QAction(tr("退出"), this);
mbAction = new QAction(tr("已用流量: "),this);
timeAction = new QAction(tr("已用时长: "),this);
balanceAction = new QAction(tr("账户余额: "),this);
ipAction = new QAction(tr("IP地址: "),this);
mbAction = new QAction(tr("已用流量: "), this);
timeAction = new QAction(tr("已用时长: "), this);
balanceAction = new QAction(tr("账户余额: "), this);
ipAction = new QAction(tr("IP地址: "), this);
connect(ipAction, QAction::triggered, this, [this](){
connect(ipAction, QAction::triggered, this, [this]() {
QStringList ipList = ipAction->text().split('\t');
if(ipList.size()>1)
if (ipList.size() > 1)
{
QClipboard *clipBoard = QApplication::clipboard();
clipBoard->setText(ipList.at(1));
@@ -72,7 +71,7 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
muteAction->setToolTip(tr("勿扰模式下不会发出通知"));
connect(loginAction, QAction::triggered, this,[this](){
connect(loginAction, QAction::triggered, this, [this]() {
writeLog(tr("Login triggered."));
isForceLogin = true;
netctrl->sendLogoutRequest();
@@ -80,37 +79,36 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
netctrl->sendLoginRequest();
isForceLogout = false;
});
connect(logoutAction, QAction::triggered, this,[this](){
connect(logoutAction, QAction::triggered, this, [this]() {
writeLog(tr("Logout triggered."));
netctrl->sendLogoutRequest();
isForceLogout = true;
});
connect(autoLogin, QAction::toggled, this, [this](bool set){
connect(autoLogin, QAction::toggled, this, [this](bool set) {
writeLog(tr("Autologin turn ") + (set ? tr("[on].") : tr("[off].")));
settings.setValue("isAutoLogin", set);
isForceLogout = false;
showToolTip(currentState);
});
connect(muteAction, QAction::toggled, this, [this](bool set){
connect(muteAction, QAction::toggled, this, [this](bool set) {
writeLog(tr("Mute mode turn ") + (set ? tr("[on].") : tr("[off].")));
settings.setValue("isMute", set);
});
connect(bootAction, QAction::toggled, this, [this](bool set){
connect(bootAction, QAction::toggled, this, [this](bool set) {
writeLog(tr("Boot with system turn ") + (set ? tr("[on].") : tr("[off].")));
settings.setValue("isOnBoot", set);
setAutoStart(set);
});
connect(optionsAction, QAction::triggered, this, [this](){showOptions();});
connect(optionsAction, QAction::triggered, this, [this]() { showOptions(); });
connect(aboutAction, QAction::triggered, this, showAbout);
connect(quitAction, QAction::triggered, this,[this](){
connect(quitAction, QAction::triggered, this, [this]() {
writeLog(tr("Exit.\n\n"));
emit exit();});
emit exit(); });
autoLogin->setChecked(settings.value("isAutoLogin", true).toBool());
bootAction->setChecked(settings.value("isOnBoot", false).toBool());
muteAction->setChecked(settings.value("isMute", false).toBool());
settingsMenu->setTitle(tr("设置"));
settingsMenu->addAction(optionsAction);
settingsMenu->addAction(muteAction);
@@ -133,17 +131,17 @@ MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): Q
setContextMenu(menu);
connect(this, activated, this, handleActivated);
connect(this, exit, this, [this](){setVisible(false);});
connect(this, exit, this, [this]() { setVisible(false); });
autoLoginTimer = new QTimer(this);
autoLoginTimer->setInterval(checkInterval);
autoLoginTimer->start();
connect(autoLoginTimer,QTimer::timeout, this, [this](){
connect(autoLoginTimer, QTimer::timeout, this, [this]() {
netctrl->checkState();
});
showToolTip(currentState);
if(settings.value("id").isNull()||settings.value("password").isNull())
if (settings.value("id").isNull() || settings.value("password").isNull())
{
opWindow.show();
}
@@ -160,7 +158,8 @@ MainTray::~MainTray()
void MainTray::showToolTip(NetController::State state)
{
QString tooltipString;
switch (state) {
switch (state)
{
case NetController::Online:
tooltipString += tr("当前状态：在线");
break;
@@ -183,9 +182,11 @@ void MainTray::showToolTip(NetController::State state)
break;
}
tooltipString += tr("\n自动登陆：");
tooltipString += autoLogin->isChecked()? tr("开启"):tr("关闭");
if(state == NetController::Online){
switch (trafficstate) {
tooltipString += autoLogin->isChecked() ? tr("开启") : tr("关闭");
if (state == NetController::Online)
{
switch (trafficstate)
{
case Over:
tooltipString += tr("\n流量已超额");
break;
@@ -201,10 +202,11 @@ void MainTray::showToolTip(NetController::State state)
void MainTray::handleActivated(QSystemTrayIcon::ActivationReason reason)
{
switch (reason) {
switch (reason)
{
case QSystemTrayIcon::DoubleClick:
writeLog(tr("Double click TrayIcon."));
if(currentState == NetController::Offline)
if (currentState == NetController::Offline)
loginAction->trigger();
break;
case QSystemTrayIcon::Trigger:
@@ -228,8 +230,8 @@ void MainTray::showAbout()
aboutWindow->setStandardButtons(QMessageBox::Ok);
aboutWindow->setText(tr("<h1>NEU-Monitor</h1>"
"<h3>Version: 1.4.1</h3>"
"<p>Based on Qt 5.11.0 (MinGW 5.3.0, 32bit)</p>"
"Source Code: <a href=\"https://github.com/c-my/NEU-Monitor\">https://github.com/c-my/NEU-Monitor</a><br/>"
"<p>Based on Qt 5.11.0 (MinGW 5.3.0, 32bit)</p>"
"Source Code: <a href=\"https://github.com/c-my/NEU-Monitor\">https://github.com/c-my/NEU-Monitor</a><br/>"
"Email: <address>"
"<a href=\"mailto:cmy1113@yeah.net?subject=Neu-Monitor-v1.4.1 Feedback\">Cai.MY</a>"
"</address>"));
@@ -243,7 +245,7 @@ void MainTray::setAutoStart(bool set)
#ifdef Q_OS_WIN32
QString application_name = QApplication::applicationName();
QSettings *settings = new QSettings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat);
if(set)
if (set)
{
QString application_path = QApplication::applicationFilePath();
settings->setValue(application_name, application_path.replace("/", "\\"));
@@ -262,18 +264,12 @@ void MainTray::setAutoStart(bool set)
#endif
}
void MainTray::clearCount()
{
onlineCount = 0;
offlineCount = 0;
disCount = 0;
}
void MainTray::openLogFile()
{
if(!logFile.open(QIODevice::Append | QIODevice::Text)){
if (!logFile.open(QIODevice::Append | QIODevice::Text))
{
showMessage(tr("警告"), tr("日志文件打开失败"));
// return;
// return;
}
writeLog(tr("\n=================================================="), false);
writeLog(tr("Open logfile [") + logFile.fileName() + tr("] successfully."));
@@ -299,60 +295,51 @@ void MainTray::updateUserInfo(QByteArray id, QByteArray pass, int traffic)
void MainTray::handleState(NetController::State state)
{
if(state!=currentState){
switch (state) {
if (state != currentState)
{
switch (state)
{
case NetController::Online:
if(onlineCount++ > 0)
{
clearCount();
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
isForceLogin = false;
setIcon(QIcon(olIconPath));
if(!muteAction->isChecked())
showMessage(tr("网络已连接"),tr("校园网登陆成功"), this->icon(), msgDur);
currentState = state;
}
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
isForceLogin = false;
setIcon(QIcon(olIconPath));
if (!muteAction->isChecked())
showMessage(tr("网络已连接"), tr("校园网登陆成功"), this->icon(), msgDur);
currentState = state;
break;
case NetController::Offline:
if(offlineCount++ > 0)
if (currentState == NetController::WrongPass || currentState == NetController::Owed)
return;
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
setIcon(QIcon(offIconPath));
if (!muteAction->isChecked())
showMessage(tr("网络已断开"), tr("校园网已注销"), this->icon(), msgDur);
//自动登陆
if (autoLogin->isChecked() && !isForceLogout)
{
clearCount();
if(currentState == NetController::WrongPass || currentState == NetController::Owed)
return;
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
setIcon(QIcon(offIconPath));
if(!muteAction->isChecked())
showMessage(tr("网络已断开"),tr("校园网已注销"), this->icon(), msgDur);
//自动登陆
if(autoLogin->isChecked() && !isForceLogout){
loginAction->trigger();
}
currentState = state;
loginAction->trigger();
}
currentState = state;
break;
case NetController::Disconnected:
if(disCount++ > 0)
{
clearCount();
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
setIcon(QIcon(offIconPath));
if(!muteAction->isChecked())
showMessage(tr("网络已断开"),tr("无法连接至校园网"), this->icon(), msgDur);
currentState = state;
}
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
setIcon(QIcon(offIconPath));
if (!muteAction->isChecked())
showMessage(tr("网络已断开"), tr("无法连接至校园网"), this->icon(), msgDur);
currentState = state;
break;
case NetController::WrongPass:
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
setIcon(QIcon(offIconPath));
if(!muteAction->isChecked())
showMessage(tr("登陆失败"),tr("密码错误"), this->icon(), msgDur);
if (!muteAction->isChecked())
showMessage(tr("登陆失败"), tr("密码错误"), this->icon(), msgDur);
currentState = state;
break;
case NetController::Owed:
setIcon(QIcon(offIconPath));
writeLog(tr("Old state: [") + QString::number(currentState) + tr("]; New state: [") + QString::number(state) + tr("]."));
if(!muteAction->isChecked())
showMessage(tr("登陆失败"),tr("已欠费"), this->icon(), msgDur);
if (!muteAction->isChecked())
showMessage(tr("登陆失败"), tr("已欠费"), this->icon(), msgDur);
currentState = state;
break;
default:
@@ -365,27 +352,30 @@ void MainTray::handleState(NetController::State state)
void MainTray::handleInfo(QString byte, QString sec, QString balance, QString ip)
{
QString mbString = QString::number(byte.toDouble()/1048576.0, 'f', 2);
QString gbString = QString::number(byte.toDouble()/1000000000.0, 'f', 2);
QString leftoverString = QString::number(totalTraffic - byte.toDouble()/1000000000.0, 'f',2 );
QString mbString = QString::number(byte.toDouble() / 1048576.0, 'f', 2);
QString gbString = QString::number(byte.toDouble() / 1000000000.0, 'f', 2);
QString leftoverString = QString::number(totalTraffic - byte.toDouble() / 1000000000.0, 'f', 2);
double totalSec = sec.toDouble();
double hour = (totalSec/3600);
int min = ((totalSec-hour*3600)/60);
QString second = QString::number(totalSec-hour*3600-min*60);
double hour = (totalSec / 3600);
int min = ((totalSec - hour * 3600) / 60);
QString second = QString::number(totalSec - hour * 3600 - min * 60);
mbAction->setText(tr("已用流量:\t") + mbString + tr(" M"));
timeAction->setText(tr("已用时长:\t") + QString::number(hour, 'f', 2) + tr(" 小时")/*+ ":" +QString::number(min) + ":" + second*/);
timeAction->setText(tr("已用时长:\t") + QString::number(hour, 'f', 2) + tr(" 小时") /*+ ":" +QString::number(min) + ":" + second*/);
balanceAction->setText(tr("账户余额:\t") + balance + tr(" 元"));
ipAction->setText(tr("IP地址:\t") + ip);
if(!hasWarned && totalTraffic <= 0){
if (!hasWarned && totalTraffic <= 0)
{
hasWarned = true;
if(byte.toDouble() / 1048576.0 > totalTraffic * 1024){//流量已超
if (byte.toDouble() / 1048576.0 > totalTraffic * 1024)
{ //流量已超
trafficstate = Over;
if(!muteAction->isChecked())
if (!muteAction->isChecked())
showMessage(tr("流量警告"), tr("本月流量已超"), QSystemTrayIcon::Warning);
}
else if(byte.toDouble() / 1048576.0 + 5000 > totalTraffic * 1024){//流量将超
else if (byte.toDouble() / 1048576.0 + 5000 > totalTraffic * 1024)
{ //流量将超
trafficstate = Nearly;
if(!muteAction->isChecked())
if (!muteAction->isChecked())
showMessage(tr("流量预警"), tr("剩余流量：") + leftoverString + tr("G"));
}
showToolTip(currentState);
@@ -394,13 +384,12 @@ void MainTray::handleInfo(QString byte, QString sec, QString balance, QString ip
void MainTray::writeLog(QString content, bool timeStamp)
{
if(!logFile.isOpen())
logFile.open(QIODevice::Append | QIODevice::Text);
if(timeStamp)
if (!logFile.isOpen())
logFile.open(QIODevice::Append | QIODevice::Text);
if (timeStamp)
logFile.write(QDateTime::currentDateTime().toString("[yyyy.MM.dd hh:mm:ss] ").toUtf8());
logFile.write(content.toUtf8());
logFile.write(tr("\n").toUtf8());
// qDebug()<<"Write log"<<content;
// qDebug()<<"Write log"<<content;
logFile.close();
}