From e2ddfd3453eb02757bcc4f22a6272b7463256334 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 25 Jul 2023 14:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 13917 -> 14063 bytes
 app/HGProductionTool/ProductionTool_zh_CN.ts |  49 ++++++++++++-------
 app/HGProductionTool/form_maininterface.cpp  |   4 +-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 752ad328416371b989419264f847ca751eaf8602..123590ef1964223b1ff102e81dc043f46078ca98 100644
GIT binary patch
delta 994
zcmX|9ZERCz6n^f#eeXxxOYI^pTiUg@t6ewR(da->ghV&QV1+q9K%8N&l<B&Xt=)o7
zVJ<9@ZQy(*d}J&}kPto+NYMasMzVoy2~M;Uq61`3HkJ^pPK^PEM@{^3^W1aZ_j%5F
z&Ur7_{TzSy-tY+k<$&WH;WEH^if}pLiV;=-?gU`S0JEC^LuXfa*%G0%yUQ;0c7IeQ
zI<lMzi^A0~T<ii0o4|_cwsRD$yp2@0fxWXBxNkp{b$fyPXF}O|1_=GhQ$oa8s6si~
z2$baW^Fn}63pQ&FUbr(wWd~3-#Q@(u+$Xv=o)(&IeRQu~__ERf6cq^L*`t6dE{soC
zQamW!So<oVUK9sHTL7C={5C=+G@Cd!ngaw{#M@mVAh<(%V%8*35RhKU-wo&;QhWL<
z!1IfAX)uq5FjxA%k&Fj!N!OQC-sCnEg(=VbMXMGxG~I{-#S{FpxK#{1!{d@`{sh}l
zlcaVZWu2dHCEUS!qP>80iG6ZPq=K)p!PyTIDZqwJ)Ob*3SB*Zxg}hI4ZETYt7^$Jt
z=j758bpSgk#}dDh=|(wrh=$<%K~AYZQhU$JhljTVxgPm+A_L4Wkgq&aN%w1%`RhI>
zJ7<-}t2YCA*OaoGt<?T8CDybF5Q55<80B39%0Brd;C)Cr*wGL8zfry@O#;=nTT14$
zCA6N9^4;zC0n1EfQX2>Ir&RG6?Z0F|wOHcxQ?2F%HxO}-x@a2-7WSx-)}^%03AOj(
zDq80*tzwi4dw<e+TZ;I))-$r6_*s6$;1aU@yuq$zjH_0Z(ys3Co0MzgI<w~<FrKZ_
zNcU~y(8&PptKRsvo8po(zL4d6Jb9+QBW8Mgznadxo+TgCrlCVu0Hf73)OVbuR`NHQ
zT{~{pG9S`ZKHz&O@|#~?vw$pJ<$cVxwB7tyqKGE=u|BtdjF{#6suvr`z?i;fPXWal
zeeF4VFuD8nO&8uGBai8wle8y$NWa@!Mw%;UEJzaH`yThn^MnTel5Dp=X=!P%C5?H6
zgEWN4`DQs}2{<gntM?H#PG@tR{F>RvJCzyf-(|DI(DKIf9h`Y<)4RRPM5i3lpSCu;
zRT?a0`pl6;(%o1Wjjpe)kMRp`NBX)iDJXJ9G?{9sr$lc0DZgL#=lsKp{;_@PZXSFH
Z!wBtv4a>iLcd|Af<>6vaIu)Ey{|3^y548XQ

delta 877
zcmX9+X-HI27(MU3x$n*DWMre}EIPTSGgxU^K@p4=Sd<Ehm655F;ArHin9)iDX;yLz
z!pt9P3t3T3Sr$emEed7Dv`}g*g+bUNM5WdT{W|x%_gl_)&K>a#mL8mvd<sB15HU)a
z379_;t^llggjs;C08j;h(CYta?rL;p2w9B{CZVtKc)n<k;7nMUydSD(4M6ND*bK_H
z1c9aRrY^g{_AUY<OQCFR1EOC+IdTVZRPst;xi;1Z<$MK&&HRB7@661*O+;F-BHaZ{
znvd+&6M*p~a(!NEk$~KBB5A8b{wM>cKjUW68u>-2p4tsKRl>s@6%gMleENDG(0PPU
z6FERa245>$X2$&%#~K_!Qi!x9^fO=|kv3SG07Jdx^FIQju1GI>!)bV`^s2&5ZEE;g
z(W<ejs)mbz8O8jmxL=HW%!?#zaxtqZBtEue)?CyANH19DH4#W0X1$5CY2r!NuOlXj
zKK5E0O?aJmOV;gzJZqqkUITK<)lz_+mfht)NRTwy-9cMLpO7on?}^AX`Aq*|AS_D0
zRUV+xt@6-<9Lg_L(l*|tt@kO5*6abo-zu&zJBg@MaaZjCge0ZTP50I-O1s=eeI}IC
z^*v<BO66XPmz<pXM+w}>AljqK%dtZwYlvFBKo&a}tBpnv9SYQwlWKsNbLxc$s8L+F
zx@CSoS!2><y`w?)4h`R3NzSHeng=#fT^a9IS%pqMsG<yQ-pUkOu9lC}-BNC5rm!;Y
z-FyuZfVQtI9?+C&pV%mN^zdcO5*7JI*EXQ1Z}nYwXUkXO{Y}@`F$8FXb$#8JXs_qI
zftfTj^_oB{X=veRDazKbTR)F}!g2n9S(jea|0++QO=}IQJs+qt-H^9>GZ8N^tUorL
z;((#}ejO=!!m#7<HnRSfVc%!+#pE#j-RUA_p9jtJQoTKwr^s`Jx!fb0f~$;MeI-Qt
zGGQ-?q2-5VhcT|n*uSQoN<H-EJj%c6qj|Fu<Y$ULLba+s`zH^vmoVlk^A>SiOss#K
UJyY~cF<!yn9vd$EWyi4kACB<urvLx|

diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 5664db6..2d55dc1 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -748,11 +748,6 @@
         <source>START</source>
         <translation>开始测试(Enter)</translation>
     </message>
-    <message>
-        <location filename="form_maininterface.ui" line="147"/>
-        <source>Enter</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="form_maininterface.ui" line="161"/>
         <source>PrePage</source>
@@ -803,6 +798,11 @@
         <source>DevInfo:</source>
         <translation>设备信息：</translation>
     </message>
+    <message>
+        <location filename="form_maininterface.ui" line="147"/>
+        <source>Return</source>
+        <translation></translation>
+    </message>
     <message>
         <location filename="form_maininterface.ui" line="154"/>
         <source>SHOWIMG</source>
@@ -824,7 +824,7 @@
     <message>
         <location filename="form_maininterface.cpp" line="65"/>
         <source>Device type:</source>
-        <translation>设备型号：</translation>
+        <translation>设备类型：</translation>
     </message>
     <message>
         <location filename="form_maininterface.cpp" line="65"/>
@@ -913,6 +913,19 @@
         <translation>休眠时间：%1分钟
 	</translation>
     </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="267"/>
+        <source>sleep time:%1
+	</source>
+        <translation>休眠时间：%1
+	</translation>
+    </message>
+    <message>
+        <location filename="form_maininterface.cpp" line="267"/>
+        <location filename="form_maininterface.cpp" line="595"/>
+        <source>Not sleeping</source>
+        <translation>不休眠</translation>
+    </message>
     <message>
         <location filename="form_maininterface.cpp" line="268"/>
         <source>speed mode:%1PPM
@@ -926,36 +939,36 @@
         <translation>设备型号：%1</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="706"/>
-        <location filename="form_maininterface.cpp" line="791"/>
+        <location filename="form_maininterface.cpp" line="726"/>
+        <location filename="form_maininterface.cpp" line="797"/>
         <source>device history scan count:</source>
         <translation>设备历史扫描张数：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="763"/>
-        <location filename="form_maininterface.cpp" line="768"/>
-        <location filename="form_maininterface.cpp" line="773"/>
-        <location filename="form_maininterface.cpp" line="778"/>
+        <location filename="form_maininterface.cpp" line="654"/>
+        <location filename="form_maininterface.cpp" line="658"/>
+        <location filename="form_maininterface.cpp" line="662"/>
+        <location filename="form_maininterface.cpp" line="666"/>
         <source>Prompt</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="763"/>
+        <location filename="form_maininterface.cpp" line="654"/>
         <source>No paper</source>
         <translation>无纸</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="768"/>
+        <location filename="form_maininterface.cpp" line="658"/>
         <source>Device is sleeping</source>
         <translation>设备处于休眠模式</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="773"/>
+        <location filename="form_maininterface.cpp" line="662"/>
         <source>Counting mode</source>
         <translation>设备处于计数模式</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="778"/>
+        <location filename="form_maininterface.cpp" line="666"/>
         <source>Other error</source>
         <translation>其他错误</translation>
     </message>
@@ -1020,8 +1033,8 @@
         <translation type="vanished">Pid：</translation>
     </message>
     <message>
-        <location filename="form_maininterface.cpp" line="700"/>
-        <location filename="form_maininterface.cpp" line="785"/>
+        <location filename="form_maininterface.cpp" line="720"/>
+        <location filename="form_maininterface.cpp" line="791"/>
         <source>device roller count:</source>
         <translation>设备滚轴张数：</translation>
     </message>
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 97edaf7..2e41dbf 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -264,7 +264,7 @@ void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, i
     QString str = (tr("please verify the configuration of the device:") + "\n\t");
     str.append(tr("vid:%1\n\t").arg(QString::fromStdString(buf)));
     str.append(tr("pid:%1\n\t").arg(QString::fromStdString(buf2)));
-    str.append(tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime)));
+    str.append(sleepTime > 0 ? tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime)) : tr("sleep time:%1\n\t").arg(tr("Not sleeping")));
     str.append(tr("speed mode:%1PPM\n\t").arg(QString::number(speedMode)));
     str.append(tr("device serial number:%1\n\t").arg(devSn));
     str.append(tr("device firmware number:%1\n\t").arg(devFw));
@@ -592,7 +592,7 @@ QString Form_mainInterface::getSleepTime()
     sane_io_control(m_handle, IO_CTRL_CODE_GET_POWER_LEVEL, &sleepTime, &len2);
 
     if (sleepTime > 99999 || sleepTime == -1)
-        return QString::number(0);
+        return tr("Not sleeping");
 
     return QString::number(sleepTime / 60) + tr(" minute");
 }