From 58c5c24471234b52bb5c68f025de14c3a345bd68 Mon Sep 17 00:00:00 2001
From: "bob.pan" <bob.pan@hzleaper.com>
Date: Thu, 23 Dec 2021 14:17:39 +0800
Subject: [PATCH] =?UTF-8?q?valueMain=E5=8A=A0=E5=85=A5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=90=AF=E5=8A=A8A/B=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tpvs17/valueMainUI/valueMainUI.aps          | Bin 84884 -> 85444 bytes
 tpvs17/valueMainUI/valueMainUI.cpp          |  13 ++++++++++++-
 tpvs17/valueMainUI/valueMainUI.rc           | Bin 5108 -> 5080 bytes
 tpvs17/valueMainUI/valueMainUI.vcxproj.user |   6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tpvs17/valueMainUI/valueMainUI.aps b/tpvs17/valueMainUI/valueMainUI.aps
index 9c008c2feb629dc0d2a3aad5cd0e06553d991d97..ed5b3ecedcd7fcd0758baf84dbc0b2ae44da15b7 100644
GIT binary patch
delta 872
zcmaJ<O=uHA6n<}avnEs}ib$!cKUlrkHrXa^tst80ZgwXdcV&02DWdV<p%?EWH4(fh
z?IB^60jnSgf?&NU7%$>MgkE~~WWDrKL`1yxP~UW|7y}N>y!qaI@4cCM-+i9=u$X8W
z@?8h{J%$>;TE+|lzg5N!DF^(fg#!r?gFmp*;|mTZ`Bxi14Xu-Jh^7q}p+t6bGmB&(
zmsXO(iou^*SmQ|>TTKB2n%yBIe?lZdpb?t2khyyGf?<Nz4ad4+9zdHQ&U8?pHvNEk
zZk@Sh53~YkISrV>>P+`sN<vkd{}dkWDV(MV&!K#D(vuPp$*&MaFS@!}g)u>6MzQ4i
zA>?D=o1s4gg%~i)^?Vb?V>ENd3}7POyB<u&JH6@!CY+3cZC202RJ`B5xp)V85E8u4
z!UNQo=Vd%ZW<55`WjvgrPorzqgRmGf9Y(euK)ybj1-_?(+4hSTcB0c1*oiLVcuJ-d
zkyMTraS;2Xw|G?giP2|t<x`M~veL2i$N3Zf!%OG9_p{FRjk(oEbXyw6{HrBt5;1>g
zO@6Z`<CW5sC~X`5>Qj+$*Kf4^7(jHhpO)@!Z}*sl@rB{=jvvH&L?G+npqeA_8hOLQ
z{e0HJol;WbD>eZkxu#H?LKpv^+JwCJDSvZ%<t01|U7TJeh@bmTq7T7@8m$c6_WTik
xwt|Y3Q`_%GRq=y!YP*q%j^kdnL+^T`@|P7nDBVc$l`Xr(zX^NI;kz9i_yysIszLw&

delta 389
zcmX>yn{~=`)(I}mM?4uP$1xdB-otu?@yg^zHhCbqkj<2n0SFj@kYVzDHd#iK$$#0D
znFN?7E3x}AhcSpxE@oHN$?HFqeXLtMXjZhZ|A7qe+}}0#>vR~V#A%fB`GMs+Pj-UD
z+h*JkpS*%yhtXj3Rd#bmMuTQv&h5OMjB!pfydX;$c<(O;(Y#RJ$+-*+ObiSY%Vimv
zCQkjWrvp@?0(6cCLpXyIkpBPwB*=9P1`I45Ky_g79|~AFCbKX{a3OJHm?uo$!sx@u
zG?|g<zRVg7vmhpb%$mN$n^A|A8))8|$p=~WS;c^?H<KCJ^rs8>GO{pPFi!Sk(_^~=
z)DXis-OHCzjwyg;avY}=8_2-{D<;RSm10){>alTSobK(-D9Qc_$Z2t7oLDal^gIK@
W9Cya)zr7h1ncsLYPM7y#lm!41-)wdO

diff --git a/tpvs17/valueMainUI/valueMainUI.cpp b/tpvs17/valueMainUI/valueMainUI.cpp
index 1d0a89f..4071184 100644
--- a/tpvs17/valueMainUI/valueMainUI.cpp
+++ b/tpvs17/valueMainUI/valueMainUI.cpp
@@ -29,7 +29,7 @@ valueMainUI::valueMainUI(QWidget *parent)
 	
 	setupTrayIcon();//后台任务栏初始化
 	setWindowIcon(QIcon(WINDOWICON));
-	setWindowTitle(tr("识别定位一体检测系统(v1.4.0 21.12.19)"));
+	setWindowTitle(tr("识别定位一体检测系统(v1.4.1 21.12.23)"));
 	lpGlobalData::instance();
 	lpConfig::instance()->loadConfig();
 
@@ -571,6 +571,11 @@ void valueMainUI::timerEvent(QTimerEvent *event)
 				ui.textEdit->clear();
 			ui.textEdit->append(tr("连接超时，尝试重新连接检测软件"));
 
+			QString strAppPath = lpConfig::instance()->appPathA;
+			if (!strAppPath.isEmpty())
+			{
+				onRunApp(lpConfig::instance()->appPathA);
+			}
 		}
 		if (lpConfig::instance()->doubleStation == true)
 		{
@@ -582,6 +587,12 @@ void valueMainUI::timerEvent(QTimerEvent *event)
 				if (ui.textEdit_2->toPlainText().size() > 10000)
 					ui.textEdit_2->clear();
 				ui.textEdit_2->append(tr("连接超时，尝试重新连接检测软件"));
+
+				QString strAppPath = lpConfig::instance()->appPathB;
+				if (!strAppPath.isEmpty())
+				{
+					onRunApp(lpConfig::instance()->appPathB);
+				}
 			}
 		}
 		{
diff --git a/tpvs17/valueMainUI/valueMainUI.rc b/tpvs17/valueMainUI/valueMainUI.rc
index bbabcd1f483a68c942c1d69c79926c879e0f7e6c..8629796ec14ec094f5b32b5c47363ab545681e8e 100644
GIT binary patch
delta 42
ucmeyOenWjj8waED<aQ22M&r#pIm($PyYbpg?%-Afa@TYJX9Q8au51860S*2D

delta 87
zcmcbi{zZL58waDo<aQ22MuW{eIm($PtMQ6R=rBx)(<tTh%j-XseXR3j=Yb6G+_o9_
k!zVj%2eBG3=rI^hPUI4w9Kb8K`3UzpMugDjb-Y?^060P%dH?_b

diff --git a/tpvs17/valueMainUI/valueMainUI.vcxproj.user b/tpvs17/valueMainUI/valueMainUI.vcxproj.user
index 3134de2..52d9b12 100644
--- a/tpvs17/valueMainUI/valueMainUI.vcxproj.user
+++ b/tpvs17/valueMainUI/valueMainUI.vcxproj.user
@@ -3,10 +3,16 @@
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
+    <LocalDebuggerCommand>$(SolutionDir)..\runner17\$(ProjectName)d.exe</LocalDebuggerCommand>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <QTDIR>C:\Qt\Qt5.9.4\5.9.4\msvc2017_64</QTDIR>
+    <LocalDebuggerCommand>$(SolutionDir)..\runner17\$(ProjectName).exe</LocalDebuggerCommand>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\runner17\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
   </PropertyGroup>
 </Project>
\ No newline at end of file