新增 重启客户端 功能，修复 高dpi适配 不好看

Author: code4lala

DrCOM_JLU_Qt.pro

@@ -63,4 +63,11 @@ RESOURCES += \
 include(singleinstance/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 
-VERSION = 1.0.0.1
+VERSION = 1.0.0.2
+
+# 更新日志：
+# v 0.0.0.0 实现基本功能
+# v 1.0.0.1 修复适配高DPI时只窗口大小适配但字号不适配的bug
+# v 1.0.0.2 增加重启功能（能解决一些网络的错误
+#           调整字体为微软雅黑10号（就是win下正常的字体
+

dogcom.cpp

@@ -96,6 +96,10 @@ void DogCom::run()
                         break;
                     }
                 } else {
+                    // 这个 keepalive_try_counter 在这里貌似没什么用，因为Qt的QUdpSocket有一个state特别敏感
+                    // 明明网线啥的都没问题就说当前是UnconnectedStat状态然后还不给你自动重连
+                    // 所以外层循环先给判断了一下当前状态，如果这玩意报告说掉线了那就直接退出循环发包
+                    // 另： 目前测试还没有遇到过外层state正常然后里边keepalive_try_counter增加计数的情况
                     if (keepalive_try_counter > 3) {
                         // 清理操作
                         emit ReportOffline(OFF_TIMEOUT);

main.cpp

@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 #include <singleapplication.h>
 #include <QTranslator>
+#include <QDebug>
 
 int main(int argc, char *argv[])
 {
@@ -11,7 +12,8 @@ int main(int argc, char *argv[])
     SingleApplication::setQuitOnLastWindowClosed(false);
 
     QFont font=a.font();
-    font.setPointSize(12);
+    font.setPointSize(10);
+    font.setFamily("Microsoft YaHei");
     a.setFont(font);
 
     QTranslator translator;
@@ -20,6 +22,7 @@ int main(int argc, char *argv[])
 
     MainWindow w;
     QObject::connect(&a,&SingleApplication::instanceStarted,[&w](){
+        qDebug()<<"One instance had started. Its window will be shown by the next line of the source code.";
         w.ShowLoginWindow();
     });
     w.show();

mainwindow.cpp

@@ -14,6 +14,7 @@
 #include <QDesktopServices>
 #include <QUrl>
 #include <QCloseEvent>
+#include <QProcess>
 
 MainWindow::MainWindow(QWidget *parent) :
     QDialog(parent),
@@ -35,6 +36,10 @@ MainWindow::MainWindow(QWidget *parent) :
     }
     ui->comboBoxMAC->addItem(CUSTOM_MAC);
 
+    // 重启功能
+    restartAction=new QAction(tr("Re&start"),this);
+    connect(restartAction,&QAction::triggered,this,&MainWindow::RestartDrcom);
+
     // 创建托盘菜单和图标
     // 托盘菜单选项
     restoreAction=new QAction(tr("&Restore"),this);
@@ -49,6 +54,7 @@ MainWindow::MainWindow(QWidget *parent) :
     trayIconMenu->addSeparator();
     trayIconMenu->addAction(logOutAction);
     trayIconMenu->addSeparator();
+    trayIconMenu->addAction(restartAction);
     trayIconMenu->addAction(quitAction);
     // 新建托盘图标
     trayIcon=new QSystemTrayIcon(this);
@@ -67,6 +73,8 @@ MainWindow::MainWindow(QWidget *parent) :
     windowMenu->addAction(aboutAction);
     windowMenu->addAction(logOutAction);
     ui->menuBar->addMenu(windowMenu);
+    // 重启是个专门的菜单按钮
+    ui->menuBar->addAction(restartAction);
 
     // 读取配置文件
     LoadSettings();
@@ -116,6 +124,13 @@ void MainWindow::ShowLoginWindow(){
     }
 }
 
+void MainWindow::RestartDrcom()
+{
+    qDebug()<<"Restarting Drcom...";
+    qApp->quit();
+    QProcess::startDetached(qApp->arguments()[0],qApp->arguments());
+}
+
 void MainWindow::IconActivated(QSystemTrayIcon::ActivationReason reason)
 {
     switch (reason) {

mainwindow.h

@@ -39,6 +39,7 @@ public slots:
     void HandleLoggedIn();
     void HandleIpAddress(const QString &ip);
     void ShowLoginWindow();
+    void RestartDrcom();
 
 private:
     Ui::MainWindow *ui;
@@ -71,6 +72,7 @@ public slots:
     void AboutDrcom();
 
     // 托盘图标
+    QAction *restartAction;
     QAction *restoreAction;
     QAction *logOutAction;
     QAction *quitAction;

ts/DrCOM_zh_CN.qm

@@ -35,6 +35,7 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="116"/>
+        <location filename="../mainwindow.cpp" line="291"/>
         <source>Login</source>
         <translation>登录</translation>
     </message>
@@ -45,159 +46,164 @@
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="40"/>
+        <source>Re&amp;start</source>
+        <translation>重启客户端(&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="45"/>
         <source>&amp;Restore</source>
         <translation>显示窗口(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="42"/>
+        <location filename="../mainwindow.cpp" line="47"/>
         <source>&amp;Logout</source>
         <translation>注销(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="44"/>
+        <location filename="../mainwindow.cpp" line="49"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="64"/>
+        <location filename="../mainwindow.cpp" line="70"/>
         <source>&amp;About</source>
         <translation>关于(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="66"/>
+        <location filename="../mainwindow.cpp" line="72"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="210"/>
+        <location filename="../mainwindow.cpp" line="225"/>
         <source>Input can not be empty!</source>
         <translation>输入不能为空！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="214"/>
+        <location filename="../mainwindow.cpp" line="229"/>
         <source>Illegal MAC address!</source>
         <translation>物理地址输入有误！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="249"/>
+        <location filename="../mainwindow.cpp" line="264"/>
         <source>DrCOM JLU Qt -- online</source>
         <translation>吉大校园网 - 在线</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="253"/>
+        <location filename="../mainwindow.cpp" line="268"/>
         <source>DrCOM JLU Qt -- offline</source>
         <translation>吉大校园网 - 离线</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="279"/>
+        <location filename="../mainwindow.cpp" line="294"/>
         <source>Logout succeed</source>
         <translation>注销成功</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="283"/>
-        <location filename="../mainwindow.cpp" line="287"/>
-        <location filename="../mainwindow.cpp" line="291"/>
-        <location filename="../mainwindow.cpp" line="295"/>
-        <location filename="../mainwindow.cpp" line="299"/>
-        <location filename="../mainwindow.cpp" line="303"/>
-        <location filename="../mainwindow.cpp" line="307"/>
-        <location filename="../mainwindow.cpp" line="311"/>
-        <location filename="../mainwindow.cpp" line="315"/>
-        <location filename="../mainwindow.cpp" line="319"/>
-        <location filename="../mainwindow.cpp" line="323"/>
-        <location filename="../mainwindow.cpp" line="327"/>
-        <location filename="../mainwindow.cpp" line="331"/>
+        <location filename="../mainwindow.cpp" line="298"/>
+        <location filename="../mainwindow.cpp" line="302"/>
+        <location filename="../mainwindow.cpp" line="306"/>
+        <location filename="../mainwindow.cpp" line="310"/>
+        <location filename="../mainwindow.cpp" line="314"/>
+        <location filename="../mainwindow.cpp" line="318"/>
+        <location filename="../mainwindow.cpp" line="322"/>
+        <location filename="../mainwindow.cpp" line="326"/>
+        <location filename="../mainwindow.cpp" line="330"/>
+        <location filename="../mainwindow.cpp" line="334"/>
+        <location filename="../mainwindow.cpp" line="338"/>
+        <location filename="../mainwindow.cpp" line="342"/>
+        <location filename="../mainwindow.cpp" line="346"/>
         <source>Login failed</source>
         <translation>登录失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="283"/>
+        <location filename="../mainwindow.cpp" line="298"/>
         <source>Binding port failed. Please check if there are other clients occupying the port</source>
         <translation>绑定端口失败，请检查是否有其他客户端占用了端口</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="287"/>
+        <location filename="../mainwindow.cpp" line="302"/>
         <source>Challenge failed. Please check your connection:)</source>
         <translation>尝试连接服务器失败，请检查你的网络连接：）是不是wifi没连或者网线没插呀</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="291"/>
+        <location filename="../mainwindow.cpp" line="306"/>
         <source>Someone is using this account with wired</source>
         <translation>有人正在用这个账号</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="295"/>
+        <location filename="../mainwindow.cpp" line="310"/>
         <source>The server is busy, please log back in again</source>
         <translation>服务器繁忙，请稍后重试</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="299"/>
+        <location filename="../mainwindow.cpp" line="314"/>
         <source>Account and password not match</source>
         <translation>账号密码不匹配</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="303"/>
+        <location filename="../mainwindow.cpp" line="318"/>
         <source>The cumulative time or traffic for this account has exceeded the limit</source>
         <translation>该账户的网络时长或者流量超限了</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="307"/>
+        <location filename="../mainwindow.cpp" line="322"/>
         <source>This account is suspended</source>
         <translation>该账号被冻结</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="311"/>
+        <location filename="../mainwindow.cpp" line="326"/>
         <source>IP address does not match, this account can only be used in the specified IP address</source>
         <translation>IP地址不匹配，该账号只能用于指定的IP地址</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="315"/>
+        <location filename="../mainwindow.cpp" line="330"/>
         <source>MAC address does not match, this account can only be used in the specified IP and MAC address</source>
         <translation>物理地址不匹配，该账号只能用于指定的物理地址</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="319"/>
+        <location filename="../mainwindow.cpp" line="334"/>
         <source>This account has too many IP addresses</source>
         <translation>该账号的IP地址太多了</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="323"/>
+        <location filename="../mainwindow.cpp" line="338"/>
         <source>The client version is incorrect</source>
         <translation>登录客户端版本太老了，请更新您的客户端</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="327"/>
+        <location filename="../mainwindow.cpp" line="342"/>
         <source>This account can only be used on specified MAC and IP address</source>
         <translation>该账号只能用于指定的物理地址和IP地址</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="331"/>
+        <location filename="../mainwindow.cpp" line="346"/>
         <source>Your PC set up a static IP, please change to DHCP, and then re-login</source>
         <translation>你的电脑设置成了静态IP，请改为DHCP自动获取模式，然后重新登录</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="335"/>
-        <location filename="../mainwindow.cpp" line="340"/>
+        <location filename="../mainwindow.cpp" line="350"/>
+        <location filename="../mainwindow.cpp" line="355"/>
         <source>You have been offline</source>
         <translation>您已离线</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="335"/>
+        <location filename="../mainwindow.cpp" line="350"/>
         <source>Time out, please check your connection</source>
         <translation>连接超时，请检查您的网络连接：）是不是wifi没信号了</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="340"/>
+        <location filename="../mainwindow.cpp" line="355"/>
         <source>Unknow reason</source>
         <translation>未知错误</translation>
     </message>
     <message>
-        <location filename="../mainwindow.h" line="46"/>
+        <location filename="../mainwindow.h" line="47"/>
         <source>custom (format: 1A:2B:3C:4D:5E:6F case insensitive)</source>
         <translation>自定义（格式：1A:2B:3C:4D:5E:6F不区分大小写）</translation>
     </message>
     <message>
-        <location filename="../mainwindow.h" line="47"/>
+        <location filename="../mainwindow.h" line="48"/>
         <source>DrCOM JLU Qt version</source>
         <translation>吉大校园网客户端Qt版</translation>
     </message>