From bedb400add77359f3da488258170640d4c36f236 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 9 Jul 2024 14:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=85=B7=E5=A2=9E=E5=8A=A0=E5=A5=A5=E9=B8=BD?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm | Bin 4548 -> 4399 bytes
 app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts | 105 +++++++++++++----------
 app/HGPdtJsonTool/mainwindow.cpp         |  22 ++++-
 3 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.qm
index 1e643d9232327acdac313f17ba2ee6d6fee9c5de..a135cd2a1af6acc8fdc32ad4bcb584f1c20aa27d 100644
GIT binary patch
delta 653
zcmYL_ZAepL6vxlq-F@z>_fAT}pj?~aB+0w9CA}gALb{+)RHTM(LszrKUMOX41%rr{
zwVuK<4Wc&%hr}`{3jDA>IEtDiMKL1%GQy~j3n@Ag*oTKd=XuWme}3o5S|=@6R>qqE
zxFY}t9~d7v07wbAO}7AqR^YZs0Adt4=K$(`;L@ndJs`<B)I5-hT7a@kz`tYx)F-ex
z^c%App}6-B0DFvSA0EcM-Ary51HkMwn2UP=q$NXYj>r6>;o0X!0E_g7)$1-`<5|?3
zsAH&40eCB`*MGqJZEC7UoMk_SdeHSS^{pnJ;hfQPh&;sgd%`%X>7PoyT>9@l`-5z)
zMijN31pIdqNgxqn0g+AQ`OH2<Ss=xZPDFo9md?ac3%u><3+yMn{{9`V>f{FweMDcU
zuq|H=AP0q+D)hl?(RTG9&Q(fulvx{B!jhkiBa|RzCpKV?TgrJ7*gq+o2eY_AOy1#Y
z#Jn}i`ZVUKNu}*#1n*mwk<mPI+)y4Z;vBhNnbs@NuPd(xPvaM*%3{;2adTc3RrJdR
zRdnT$XGD!!n~`Iqnz)t#8;G--QNqDWv(`V~hsIiMyf2A^?AlMyR|E_Cuqb4@4c%Pk
zJ3qu=C<xF34WNTVzyb&!V@reXpuYq&y)Gu`e(6AFUeb)zqIJ+I%}y&#bt{aAy|=gj
zH*`gMywq-Ls}g$G9d~<Ax=$>>Degcp=yiw9p02Q$mdh11W-3(@7r8tZI=|c{1-+qw
PKN9xQFQ!%WRJrpHT^pY8

delta 747
zcmZ9IUr1A77{=eT?fl)&IWwd&qZ+Q*Dytzzv7)j;WZ}$_8l)SVLr*y;Z9>{|1nWWu
zqxA)m)`jfKr9>?+lp+fw9F;^#(I2G5H6+3=O|sr8g?4dx&d2wApXYhMJB4HBEBWCg
z0Q4yUl>(ZZG5mJ}y{i|1djzyy0O03<F7E^oj6e^fiuZsS*a9Gx0{c`AAn%3Ufkm7v
zfrE)zyf;GD*$1FLL)G^505E<k?Vtdt11eMYD1g?lichlWTdNwG`UX&_b*ODc-3Z=B
zy@C1~br^s(t8F{q;dvoGWXb!b{t#%wsdXB6pM>ok@fi#Corshn{E;3EUBbXQ#@~{_
zA{^7sB>{91)M?ZqCY;=g#lp;k@k%T*&1CD`xIi<ra50P;XRV%xs3WZH?Hi1E%yyo9
zk3QYpzE_*DaE2S-h;#6Qw_dG5pDEtfeit9i%DbLmF6pK8cCkWeVfwLGNEjQ~fo29F
z-59}ev(^+F!)3a(`&}hy9@oB1;w!T$-L^qAm-XZmWvEW*p2yB(6fJg*7U0Uo5-%aG
ztCV<G8ml~$LgrGeP%K5Rp{sCM)(DuQ%g7yHe0aVk_xqxlIwQ|F&SHy<g4PWwm#Tp_
zaBW{bRdq8J<s2FSgP-P5`?*$<C+4T_v)3uIz{%t?AF=4F7mrW)jzuR|!TK^^eUsOu
zv<BL|r-O=rX^`+j)n?AMzIk*NyQZvF2`cq1|IsP8AZynCF8EhKIN=QhO-j(~vy&g9
zk(`x0g~H$D6`Z)l1%mat++}n^D%y}ELl<hIE68QXU`LzRo?DFkl(rM6yoU_S^W?MM
F`3D7$#Jm6i

