From dd4c67e144a97f84be6b65cecec378373d844755 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 21 Dec 2023 17:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E4=BA=8E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=B8=BB=E8=A6=81=E6=98=BE=E7=A4=BA=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 17863 -> 18184 bytes
 app/HGProductionTool/ProductionTool_zh_CN.ts |  79 ++++++++++++-------
 app/HGProductionTool/mainwindow.cpp          |  67 ++++++++++++++++
 app/HGProductionTool/mainwindow.h            |   2 +
 app/HGProductionTool/mainwindow.ui           |  12 +++
 5 files changed, 133 insertions(+), 27 deletions(-)

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 59cc1a58c3173a5b4f4864d2cb95e76f572d0c06..133c00290cc35c1fd50ec867e4bf227ba58d38e3 100644
GIT binary patch
delta 538
zcmX@!&Dhb$I6;KbV54XqBa<D&<f)8hQg-T$Q@9%#7?^b#_hjlYFj!hJKK~a2q_0kv
zWin&3Sui=2NsY;pe{wC5XRS7QE0a5CHOuOLMg|6p1(R8s=P}uQoV=9TPROQ&^`wpo
z1A~<*>wPX&1_m38$zPe(6~C})CjDe!5UPgIie_v^wxvK-{cOf}Qh;>QWLp+DChPvm
ztt{${M<=fZa_mwke`V2QvRyP;l~q$dC*>p1HAS3dH(xO@2<LE4ZU$=C7Ui6Cr+|UM
zZsO!rR-n6*CeLM6<PZM{G|_S~S5%-W&}7cZM_D7;FCXUvx>RSfESn^Iz^N%fcX3ZP
zWlLkSIxu-I+cGIzAKuOYaRvs%YrK07-(p~3y2ksz(UpP0`pD#1_QOne`zAkBm)&g7
zAz)$0z`!8GV8c+rU{~akt`q#7!HPkFL6yM}D5eh*<p3&RU;|<in*uwRqRg_?qOjB=
zD+N_U8~p;i$sJB|lVcn<tMLT;&AL%4@3%bmX<#{A4}U;WeoAR_NoIbYLP>sp&SXPp
z5m~OlV!u9!C2)ltiAnjTB|t+#D&!z4^ca8;u7Wc$xg;K}3Z!H+zoQwGB#ZyUgnYOP
QuH4kTQizhxhR)NN0Bxd=3;+NC

delta 297
zcmeC^V?5r?I6;JwW20ytBa_YZ$x|82glzd3r*JngFfi*fKK~cOz+mxmvMQ4qlXd&#
zSSB?livyEefjld#$$OdHIdxc8_cH>O1Wx8<p2uW;WAa*NJ0a_6){{CW3=Ec@toON8
z85pePC;w$uSL9&RO!~>dAXE*Z70uX;Y)gTv7PA@ONdeMjlU-Tdn5-60?qyMDEStO)
z$g%aA{Fg<K$)<C%E~}<^+09oB48l2_lbeCsv_(1R+$msSu&tO}$_jK(+2pmXitJH=
zra+TqC*Ng_oNUJ?F*%McmC5qT<fClMq->0NI|IZS7!0rR?m2vmfr057@Bc<u1_rAe
olUvyjGubYke1KDS@_ZSN&G{T07L$)T9N4VvWX80)&83M6026jtYybcN

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 63b6fa1..514a41a 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -509,17 +509,17 @@
         <translation>是</translation>
     </message>
     <message>
-        <location filename="dialog_userinput.ui" line="67"/>
+        <location filename="dialog_userinput.ui" line="70"/>
         <source>NO</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="dialog_userinput.ui" line="163"/>
+        <location filename="dialog_userinput.ui" line="166"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="dialog_userinput.ui" line="170"/>
+        <location filename="dialog_userinput.ui" line="173"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -1649,65 +1649,75 @@
         <translation>用户</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="55"/>
+        <location filename="mainwindow.ui" line="51"/>
+        <source>menu_about</source>
+        <translation>信息</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="62"/>
         <source>act_newDevice</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="60"/>
+        <location filename="mainwindow.ui" line="67"/>
         <source>act_manage</source>
         <translation>账户管理</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="65"/>
+        <location filename="mainwindow.ui" line="72"/>
         <source>act_changePwd</source>
         <translation>修改密码</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="70"/>
+        <location filename="mainwindow.ui" line="77"/>
         <source>act_export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="75"/>
+        <location filename="mainwindow.ui" line="82"/>
         <source>act_logOut</source>
         <translation>登出</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="78"/>
+        <location filename="mainwindow.ui" line="85"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="83"/>
+        <location filename="mainwindow.ui" line="90"/>
         <source>act_close</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="88"/>
+        <location filename="mainwindow.ui" line="95"/>
         <source>act_upload</source>
         <translation>上传配置文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="93"/>
+        <location filename="mainwindow.ui" line="100"/>
         <source>act_refreshDevice</source>
         <translation>刷新设备列表</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="98"/>
+        <location filename="mainwindow.ui" line="105"/>
         <source>act_openLog</source>
         <translation>查看日志</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="101"/>
+        <location filename="mainwindow.ui" line="108"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="106"/>
+        <location filename="mainwindow.ui" line="113"/>
         <source>act_setLogPath</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="118"/>
+        <source>act_about</source>
+        <translation>关于...</translation>
+    </message>
     <message>
         <source>Account login elsewhere</source>
         <translation type="vanished">账户在其他地方登录</translation>
