From 19afa3d19bb632a4baaf029b86967dcafb1e7b84 Mon Sep 17 00:00:00 2001
From: YiLin <482244139@qq.com>
Date: Sat, 14 Mar 2026 17:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/actions.cpython-312.pyc           | Bin 10833 -> 11718 bytes
 __pycache__/check_station.cpython-312.pyc     | Bin 9521 -> 11178 bytes
 actions.py                                    |  10 ++++++++
 check_station.py                              |  22 ++++++++++++++++++
 ck/device_b.py                                |   6 +++--
 .../__pycache__/driver_utils.cpython-312.pyc  | Bin 41631 -> 41631 bytes
 globals/driver_utils.py                       |   2 +-
 7 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/__pycache__/actions.cpython-312.pyc b/__pycache__/actions.cpython-312.pyc
index 2dec72762debf74e0b2b0b455670d1b7151f4bcb..a725faebbf013c4c5bf1b399cf14432ef4c5d8ed 100644
GIT binary patch
delta 1597
zcmZ`&ZA@EL7(TbXZSSSurBJ#;KSq(3twkb};T#OZT;xNdGPlX(TH6cj?AqqG9m4>_
zxnv7E<2+2<41>fGAtnN%^CKjii_tk|yksPh27k>~*dKA@*Jh&UP$)O1o*(ad`#w*e
z=e_TFJKOwYi)u!x%mV1V>G;ZDRyC<oQL>Mu01N;c+9(^mN97V-@NsPp9HuB$q%TTi
zGCoJMpiP%8T1Q`@v}Pg&AV{&1ZQd!7dz1lM#4`P15dd9)K{0huE`xuQW>v&4aL@=H
zO5_?<Cn-R41*q<0;FArCKU;5s08t~BL(PSCxOKT)xnUJ8*hEsze?ZIS>NIT21Z&f9
zQ6@M$4LdWzIceCH2{xqRvJ7yJF%56dUij^BP^VEuH-}#i7bqtT$+P5{`DQdLS~#mt
zsbH$YSItMvEFn|i^5nXUY%2jerG+4>+i24cxSid^|42%aq$HXH`xVxmhk#GoP4p0*
zWa{o9I=~6>A<#kmN3OhEB#;wsg$BvVqv`o}iQr|0Q7i2h^@ujroC<hTVLiDGHE8{P
z`qI+)U~*tMdExAz)9)rG2A9S!ET1`-{BUCF+U4YXBg<oxiM~;{+a1G?YEAt_1cWB8
zOfG#n@@&kEf#fH>$)S;y+#h{clf7>x2d*a0e7D?x@hR)`v3$%)O!p=}eJ62t5J&h>
zG0HmgIsBaQZ0`})`vwzXBN2Zn$Q<_s{5~!hAzU5~CL9VdQNyv`P%y}Pql}O9A7?oZ
zZ%bT)k`NcC_nz>w;V6=biz88v!>*hbURQoz9asA!j3*ps0-jh9x%uMRscfxy%oB`x
z0)bAan6qI$nICy@3>zodh!_>D@CQ}t$=A{Uvlpz8Hd?nLqLl@UhQfJ6#jK&?8}gd`
zTlw|opIX0foij8q>P-Vp=bMJxM}6bLu^{i-&F?<K+x>I;ql>P}c~{-6tL|p`uT?)+
z@h!}JOWSNq+Z|W?tiI&^+Wz`s{T1Va$uhL-(yqlk%aHP-a#S`!eyy5RY5CG>zWPP}
zv6trZninkgRn-@2FR^EJ8_*Zr2O`vu#xS5huO2QQwU4{U+`O}ruRJh!u!TSDy>rmV
zA7FWF+nlC-(UAXWMS}Q`R^32jgl(GgeYNN#-+tzadJ5dA*r#kzfLoFp5xQn5x`7tY
zXx$B@c&3^}mD{8QRc_N_oGa)?l;@N-lHy-TNh3Wqt*KE^d+`VXS34ysV2CYv&*Dln
z{XnSQA7sLwb~g2(4%lO^C$_^|<~G6w%Pcmj8&eCRx!9y;(34;$=R`HG1fH^-B6dKD
z^*Lf_s>%8rNifh=WY+5udKx^~u9leYzbq=0=pNJ&u(jwk(KvOt=pTZ30p2Zsm3R%-
zIP4AvtIHxWuNSRZYB$!l%Yhx%Y<8r)&N)n5yg0SvuoZ=e)YHd8zF2^*;(Fl?$9~0r
Qk}&=Sa9jyb6*}F-zmGw$_y7O^

delta 880
zcmZXQ&rcIU6vt<}UAna0cIi?|yHMy4r7I0oBziD0!Dz6Oa8U`y;@Xr2i?!6*txyBT
z5N;k!d@<_5gC=@0F^~-&xSAlwlkwKXn|}a;@u<$U6i7OUH$Oh_`+e`t){SphJzqu9
ziRc>Lvhpv_u6sNJ|IUukbBGC%ry>te_zsxjMVsk>pg(M1LUT^IDTF*rNNZs_woLCK
zTXU;$$LVwlbwr`u3~Lo@%0M%8A1IY(=sAEr%}_dku_h?^_8}Y-dg_D4U40F~TmshI
zeu(?qLE)XyCv@-6uGn93?{Pg1ql&}aKO;1E0@@TA9`hl1;1}KIp;xlur5+K+kU7w(
z7Dr@w86UAqHLSQ6^A!9Qd)rsgv||}R#0z)<Eppe<0#*gs^z_20cQZV$hKNGVNEZv8
zEVQxE!9oCLqz@A$NY7Po-q5n8l2*u;i@DqSH0frqa{XE(ceBNEwos^4TQ4r=^pcsM
zFIIV-ka<$&43nrf5@8ao8#cPbm9|0g4V~%{+OY>(eZK|E=gVR4r?(R}<l$%!%~=^0
zFUjb$G-9LMw%nSQxb3dNw2S-V;?t6qY9Db6=b0xWBUYtX!=dBsCel_5^RxM)R?5!m
z_3=`$8yUlWa4tH76Yw?~X;E2f4Av#ZtI^h3CK;q}<RtuwuHYf4#M1bg^(pqljx+E&
z5te02SJ7V5%PYGRwjl4@I}P6xtN5}tss6)w947mx@DzOPk6*|zbB9sR<#fY1^0z5g
zpjKt5R*I!bMs`Nm?v?YVHcj&PX&bfAzXjoBCtij#$!qR0I}ZLrEbe5i7s&zqAI-hW
AT>t<8

diff --git a/__pycache__/check_station.cpython-312.pyc b/__pycache__/check_station.cpython-312.pyc
index d3d0e8f9fc09209a0a94cd4eef52f25ac400a2e8..80eace210b3f8ea1034a2d3d4e08861ae9ee7eef 100644
GIT binary patch
delta 2728
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
G1pVL6WVea{

delta 1413
zcmZvcU2GIp6vyYz$9{Hp7P@VBr`vX?-L^Zsu@q8iE49)lLPBk=K$U{JUAoh<WxHMO
z%(`vTLes=FQD4YOG!jXCAjSw0$vzlEB#{SWFfk$zH4`6v5Wy#L@yW!Gdj^&e^(Onf
zALpMl_x$(FeDu<l1A(t)*~hW5c&(B<l)4hA62HW@0{h+nj)0&43NHIJcvVb5QVzj6
zQH6p(AP`G|Q$iHp6`P?)l))?cVXHF)FN-ZM!mSWpf?Ja2FS%KsyB}Y>ePI($y7m)4
zR9s^(DmgQqDHhZDOsOz?!pPe0{L=h<t}t(lxx(C%?Jj3%0k=UGojvJjO)F!SOkK1^
z)5y=!Aj?a)Ap#7h$N=xT5Av5exaXeYe{X~vo}<!zcFe(PZ&zItst7}jhT#)$-z#Hy
zfR(OuKYHq@%2u-&uMNDoW5O~!eTVaMtK32@_Sn3Dntu&Tf;1oHEf2JIM%65t<1aqU
zT$|U(Dp`=>W>ggk$DGvU7VVLU*(Y>x*7jP~I7h>d>YL6eTn+o!W|~`(tj5O#sWqOZ
zVS+%`WkqU%RUXFVNYcH=pXOJjtTUHMnOhd7xiZl`r8=hk`O~Yn-+2G-=a=qmd<GX}
zgX{xuASzAhGTjEp0t4gqOhiKnblH{+N|&hZeRg@)C|bFtf-RU9)dh+c+uJkQY}%rk
zf|<iu`nXlFiD9Bku^4)PBQPW%VmlKU*13BkyseB2KPYX`5!|b_vcrv$j*%|zi>}tu
zLE*Z~gA8b+eZuuVX>_o1KKQpt5^%oZ8BaG8>pt29KQ&A>Brzv;GJDL!!JanJI6$(M
z&BoUVnXLTPbd)DuFs-)kc$x`m0<n+5mP*B<L2VyvGHRLSoOMEXJN3}RsF{Qh)Ls&X
zEp>>Tg;4YBM1^zBd&5x{)Co<Y25<hT!K%&i=!bZK9lFkauhefTiJMB|mXiF|lcZ{8
zSM*PTU8OhHO^(2k*e<dg-i)pI4`L?gZu>#eBCZ+Sr=Uk`tH)w((aJ3vwq)iFqez1=
zqcsK5bvlVSfH(}B+Ju_M<^MbKtEQ5R6<_-=WElH|wjrDf@Zq+Y&CObL9uFORW^i>J
zaSG9bz;}gtyECo^BT|2r5?+$4K}CvG+u>Nem#CGu;+KRoPoS&^v4dfP^0?fIcoMN2
z(T^BF3?iOF>_H4M=-vl4;j2oYLyRLP5YHo=vR}ZJQ>&M)YX5zVDq##bjw0?<zDx`f
z9b3=#q|=L;Tp^v-RqAy20!oK5<SJ$g*^Eg?Ad#FVb+C~vkG5mfhj6k{)X5LNO!!q|
oZT=r~nB))7(Be|IlsAUy2JA`o%Todg{l+1yc^8~Xb&F`^KX(p2p8x;=

diff --git a/actions.py b/actions.py
index 5f1d664..9be5efa 100644
--- a/actions.py
+++ b/actions.py
@@ -122,6 +122,16 @@ class DeviceAutomation:
     def init_driver(self):
         """初始化Appium驱动"""
         try:
+            try:
+                if not driver_utils.check_session_valid(self.driver, self.device_id):
+                    logging.warning(f"设备 {self.device_id} 会话无效，尝试重新连接驱动...")
+                    self.driver, self.wait = driver_utils.reconnect_driver(self.device_id, self.driver)
+                    if not self.driver:
+                        logging.error(f"设备 {self.device_id} 驱动重连失败")    
+                        return False
+            except Exception as inner_e:
+                logging.warning(f"设备 {self.device_id} 检查会话状态时出错: {str(inner_e)}")
+                return False
             # # 使用全局函数初始化驱动
             # self.driver, self.wait = driver_utils.init_appium_driver(self.device_id)
             # 初始化页面对象
diff --git a/check_station.py b/check_station.py
index 17f59c5..76b5b89 100644
--- a/check_station.py
+++ b/check_station.py
@@ -34,6 +34,17 @@ class CheckStation:
         # # 确保Appium服务器正在运行,不在运行则启动
         # if not driver_utils.check_server_status(4723):
         #     driver_utils.start_appium_server()
+        try:
+            if not driver_utils.check_session_valid(self.driver, self.device_id):
+                logging.warning(f"设备 {self.device_id} 会话无效，尝试重新连接驱动...")
+                self.driver, self.wait = driver_utils.reconnect_driver(self.device_id, self.driver)
+                if not self.driver:
+                    logging.error(f"设备 {self.device_id} 驱动重连失败")
+                    return False
+        except Exception as inner_e:
+            logging.warning(f"设备 {self.device_id} 检查会话状态时出错: {str(inner_e)}")
+            return False
+
 
         # 检查应用是否成功启动
         if driver_utils.is_app_launched(self.driver):
@@ -82,6 +93,17 @@ class CheckStation:
     #     return True
     def add_transition_point(self):
         """添加转点"""
+        try:
+            if not driver_utils.check_session_valid(self.driver, self.device_id):
+                logging.warning(f"设备 {self.device_id} 会话无效，尝试重新连接驱动...")
+                self.driver, self.wait = driver_utils.reconnect_driver(self.device_id, self.driver)
+                if not self.driver:
+                    logging.error(f"设备 {self.device_id} 驱动重连失败")
+                    return False
+        except Exception as inner_e:
+            logging.warning(f"设备 {self.device_id} 检查会话状态时出错: {str(inner_e)}")
+            return False
+
         try:
             # 查找并点击添加转点按钮
             add_transition_btn = self.wait.until(
diff --git a/ck/device_b.py b/ck/device_b.py
index 1185c13..755d75f 100644
--- a/ck/device_b.py
+++ b/ck/device_b.py
@@ -12,6 +12,7 @@ import globals.driver_utils as driver_utils
 import actions
 import check_station
 from check_station import get_excel_from_url
+import globals.create_link as create_link
 
 PORT = "COM9"
 BAUD = 115200
@@ -24,6 +25,7 @@ RESPONSE_PAYLOAD = {
 
 
 def main() -> int:
+    create_link.setup_adb_wireless()
     driver, wait, device_id = DriverManager.get_driver()
     url = f"https://database.yuxindazhineng.com/team-bucket/69378c5b4f42d83d9504560d/前测点表/20260309/CDWZQ-2标-龙家沟左线大桥-0-11号墩-平原.xlsx"
     station_data = get_excel_from_url(url)
@@ -49,7 +51,7 @@ def main() -> int:
                             
                             # station等于0时启动actions.py
                             if station_value == 0:
-                                print("\n🚀 站点编号为0，启动 actions.py")
+                                print("🚀 站点编号为0，启动 actions.py\n")
                                 # 启动 actions.py
                                 app = actions.DeviceAutomation(driver=driver, wait=wait, device_id=device_id)
                                 app.run_automation()
@@ -57,7 +59,7 @@ def main() -> int:
                             
                             # station大于0时启动check_station.py
                             elif station_value > 0 and over_station_num < station_quantity and station_value not in over_station_list:
-                                print(f"\n🚀 站点编号为{station_value}，启动 check_station.py")
+                                print(f"🚀 站点编号为{station_value}，启动 check_station.py\n")
                                 # 启动 check_station.py
                                 # driver_utils.ensure_appium_server_running()
                                 app = check_station.CheckStation(driver, wait, device_id)
diff --git a/globals/__pycache__/driver_utils.cpython-312.pyc b/globals/__pycache__/driver_utils.cpython-312.pyc
index ba0ea22bcd6cc2a2d7505317237c3270b1764d40..5daf3b16ed269369746f3f7b11bebea6af64c2bb 100644
GIT binary patch
delta 1645
zcmZ{kTTEO<7{{5j%PD0`N<q@1Y}jqNEw|Xzwi=5IsMtyiJaDNB#qF}tLt&T9E^WCe
zt!b+<xTJgnBBl!}1bi@UhX-P;8Y9FaYP3GoqcJgRurVekRa1S@`OmQ>K6D>`=Re;!
zm+vyOu|+Mms3m=pl$01Jf4^UzHxe!;4P@A^?}-yb89&&ZT$*_pXp}G=E!;R3;LY8<
zBg{iI<obzaiEejoB72&a3l>t($w^_Ggv)i3Z^g0^8Y%pf4bfmxf!+thD|ET2+8u(-
zlQ0uo0>=!0pgA1jd<xbY;AK%%Jdwmsh$|1?$85YdZn&h%RR>Q!&;T3+o{*^GPeMLL
z;gSN42gF3lEK5^|RlxoT5CdlEptr=)5BUtB)3kTHqX!Z}^IrPaTd!L=)BUA~vXC@C
z1E_${LOl<tAYXtI;+@h$jTMU3@`iY}B)oe|ncfD^0G-)a%a(<??;p*fEDu}eANTw2
zUV_{Vqyx)<6&N)iNK5$`<4WLh36G6`B+ecv(b6u+k?9CWe39;Ovp>`l@aWQYt$HXv
zxfQe3F-M>bI$qc4XooxsbkKKodHPF`b7Dh%G0S~cYSZ2xGJ;kNkHR+zplqH5)gNvO
zUxOo_wNPi{F7_6^**LrTBIc}B@m7T7Z*uFG;JYMVY^t%dFX$UzQ|dKXc1xJLygEi}
z5C4)X56_pX4O9iTV8&Gd>G7{H*WMlu1+5B9!l>G*nug=%WY*;M=diD-)xVS76tDTc
zb}P9kec$#FJ58=5D`~3fs=g<&M?P?xn30--?L2m?tGI@IM&uZa@oBTrCx8?{l`A?N
z+NxXCrM%G38A0jsY~qh$!d}3-TTmCMu*;bvAl0$AJ7~p!3XbO_JnQA_33a)XXJA<c
z_5*?@yNa16KJR+lW^JQ(P*p<SYMWbe$1%0yjYuA|i<O9ehv;dwXB+#49KAF5+`b~F
z=Ib=$<u&4wUacrt%R6bM_nd6+p}rg|zq{^`-(+82gX%>Y!YK!EkJL5g15j%h<A3SG
zr6Ohs+p4*=nd^*TQ2wI?_$p=gyY+d@n->-R3!5D3oc|uh`e+#oQDxN0ekCKC%{I_b
zG>;|HLbRTxi;Y9>b!?ipk8aV&vB9fUJzB$tX>!!fM(D%Qs-#hA_GnfcUMJ^R7IRYh
zn1{JU$JjK>T#@ct>EDUf>JfRNKE*1=+vwi$2ez#x_8ENWj2Yj>jbOxTi+rRsI9|fC
z#q#*OEd4!9(j=-X`1|sMM-0;<#U?x~S6rFMv^jo*<p%Hv-8f&c(Ibm<-7bfJ!S**5
z#dhiWC|Cg*v5Xy%GM+i<l%E~=?6&?zRB&ZjbPD)D!qh@xepM{Q@>!-TWg0wAAQNx_
zOTaR*sq|VrT{EG}=RfLe3xxT343k@ou<vk3p!v9u2aRA`nBT;LTtGuyc0e^P9m)k{
S1G#{Qf>TbmM+{D-vVQ@7va4JG

delta 1647
zcmZ{kT}+!*7{_;7`fgC`7}yLHQo1o{`HIWjrdhCnikob}1s_vkO;-wg8N98hWrPnm
z%-l>2D{jvQ5|lz5j@>xn7(<NHL?wm|qs|LwH6}*g)R>s);`C~s|9RcGS}%U@|2)t6
zcs|Z)V$qUVv^Xw19BHfM@5Z}Acg#7C<XH8gh#1NF(VF|5G;<C-E0MIfas5z;`+Im-
zlp8dX_cJRLJ?@4y=BG==3z@ITNl~jrUfvMjfMuuYOv&FYPQ#_eT0ab9bg{I~Z9sY?
zl4)(BLwYdekH$Ekg0&tXQCc?PV7+2#$3x7jr{8<3ymnIqJdHpT&<yOAsO3*XJ_EFn
zQC=)2%V(HV9ajzG<G>_vj`sS>(+4020SyS#ly9?!uz4SS=WEi;tm)y3efdb6zX+(1
zk3k&=RG2S8&5QRcN-V5QT(4@ju|?tAS;4e+cn;ICT@7qWBzN7i*p=lm)BMx!!2OGm
z>w#=w2`~dA{~l+?rx@1&Pf2*K{9|!^Pr1c;L5`C4Xe<!xiTZ=#wvbnouB&w;w)7BY
zt7AH#4p47ni(QB81P;>ojUH_na#q~aRK^OQmpYl!8P*Lmh9}@l0M!!SHL64W8xd%>
z+gOmgTeh+Dbhc%7{o9zcQpMX5Qn1yn&A~S(UT&>VVPDX<f!55gVc9N`)a2#S+xz&J
zRI~q`3blc%Ko(|P0gxX53UgCBqhZ6WfC@>qQ#B38otIgYFId2?QhRVKyD44^`cll~
zPS6h>kFukbcVOA6ny%`51RECtM~Uf~8Q9L7Vs;f5k<W+%ebMGT2i*%~0IFOkPK7sU
zW_8IE{w1eddc5oSlbEm*Fz*)B1uBW;7R*DcWAAj3tN4fDctOIOD&J2y;!dA|<r=UX
zn5U^o8Drw}$Xix(8?}R~67p8t+>ZN}x#EqOhgrpPOuI|;biHpQ`;F}VZ$5D6iX<(8
z?xam#BOdFwlo}1Zi<bLO%J%LXC@}N8?=JaG4S1SWE|oaF3cx*5*OVWITDcfQ7~W17
zT1C8yNoCet+LEhv!;t?eA%2ZqgKkY=o)Fc83+wFaoc|w1YP^yeR1?o-zmp!{#OyQ@
z_pnr2h&Qn;v3A70nw_Q1qgmRk*kGLMM(f#0ni_Sp)AZ43t>cU|do5-grYUzUpXE^1
zn3uUk*VqhmU6$?!>EDXg>Jj;%ma&TQc6xC9k&P>feFh&ole9&+Zp6&C$VW=U<K--0
zTpE9$WnaW3i$rZT|3H55h++DK5))olAeJUvR{I~Y{0ZEkzb1><dSr2aO_9TYVEdO!
z6WcT|3RXmVB4-PvjAvFl<!1{%+s%Iw6<j424FMlYBrV}6zakbAMa-p2>4Ya2Z~=M1
zBCtekI=cZ+H@PMf2p$Y{grfX)4Aa~6XkdR=$ln{_hHi93`AsY+1Q_D70;*|QP%a=J
RC;&WUOy{y4Vt6`}{ReOgtZ4uM

diff --git a/globals/driver_utils.py b/globals/driver_utils.py
index 27941c1..e03e916 100644
--- a/globals/driver_utils.py
+++ b/globals/driver_utils.py
@@ -122,7 +122,7 @@ def init_appium_driver(device_id, app_package="com.bjjw.cjgc", app_activity=".ac
     options.automation_name = "UiAutomator2"
     options.no_reset = True
     options.auto_grant_permissions = True
-    options.new_command_timeout = 28800
+    options.new_command_timeout = 3600
     options.udid = device_id
     
     # 增加uiautomator2服务器启动超时时间