diff --git a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
index fb69185..09f884a 100644
--- a/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
+++ b/app/HGPdtJsonTool/HGPdtJsonTool_zh_CN.ts
@@ -148,20 +148,17 @@
         <translation>是否锁定：</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="270"/>
         <source>Test item:</source>
         <oldsource>Test Id:</oldsource>
-        <translation>测试项：</translation>
+        <translation type="vanished">测试项：</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="293"/>
         <source>Test station:</source>
-        <translation>测试工位：</translation>
+        <translation type="vanished">测试工位：</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="316"/>
         <source>Test type:</source>
-        <translation>测试类型：</translation>
+        <translation type="vanished">测试类型：</translation>
     </message>
     <message>
         <source>Add</source>
@@ -172,7 +169,7 @@
         <translation type="vanished">测试内容：</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="359"/>
+        <location filename="mainwindow.ui" line="290"/>
         <source>Device type:</source>
         <translation>设备类型：</translation>
     </message>
@@ -185,49 +182,49 @@
         <translation type="vanished">删除勾选项</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="385"/>
+        <location filename="mainwindow.ui" line="316"/>
         <source>SelectAll</source>
         <translation>全选</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="175"/>
         <source>huagao</source>
         <translation>华高</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="175"/>
+        <location filename="mainwindow.cpp" line="199"/>
         <source>microtek</source>
         <translation>中晶</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="195"/>
+        <location filename="mainwindow.cpp" line="219"/>
         <source>hanvon</source>
         <translation>汉王</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="215"/>
+        <location filename="mainwindow.cpp" line="239"/>
         <source>lanxum</source>
         <translation>立思辰</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="235"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>deli</source>
         <translation>得力</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="251"/>
+        <location filename="mainwindow.cpp" line="275"/>
         <source>unis</source>
         <translation>紫光</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="31"/>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="287"/>
         <source>cumtenn</source>
         <translation>沧田</translation>
     </message>
@@ -235,6 +232,12 @@
         <source>nuetral</source>
         <translation type="vanished">中性</translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="31"/>
+        <location filename="mainwindow.cpp" line="303"/>
+        <source>auge</source>
+        <translation>奥鸽</translation>
+    </message>
     <message>
         <location filename="mainwindow.cpp" line="34"/>
         <source>G100-3399</source>
@@ -255,6 +258,11 @@
         <source>G400-3399</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="34"/>
+        <source>G306</source>
+        <translation>G306</translation>
+    </message>
     <message>
         <location filename="mainwindow.cpp" line="44"/>
         <source>Not dormant</source>
@@ -296,7 +304,7 @@
         <translation>4小时</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="48"/>
+        <location filename="mainwindow.cpp" line="47"/>
         <source>Lock</source>
         <translation>锁定</translation>
     </message>
@@ -353,35 +361,30 @@
         <translation type="vanished">硬盘大小：%1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="47"/>
+        <location filename="mainwindow.cpp" line="46"/>
         <source>Not locked</source>
         <translation>不锁定</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>Burn</source>
-        <translation>烧录工位</translation>
+        <translation type="vanished">烧录工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>Initial inspection</source>
-        <translation>初检工位</translation>
+        <translation type="vanished">初检工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
         <source>Image inspection</source>
-        <translation>图像测试工位</translation>
+        <translation type="vanished">图像测试工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
-        <location filename="mainwindow.cpp" line="134"/>
-        <location filename="mainwindow.cpp" line="357"/>
+        <location filename="mainwindow.cpp" line="130"/>
+        <location filename="mainwindow.cpp" line="411"/>
         <source>automatic testing</source>
         <translation>自动测试</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="53"/>