@@ -1726,40 +1736,55 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="326"/>
-        <location filename="mainwindow.cpp" line="568"/>
-        <location filename="mainwindow.cpp" line="608"/>
-        <location filename="mainwindow.cpp" line="620"/>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="583"/>
+        <location filename="mainwindow.cpp" line="623"/>
+        <location filename="mainwindow.cpp" line="635"/>
+        <location filename="mainwindow.cpp" line="712"/>
         <source>tips</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="60"/>
+        <location filename="mainwindow.cpp" line="61"/>
         <source>production tool-burn station</source>
         <translation>华高生产工具-烧录工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="104"/>
+        <location filename="mainwindow.cpp" line="105"/>
         <source>production tool-init test station</source>
         <translation>华高生产工具-初检工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="106"/>
+        <location filename="mainwindow.cpp" line="107"/>
         <source>production tool-image test station</source>
         <translation>华高生产工具-图像测试工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="108"/>
+        <location filename="mainwindow.cpp" line="109"/>
         <source>production tool-pressure test station</source>
         <translation>华高生产工具-压力测试工位</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="326"/>
-        <location filename="mainwindow.cpp" line="608"/>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="623"/>
+        <location filename="mainwindow.cpp" line="635"/>
         <source>Is testing, do not close!</source>
         <translation>测试中，请勿关闭！</translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="805"/>
+        <source>about %1</source>
+        <translation>关于 %1</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="805"/>
+        <source>Production tool</source>
+        <translation>华高生产工具</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="807"/>
+        <source>&lt;p&gt;DriverVer: %1&lt;/p&gt;</source>
+        <translation>&lt;p&gt;版本号: %1&lt;/p&gt;</translation>
+    </message>
     <message>
         <source>warning</source>
         <translation type="vanished">警告</translation>
@@ -1778,8 +1803,8 @@
         <translation type="vanished">取消</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="568"/>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="583"/>
+        <location filename="mainwindow.cpp" line="712"/>
         <source>cannot create more table</source>
         <translation>不能创建更多项目</translation>
     </message>
diff --git a/app/HGProductionTool/mainwindow.cpp b/app/HGProductionTool/mainwindow.cpp
index 4c044c8..4a243ce 100644
--- a/app/HGProductionTool/mainwindow.cpp
+++ b/app/HGProductionTool/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include <QVBoxLayout>
 #include <QTimer>
 #include "base/HGBase.h"
+#include "huagao/brand.h"
 #include "HGUIGlobal.h"
 #include "app_cfg.h"
 #include "dialog_login.h"
@@ -741,3 +742,69 @@ void MainWindow::on_act_openLog_triggered()
     QString strFilePath = "file:///" + pathDir;
     QDesktopServices::openUrl(QUrl(strFilePath));
 }
+
+static bool isLeap(int year)
+{
+    if ((year % 400 == 0) || (year % 4 == 0 && year % 100 != 0))
+        return true;
+    return false;
+}
+
+static int getDays(int year, int month)
+{
+    if (2 == month)
+    {
+        if (isLeap(year))
+            return 29;
+        else
+            return 28;
+    }
+
+    if (4 == month || 6 == month || 9 == month || 11 == month)
+    {
+        return 30;
+    }
+
+    return 31;
+}
+
+static int getPatchVersion()
+{
+    const char *buildDate = __DATE__;
+    HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "buildDate: %s", buildDate);
+    QDate date = QLocale(QLocale::English).toDate(QString(buildDate).replace("  ", " 0"), "MMM dd yyyy");
+    int year = date.year();
+    int day = date.day();
+    int month = date.month();
+    HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "buildDate: %d %d %d", year, month, day);
+
+    int ret = year % 100;
+    ret *= 1000;
+
+    for (int i = 1; i < month; ++i)
+    {
+        ret += getDays(year, i);
+    }
+
+    ret += day;
+    return ret;
+}
+
+void MainWindow::on_act_about_triggered()
+{
+    int mainVersion = VERSION_MAIN;
+    int subVersion = VERSION_SUB;
+    int buildVersion = 10000;
+    int patchVersion = 0;
+
+    patchVersion = getPatchVersion();
+
+    HGChar version[32] = { 0 };
+    sprintf(version, "%d.%d.%d.%d", mainVersion, subVersion, buildVersion, patchVersion);
+
+    QString title = tr("about %1").arg(tr("Production tool"));
+    QString content;
+    content += tr("<p>DriverVer: %1</p>").arg(QString::fromLocal8Bit(version));
+
+    QMessageBox::about(this, title, content);
+}
diff --git a/app/HGProductionTool/mainwindow.h b/app/HGProductionTool/mainwindow.h
index 09f4298..5b82bb4 100644
--- a/app/HGProductionTool/mainwindow.h
+++ b/app/HGProductionTool/mainwindow.h
@@ -85,6 +85,8 @@ private slots:
 
     void on_act_openLog_triggered();
 
+    void on_act_about_triggered();
+
 private:
     QSplitter *m_top_splitter;
     QSplitter *m_bot_splitter;
diff --git a/app/HGProductionTool/mainwindow.ui b/app/HGProductionTool/mainwindow.ui
index 5bd2765..198b069 100644
--- a/app/HGProductionTool/mainwindow.ui
+++ b/app/HGProductionTool/mainwindow.ui
@@ -46,8 +46,15 @@
     <addaction name="act_logOut"/>
     <addaction name="act_openLog"/>
    </widget>
+   <widget class="QMenu" name="menumenu_about">
+    <property name="title">
+     <string>menu_about</string>
+    </property>
+    <addaction name="act_about"/>
+   </widget>
    <addaction name="menu_device"/>
    <addaction name="menu_user"/>
+   <addaction name="menumenu_about"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="act_newDevice">
@@ -106,6 +113,11 @@
     <string>act_setLogPath</string>
    </property>
   </action>
+  <action name="act_about">
+   <property name="text">
+    <string>act_about</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>