From 0890ca46fddb78d87d5414f8a5d41d0c1a393c7a Mon Sep 17 00:00:00 2001 From: CHN-STUDENT Date: Sat, 19 Jan 2019 01:12:36 +0800 Subject: [PATCH] V2.0.2 --- .gitignore | 2 + srun-3k-ui/Resouces/png/radius_back.png | Bin 0 -> 17957 bytes srun-3k-ui/Resouces/png/radius_front.png | Bin 0 -> 17956 bytes srun-3k-ui/mainwindow.cpp | 182 ++++++++++++++++++-- srun-3k-ui/mainwindow.h | 7 +- srun-3k-ui/mainwindow.qrc | 6 + srun-3k-ui/mainwindow.ui | 201 +++++++++++++---------- srun-3k-ui/radiusprogressbar.cpp | 35 ++++ srun-3k-ui/radiusprogressbar.h | 21 +++ srun-3k-ui/srun-3k-ui.pro | 6 +- srun-3k-ui/storage.cpp | 29 ++++ srun-3k-ui/storage.h | 4 + srun-3k-ui/version.h | 2 +- 13 files changed, 392 insertions(+), 103 deletions(-) create mode 100644 .gitignore create mode 100644 srun-3k-ui/Resouces/png/radius_back.png create mode 100644 srun-3k-ui/Resouces/png/radius_front.png create mode 100644 srun-3k-ui/radiusprogressbar.cpp create mode 100644 srun-3k-ui/radiusprogressbar.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e31cfb2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +*.user diff --git a/srun-3k-ui/Resouces/png/radius_back.png b/srun-3k-ui/Resouces/png/radius_back.png new file mode 100644 index 0000000000000000000000000000000000000000..c8aa2d287848005d5d50724747b8fb6a8d34ede8 GIT binary patch literal 17957 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 NRu(JF&zO2_{U1PSjv@d6 literal 0 HcmV?d00001 diff --git a/srun-3k-ui/mainwindow.cpp b/srun-3k-ui/mainwindow.cpp index 14628c0..5c16ae6 100644 --- a/srun-3k-ui/mainwindow.cpp +++ b/srun-3k-ui/mainwindow.cpp @@ -2,11 +2,14 @@ #include "ui_mainwindow.h" //#include "QDebug" +MainWindow *singleton; + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); + singleton = this; setWindowFlags(Qt::FramelessWindowHint); setAttribute(Qt::WA_TranslucentBackground); mLocation = this->geometry(); @@ -51,6 +54,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->usernameLineEdit->setAttribute(Qt::WA_InputMethodEnabled, false); ui->passwordLineEdit->setAttribute(Qt::WA_InputMethodEnabled, false); ui->stackedWidget->setCurrentIndex(2); + ui->stackedWidgetBottom->setCurrentIndex(0); AboutButton->hide();//在获取公告前隐藏这两个按钮 AdvancedButton->hide(); n=new network(); @@ -91,7 +95,6 @@ MainWindow::MainWindow(QWidget *parent) : ui->autoLoginCheckBox->setCheckState(Qt::Checked); } } - } void MainWindow::showMessage(void) @@ -434,14 +437,13 @@ void MainWindow::on_checkUpdateButton_clicked() { ui->enterButtonInAboutPage->setEnabled(false); ui->checkUpdateButton->setEnabled(false); - QStringList list; ui->statusBar->setText("检查更新中..."); setStyleSheet("QWidget#centralWidget{color:black;background:white;border:1px solid #3498DB;}"); ui->widgetBottom->setStyleSheet("QLabel#statusBar{color:white;padding:5px 0px 5px;}" "QWidget#widgetBottom{background:#3498DB;}"); if(isOnline) { - int c=checkVersion(list,n); + int c=checkVersion(updateInfo,n); if(c!=-1) { ui->statusBar->setText("检查更新中...成功！"); @@ -475,12 +477,10 @@ void MainWindow::on_checkUpdateButton_clicked() QString v; v.sprintf("%s",version); QString ehaut=ui->eHautIco->text(); - QString url=QString("%2").arg(list.at(4)).arg(ehaut); - s=s+" "+v+" 。最新版本 "+list.at(0)+" ,发布于 "+list.at(1)+" 。

<=====================
    点击左边蜗牛下载最新版！

备用地址："+QString("%2").arg(list.at(4)).arg("点我下载！"); - - ui->eHautIco->setText(url); - ui->eHautIco->setOpenExternalLinks(true); - ui->aboutBox->setHtml(s); + QString url=QString("%2").arg(updateInfo.at(4)).arg(ehaut); + s=s+" "+v+" 。最新版本 "+updateInfo.at(0)+" ,发布于 "+updateInfo.at(1)+" 。

<=====================
    点击左边蜗牛下载最新版！

备用地址："+QString("%2").arg(updateInfo.at(4)).arg("点我下载！"); + ui->aboutBox->setText(s); + ui->eHautIco->setEnabled(true); } } else @@ -737,8 +737,7 @@ void MainWindow::on_loginButton_clicked(bool showmode) } ui->stackedWidget->setCurrentIndex(3); getUserInfo(false); - QStringList list; - int c=checkVersion(list,n); + int c=checkVersion(updateInfo,n); if(c==1) { @@ -749,20 +748,18 @@ void MainWindow::on_loginButton_clicked(bool showmode) list[3] sha1 list[4] url */ - QString s="当前版本"; QString v; v.sprintf("%s",version); QString ehaut=ui->eHautIco->text(); - QString url=QString("%2").arg(list.at(4)).arg(ehaut); - s=s+" "+v+" 。最新版本 "+list.at(0)+" ,发布于 "+list.at(1)+" 。

<=====================
    点击左边蜗牛下载最新版！

备用地址："+QString("%2").arg(list.at(4)).arg("点我下载！"); + s=s+" "+v+" 。最新版本 "+updateInfo.at(0)+" ,发布于 "+updateInfo.at(1)+" 。

<=====================
    点击左边蜗牛下载最新版！

备用地址："+QString("%2").arg(updateInfo.at(4)).arg("点我下载！"); AboutButton->setStyleSheet("QPushButton {border-image: url(:/titleButtons/about_alert);}" "QPushButton:hover {border-image: url(:/titleButtons/about_alert_hover);}" "QPushButton:pressed {border-image: url(:/titleButtons/about_alert_pressed);}"); - ui->eHautIco->setText(url); - ui->eHautIco->setOpenExternalLinks(true); + ui->aboutBox->setHtml(s); + ui->eHautIco->setEnabled(true); } } @@ -814,3 +811,156 @@ void MainWindow::on_loginButton_clicked(bool showmode) } ui->loginButton->setEnabled(true); } + +void MainWindow::on_eHautIco_clicked() +{ + ui->eHautIco->setEnabled(false); + ui->enterButtonInAboutPage->setEnabled(false); + ui->checkUpdateButton->setEnabled(false); + setStyleSheet("QWidget#centralWidget{color:black;background:white;border:1px solid #1aad18;}"); + ui->widgetBottom->setStyleSheet("QLabel#statusBar{color:white;padding:5px 0px 5px;}" + "QWidget#widgetBottom{background:#1aad18;}"); + info="检查是否存在老版本更新包..."; + ui->aboutBox->setHtml(info); + bool isUpdateProgramExist=s->checkUpdateProgramisExist("update.exe"); + if(isUpdateProgramExist) + { + info=info+"删除成功！
"; + } + else + { + info=info+"无需删除！
"; + } + info=info+"下载更新包中..."; + ui->aboutBox->setHtml(info); + ui->stackedWidgetBottom->setCurrentIndex(1); + ui->downloadBar->setMaximum(100); + ui->downloadBar->setValue(0); + QString downloadUrl=updateInfo.at(4); + static int retry=1; + static bool isTrue=false; + QString path=QCoreApplication::applicationDirPath()+"/update.exe"; + FILE* fp = nullptr; + while(retry<=3) + { + if(retry>1) + { + Sleep(5000); + info=info+"尝试第 "+QString::number(retry)+" 次下载:
"; + info=info+"下载更新包中..."; + ui->aboutBox->setHtml(info); + } + CURL* curl = curl_easy_init(); + if(!(curl)) + {//如果非正常初始化 + exit(-1); + } + fp=fopen(path.toStdString().c_str(), "wb"); + rewind(fp); + curl_easy_setopt(curl, CURLOPT_URL,downloadUrl.toStdString().c_str()); + //设置接收数据的回调 + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,false);//设定为不验证证书和HOST + curl_easy_setopt(curl,CURLOPT_SSL_VERIFYHOST,false); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, storage::saveDataTodisk); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); + // 设置重定向的最大次数 + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5); + // 设置301、302跳转跟随location + //curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); + //设置进度回调函数 + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, MainWindow::progressUpdate); + //设置超时 + curl_easy_setopt(curl,CURLOPT_CONNECTTIMEOUT,3L); + //开始执行请求 + CURLcode retcCode = curl_easy_perform(curl); + if(retcCode!=CURLE_OK) + { + info=info+"下载失败！
"; + ui->aboutBox->setHtml(info); + retry++; + } + else + { + info=info+"下载成功！
"; + isTrue=true; + ui->aboutBox->setHtml(info); + break; + } + curl_easy_cleanup(curl); + } + if(fp!=nullptr) + fclose(fp); + if(isTrue) + { + info=info+"校验下载值中..."; + ui->aboutBox->setHtml(info); + QString sha1; + sha1.prepend(s->fileChecksum("update.exe")); + //qDebug()<"; + ui->aboutBox->setHtml(info); + ui->downloadBar->setMaximum(100); + ui->downloadBar->setValue(100); + info=info+"5s后尝试启动自动更新程序！
"; + ui->aboutBox->setHtml(info); + QTimer::singleShot(5000, this, SLOT(startUpdate())); + } + else + { + info=info+"校验失败！
"; + ui->statusBar->setText("自动更新失败！请重试！"); + setStyleSheet("QWidget#centralWidget{color:black;background:white;border:1px solid #E05D6F;}"); + ui->widgetBottom->setStyleSheet("QLabel#statusBar{color:white;padding:5px 0px 5px;}" + "QWidget#widgetBottom{background:#E05D6F;}"); + ui->stackedWidgetBottom->setCurrentIndex(0); + info=info+"正在删除更新包..."; + ui->aboutBox->setHtml(info); + bool isDelete=s->checkUpdateProgramisExist("update.exe"); + if(isDelete) + { + info=info+"删除成功！
请您重试自动更新！"; + ui->aboutBox->setHtml(info); + } + else + { + info=info+"不可预知的错误！
"; + ui->aboutBox->setHtml(info); + } + } + } + + ui->enterButtonInAboutPage->setEnabled(true); + ui->checkUpdateButton->setEnabled(true); + ui->eHautIco->setEnabled(true); +} + +void MainWindow::startUpdate() +{ + QString path=QCoreApplication::applicationDirPath()+"/update.exe"; + QProcess process(this); + bool isStart=process.startDetached(path);\ + if(isStart) + qApp->exit(0); + else + { + info=info+"调用失败请重试！
"; + ui->statusBar->setText("自动更新失败！请重试！"); + setStyleSheet("QWidget#centralWidget{color:black;background:white;border:1px solid #E05D6F;}"); + ui->widgetBottom->setStyleSheet("QLabel#statusBar{color:white;padding:5px 0px 5px;}" + "QWidget#widgetBottom{background:#E05D6F;}"); + ui->stackedWidgetBottom->setCurrentIndex(0); + } +} + +int MainWindow::progressUpdate(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) +{ + if ( dltotal > -0.1 && dltotal < 0.1 ) + return 0; + int nPos = (int) ( (dlnow/dltotal)*90.0 ); + //ui->downloadBar->setValue(nPos); + singleton->ui->downloadBar->setValue(nPos); + return 0; +} diff --git a/srun-3k-ui/mainwindow.h b/srun-3k-ui/mainwindow.h index 61dd9ba..6f6c127 100644 --- a/srun-3k-ui/mainwindow.h +++ b/srun-3k-ui/mainwindow.h @@ -12,6 +12,7 @@ #include #include #include +#include #include "network.h" #include "version.h" #include "storage.h" @@ -61,7 +62,9 @@ private slots: void on_autoStartCheckBox_clicked(); void on_autoLoginCheckBox_clicked(); void on_loginButton_clicked(bool); - + void on_eHautIco_clicked(); + static int progressUpdate(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); + void startUpdate(); private: bool mDrag; bool isUserinfoExists=false; @@ -87,6 +90,8 @@ private slots: QTimer *meTimer=nullptr; QString logoutname; bool set=false; + QStringList updateInfo; + QString info; }; #endif // MAINWINDOW_H diff --git a/srun-3k-ui/mainwindow.qrc b/srun-3k-ui/mainwindow.qrc index 9c4af86..6af80ae 100644 --- a/srun-3k-ui/mainwindow.qrc +++ b/srun-3k-ui/mainwindow.qrc @@ -20,7 +20,13 @@ Resouces/titleButtons/setting.png Resouces/titleButtons/setting_horver.png Resouces/titleButtons/setting_press.png + + + Resouces/png/radius_back.png + Resouces/png/radius_front.png + + Resouces/Ico/new.png Resouces/Ico/myappSysTrayIcon.png diff --git a/srun-3k-ui/mainwindow.ui b/srun-3k-ui/mainwindow.ui index 257786f..8bd56f5 100644 --- a/srun-3k-ui/mainwindow.ui +++ b/srun-3k-ui/mainwindow.ui @@ -167,7 +167,7 @@ QLabel#labelTitle{ - 4 + 5 @@ -1466,25 +1466,6 @@ background:#0b4a73; - - - - 30 - 30 - 180 - 131 - - - - - 微软雅黑 - 10 - - - - <html><head/><body><p align="center"><img src=":/Ico/R"/></p><p align="center"><br/></p></body></html> - - @@ -1518,7 +1499,7 @@ background:#0b4a73; p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'微软雅黑'; font-size:9pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-size:16pt; background-color:#ffffff;">E-HAUT </span></p> -<p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" background-color:#ffffff;">Easy Internet In HAUT V2.0.1</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" background-color:#ffffff;">Easy Internet In HAUT V2.0.2</span></p> <p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" background-color:#ffffff;">-------------------------------------------------</span></p> <p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" background-color:#ffffff;">新河南工业大学校园登陆器 Qt 版</span></p> <p align="center" style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Arial,Helvetica'; font-size:13px; color:#666666; background-color:#ffffff;">©2019 E-haut Team</span></p> @@ -1570,6 +1551,9 @@ background:#0b4a73; + + true + 360 @@ -1606,12 +1590,39 @@ background:#0b4a73; 检查更新 + + + false + + + + 60 + 40 + 101 + 101 + + + + QPushButton{ +background-image: url(:/Ico/R); +background-color:transparent; + + +} + + + + + + true + + - + 0 @@ -1625,76 +1636,100 @@ background:#0b4a73; - -QLabel#statusBar{color:white;padding:5px 0px 5px;} + QLabel#statusBar{color:white;padding:5px 0px 5px;} QWidget#widgetBottom{background:#3498DB;} - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - - 微软雅黑 - 12 - - - - 欢迎使用校园网登陆器！ - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 225 + 17 + + + + + + + + true + + + + 微软雅黑 + 12 + + + + 欢迎使用校园网登陆器！ + + + + + + + Qt::Horizontal + + + + 225 + 17 + + + + + + + + + + + 0 + 0 + 640 + 60 + + + + + + + RadiusProgressBar + QProgressBar +
radiusprogressbar.h
+ 1 + + diff --git a/srun-3k-ui/radiusprogressbar.cpp b/srun-3k-ui/radiusprogressbar.cpp new file mode 100644 index 0000000..135b048 --- /dev/null +++ b/srun-3k-ui/radiusprogressbar.cpp @@ -0,0 +1,35 @@ +#include "radiusprogressbar.h" +#include + +RadiusProgressBar::RadiusProgressBar(QWidget *parent) : QProgressBar(parent) +{ + setMinimum(0); + setMaximum(100); + setValue(0); +} + +void RadiusProgressBar::paintEvent(QPaintEvent *) +{ + QPainter p(this); + QRect rect = QRect(0, 0, width(), height()); + QRect textRect = QRect(0, 0, width(), height()); + + const double k = (double)(value() - minimum()) / (maximum()-minimum()); + int x = (int)(rect.width() * k); + QRect fillRect = rect.adjusted(0, 0, x-rect.width(), 0); + + QString valueStr = QString("正在更新中...%1 %").arg(QString::number(value())); + QPixmap buttomMap = QPixmap(":/png/radius_back"); + QPixmap fillMap = QPixmap(":/png/radius_front"); + + //画进度条 + p.drawPixmap(rect, buttomMap); + p.drawPixmap(fillRect, fillMap, fillRect); + + //画文字 + QFont f = QFont("Microsoft YaHei",12, QFont::Normal); + p.setFont(f); + p.setPen(QColor("#ffffff")); + p.drawText(textRect, Qt::AlignCenter, valueStr); +} + diff --git a/srun-3k-ui/radiusprogressbar.h b/srun-3k-ui/radiusprogressbar.h new file mode 100644 index 0000000..2aef59f --- /dev/null +++ b/srun-3k-ui/radiusprogressbar.h @@ -0,0 +1,21 @@ +#ifndef RADIUSPROGRESSBAR_H +#define RADIUSPROGRESSBAR_H + +#include + +class RadiusProgressBar : public QProgressBar +{ + Q_OBJECT +public: + explicit RadiusProgressBar(QWidget *parent = nullptr); + + +signals: + +public slots: + +protected: + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; +}; + +#endif // RADIUSPROGRESSBAR_H diff --git a/srun-3k-ui/srun-3k-ui.pro b/srun-3k-ui/srun-3k-ui.pro index 957ed37..cefa045 100644 --- a/srun-3k-ui/srun-3k-ui.pro +++ b/srun-3k-ui/srun-3k-ui.pro @@ -28,13 +28,15 @@ SOURCES += \ mainwindow.cpp \ version.cpp \ network.cpp \ - storage.cpp + storage.cpp \ + radiusprogressbar.cpp HEADERS += \ mainwindow.h \ version.h \ network.h \ - storage.h + storage.h \ + radiusprogressbar.h FORMS += \ mainwindow.ui diff --git a/srun-3k-ui/storage.cpp b/srun-3k-ui/storage.cpp index d7bc2ae..f2645b4 100644 --- a/srun-3k-ui/storage.cpp +++ b/srun-3k-ui/storage.cpp @@ -198,3 +198,32 @@ QByteArray storage::passwordEncrypy(QString passwd) } return PASSWD_ENCRYPT; } + +QByteArray storage::fileChecksum(const QString &fileName) +{ + //检查文件的SHA1值：https://stackoverflow.com/questions/16383392/how-to-get-the-sha-1-md5-checksum-of-a-file-with-qt/16383433 + QString path=QCoreApplication::applicationDirPath()+"/"+fileName; + //qDebug()< #include #include +#include class storage @@ -19,6 +20,9 @@ class storage QByteArray passwordEncrypy(QString password); bool saveUserConfigToFile(QStringList list); bool saveserverConfigToFile(QStringList list); + QByteArray fileChecksum(const QString &fileName); + bool checkUpdateProgramisExist(const QString &fileName); + static size_t saveDataTodisk(void *pBuffer, size_t nSize, size_t nMemByte, FILE *fp); }; diff --git a/srun-3k-ui/version.h b/srun-3k-ui/version.h index 5eef655..ead90e8 100644 --- a/srun-3k-ui/version.h +++ b/srun-3k-ui/version.h @@ -2,7 +2,7 @@ #define VERSION_H #include "network.h" -static char * version="V2.0.1"; +static char * version="V2.0.2"; static char * checkUpdateURL="https://pc.ehaut.cn/download/checkupdate.json"; int checkVersion(QStringList &list,network *n);