-        <location filename="mainwindow.cpp" line="134"/>
+        <location filename="mainwindow.cpp" line="130"/>
         <source>Manual testing</source>
         <translation>人工测试</translation>
     </message>
@@ -390,7 +393,7 @@
         <translation type="vanished">例如：0xFFFF</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>selected</source>
         <translation>选择</translation>
     </message>
@@ -399,41 +402,51 @@
         <translation type="vanished">序号</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Test ID</source>
         <translation>测试ID</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Test items</source>
         <translation>测试项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Test station</source>
         <translation>测试工位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Test type</source>
         <translation>测试类型</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="64"/>
         <source>Test content</source>
         <translation>测试内容</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="291"/>
-        <location filename="mainwindow.cpp" line="298"/>
-        <location filename="mainwindow.cpp" line="305"/>
-        <location filename="mainwindow.cpp" line="378"/>
-        <location filename="mainwindow.cpp" line="382"/>
+        <location filename="mainwindow.cpp" line="64"/>
+        <source>resolution</source>
+        <translation>分辨率</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="64"/>
+        <source>correct date</source>
+        <translation>校正数据</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="335"/>
+        <location filename="mainwindow.cpp" line="342"/>
+        <location filename="mainwindow.cpp" line="349"/>
+        <location filename="mainwindow.cpp" line="433"/>
+        <location filename="mainwindow.cpp" line="437"/>
         <source>Prompt</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="291"/>
+        <location filename="mainwindow.cpp" line="335"/>
         <source>Please add test item</source>
         <translation>请添加测试项</translation>
     </message>
@@ -442,32 +455,32 @@
         <translation type="vanished">请添加设备基本信息</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="305"/>
+        <location filename="mainwindow.cpp" line="349"/>
         <source>Pid is empty, device not supported</source>
         <translation>Pid为空，设备不支持</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="365"/>
+        <location filename="mainwindow.cpp" line="420"/>
         <source>Select profile path</source>
         <translation>选择配置文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="365"/>
+        <location filename="mainwindow.cpp" line="420"/>
         <source>Json(*.json)</source>
         <translation>配置文件(*.json)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="378"/>
+        <location filename="mainwindow.cpp" line="433"/>
         <source>Successfully generated</source>
         <translation>生成成功</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="382"/>
+        <location filename="mainwindow.cpp" line="437"/>
         <source>Generate filed</source>
         <translation>生成失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="298"/>
+        <location filename="mainwindow.cpp" line="342"/>
         <source>Incomplete information, please check</source>
         <translation>信息不完整，请检查</translation>
     </message>
diff --git a/app/HGPdtJsonTool/mainwindow.cpp b/app/HGPdtJsonTool/mainwindow.cpp
index 610da12..2998962 100644
--- a/app/HGPdtJsonTool/mainwindow.cpp
+++ b/app/HGPdtJsonTool/mainwindow.cpp
@@ -28,7 +28,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::initDeviceInfo()
 {
-    QStringList oemName{ tr("huagao"), tr("microtek"), tr("hanvon"), tr("lanxum"), tr("deli"), tr("unis"), tr("cumtenn") };
+    QStringList oemName{ tr("huagao"), tr("microtek"), tr("hanvon"), tr("lanxum"), tr("deli"), tr("unis"), tr("cumtenn"), tr("auge") };
     ui->comboBox_OEM->addItems(oemName);
 
     QStringList deviceType{ tr("G100-3399"), tr("G200-3399"), tr("G300-3288"), tr("G306"), tr("G400-3399") };
@@ -300,6 +300,26 @@ QPair<QString, QString> MainWindow::getVidPid(QString oem, QString deviceType)
             pid = "0";
         }
     }
+    else if (oem == tr("auge"))
+    {
+        vid = "0x3072";
+        if (deviceType == "G100-3399")
+        {
+            pid = "0x0130";
+        }
+        else if (deviceType == "G200-3399")
+        {
+            pid = "0x0230";
+        }
+        else if (deviceType == "G300-3288")
+        {
+            pid = "0x0330";
+        }
+        else if (deviceType == "G400-3399")
+        {
+            pid = "0x0430";
+        }
+    }
 
     QPair<QString, QString> vidPid;
     vidPid.first = vid;