From a41ba4501f4317aa847b8b48f60b7e9dda374841 Mon Sep 17 00:00:00 2001 From: YiLin <482244139@qq.com> Date: Tue, 16 Jun 2026 10:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A9=B1=E5=8A=A8=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/check_station.cpython-312.pyc | Bin 46806 -> 46922 bytes actions.py | 43 ++++++++++-------- globals/__pycache__/apis.cpython-312.pyc | Bin 20879 -> 20865 bytes .../global_variable.cpython-312.pyc | Bin 725 -> 717 bytes globals/apis.py | 10 ++-- globals/global_variable.py | 8 ++-- .../__pycache__/login_page.cpython-312.pyc | Bin 7809 -> 11333 bytes ...ection_mileage_config_page.cpython-312.pyc | Bin 44442 -> 46222 bytes page_objects/login_page.py | 14 +++++- 9 files changed, 45 insertions(+), 30 deletions(-) diff --git a/__pycache__/check_station.cpython-312.pyc b/__pycache__/check_station.cpython-312.pyc index cc79aecf3e6c1908025c7b07ca11c32e4507519b..12160353a890c1626db237143699f253020c38c2 100644 GIT binary patch delta 1075 zcmX|9ZA@EL818%9Tl#SemDE*MhAY(3He`mDGAJd=7!(+(7BQP3t4)jb7AWQR(yhcq z=cci2%Z6_xkW4fFOalf7$4%p07H2w>?T14XGjH5KC1g{B{92+vJf|C;A5Wh5dEV!o zd*5?@{*$})7iYR{G8t5K)n;mwD=VfI1AIZQ8%jB24O7`lIxyO6!9N6p=1neX$8gO~ zyd{`$%5K4P6Gkp)z=y&qygwu0SyMF_an;lc0&Y??;oj0NeZpH@KRt)p(kMKMcS}c1 zibfX4h7~?DIy{`l_Ocu#@mkq5lwp^-RWP6J$@iSgoPOc1P=!-w8`yBx?1xHRGxvBq zRH_^M_Uk$|s)9=23F?A=Z%05~2=J8O)Kmqn>YEN7!#aDgT>X7HAGDIt6X$vG;e#E$ zaGW$*vjBtS^QUs$vt9HDr78wt3JO1&P7h0pAtOg6IdfE$-*A;k)y$4C7{o)iF<2%A z+a-WT%^jh+qLu37>l-%clXSLdx-Jk zp?#DoyqHQ)%1VitiHiwQR@7ojmPS}lBX&7!43dX&F9kg29MYy(#)@}5R@`!4(!R{h z2!84c83!3nGVmd|eeeU>=XUDM|Hq|D=4tWUW(%J1?4h$*^t6JXYU z4?u)G@2}C*;;38nWu+N$n)^nMswByE$GX((C|dI9j=ng*;+k>@!ne^7)kK$ z4}m_Ld&fIz&hZWp;6e9^P1o_$N9KGbL!ds z+_rsiE=}!k=0>RQoFCV1>mMyRsD5L?2Vawi3-xSr?xmfO!j2_7{6Z2-YuxTeHhgyV ziY6|`WGTz);;Sp(^*A10euXAhmmBy>zG5pt9xOL&b~LfBW(Ix=A&Fx&fCq?OkUAL; zQgG>Uf;|1`{$FLH4`+zgP<&?$D#dmo-GArXLmdDB delta 939 zcmX|9ZAg<*6!yH^JKe`SH%-=@&abi5G}NtfOI!IdZIxCI!c{<$vadZbt+T*S>C3S1RZanC_HN|Yv$qg7c5 z3hY*v;|pa2#NyWIR=gSA167!)8Ug`ts|xYAN(CAe)K=JxKX7=iao^q=;ua zX=#G!nPFS0MikKS)D9%+?RlbrEsEk|WQsjow3yA?^GHBF%7Y0TH3#54@oTyOs)vw#CpzINDbf!|K?8=2I!P-N*~o9>2*_)g z9nNwHZ=`D_EzCFLLV8+sQ0#4KYYy@quI6TUFb*I0$Dt_04lZ=EunrS4E9BM8 zJk7v_otfL=HJQvzkCONp(~YZnCA4(CsSxr>t?4rlZc=K=1p zO>p2R?shLv-(K^Mz(yneT?Vk=ovvLp&01G6%##e?7AaKX;ocUIl83!l0kn9y&raip z`*;8!j$Qah#h3fb;44|_H;ZW*iov0cgzE8F^bhK(VtKF_a!JfklY++jt`%_`l7(S6 zz0MhFrTpkf`~RV;#|@OgH8%(ODt&A^7!Bt?-S^@R8D zq!floQmTm>9a0L(8^>c{^6>X!5KoLV7JynjJ{uPso_rZ)gA#Yc*`|gLkAn=%Mg!E~ U@cna&A{A)AM=<>1K>dTPzqU0RivR!s diff --git a/actions.py b/actions.py index fbbb1af..9f197e7 100644 --- a/actions.py +++ b/actions.py @@ -109,20 +109,25 @@ 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 - # # 使用全局函数初始化驱动 + if not self.driver: + logging.info(f"设备 {self.device_id} 驱动实例为空,初始化新驱动...") + self.driver, self.wait = driver_utils.init_appium_driver(self.device_id) + if not self.driver: + logging.error(f"设备 {self.device_id} 驱动初始化失败") + return False + else: + 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.results_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_results') - # self.driver, self.wait = driver_utils.init_appium_driver(self.device_id) - # 初始化页面对象 logging.info(f"设备 {self.device_id} 开始初始化页面对象") self.login_page = LoginPage(self.driver, self.wait) self.download_tabbar_page = DownloadTabbarPage(self.driver, self.wait, self.device_id) @@ -172,7 +177,7 @@ class DeviceAutomation: login_success = False for attempt in range(max_retries_login + 1): - if self.login_page.login("czsczq115ykl"): + if self.login_page.login("cdwzq3liangchaoyong"): login_success = True break else: @@ -207,11 +212,11 @@ class DeviceAutomation: # task_data = apis.get_measurement_task() # logging.info(f"设备 {self.device_id} 获取到的测量任务: {task_data}") task_data = { - "id": 21, - "user_name": "czsczq115ykl", - "name": "czsczq115ykl", - "line_num": "L220179", - "line_name": "CZSCZQ-11-五工区-德达隧道6#斜井左线-DK632+707-DK632+705-山区", + "id": 1, + "user_name": "cdwzq3liangchaoyong", + "name": "cdwzq3liangchaoyong", + "line_num": "L141037", + "line_name": "CDWZQ-3标-区间路基114号-2-434975-435400-平原", "remaining": "0", "status": 0 } diff --git a/globals/__pycache__/apis.cpython-312.pyc b/globals/__pycache__/apis.cpython-312.pyc index 2b1e5797ccc793579e2f6147844707e6c6fccccd..60df833403e2f03ac655b6629e056cc8f53fed4b 100644 GIT binary patch delta 720 zcmYk3UuaTc7{+^-PINnN*s7&1l)@n*_~-a18xd)<{n4$(P^ZJ4)H%zJ?o*o+M#PG4 zVnScgRV>&|SIIbo(e6fFMBQ`~$RX$=Y}G|KU36LBD}y>0zw>_2_i&zv_cXTP-WG80 zIZktgJ;ojT&GI()hD!iD$;Z-}mHM))kQc;UdPyj*7R8*bnso3EyUSbUnI#a6&Rw&) zzCM3wYd_li{&eTtZnM3)=Wy`t#;(n2<6ZoDubaKxyxneVzmnP;o04Dq2RK8^4-U95_gR6avuH0BOMlsqE1xixWcSh5*j9$EF*{#b}5NIS2 zXW1_TZ@X`xoR;ncf5P27&KyFE_-`k8>{R*JqEia1$cjp~Ryiz$MlZsLIL=_{C73U( zgi=0LB?U5oHw%aYB7rb4$n?wTfbKR@E;$ce`0#85^YOq5Vx4l8tXvE^Nx z7msz}y2!cenw<+a=4gFfv})b8;aOX2lZu-zy6M7;I?w6D&c$!f=llPkr?^2@HVE^E zVGMheFC-kFUMw*$ne+iAla0xRTykNaW!;6DjI0}Wxq4adOg^CWd}9&c*cB(sI=3sU z_41?o-HNkbEq|?68*5J*MeuZgzW-pma<5)~{H5~L=?{APTn?_6`xm*L^-@XMl1`d_ z5~j0eJyq*GQM1@<){NwBd!}z{5NW6VEFocuI~>rG02D3#WC%7bwzi;RfVvRFh!A|Y zc*$kR@Evf`Y9u4uIxNQ^2h*Y-?YL5OM#tk>355XWz2p)otb7Tx(X*FI? ziSgNNDxMGoO2;M1v8*>wC{wZ_kxb6!vtm3g&?pSK{bUqY+yN4UEjLRpL5t@_%OpNG zg-FAe=i@O|_cZ3JaaH^(rUwzK4IVyl9b^K2aNVs5r7G*@5{1lcLZC6QdvB6?Y2ACo z&_Zzm`-=AK3wd%4&ikT@_L}cia}vvfH0A$BeA5{3{@Q=1!iH*P*M({dt;iZNbxZtf z=o7ckVx*`j>k@P6c%EkHeq2}eZ(tOIw*y_~ERGl^(=;c>^SKnIBJ2#fNI~iue6MXD z#la}(Lw?04AIkpm3C}|_WEgt*E;F9OuA_@M*pG<8L)#(9^A55kt@D~Ddl;(`#0X*> eq26v@iR8WMtVj!3TY`7t4zdi5@T%sHQuqZ#Z_<$f diff --git a/globals/__pycache__/global_variable.cpython-312.pyc b/globals/__pycache__/global_variable.cpython-312.pyc index 2207843b42bb72248f8c279836df09f713843cca..af44412d5e1ae9eb931ad3ee23ba5519801de9be 100644 GIT binary patch delta 170 zcmcc0dX|;0G02)ckynGCDT*nDIf^-jC5k15HHB@Wi((?XCdVy?Tf)gH zB$+1`IY&3=`R_9T1!oUgtJR{RG_Z$vjy$CPkVN~oWAA7_VrKa?=mzr zdD_2S*GSjI*u>J@6iAtx7#Qe2-MRT`-~3zbK87ZS2FB(a&n;kNl$e~)B*~-Rz<)zT U^a6w64Y`oXQOME$-y1 z%F?R*y!7(ayi!k~7U!s7=cqtkLqpvsyQVzdzVvC&F5Rd5w!hf7@8zuJFB>PDDL^$Bykh$4%WfZIb49w`BRTu_mQi zyd>&U970RjGL-(9?zRfHidC8z`ysWENnJN6Dm0^GH1$NLp{hbLUl3331U+;h*l=l*!_-tRrqFtyA2o-F4PC@;TWo_L|+C)OfLtJr3$`b5nzMt2)E zQ8Pkq(oADyw>T`UmnOUEQOWcd6CtOF#LimPNwc|%r+uu+`ZDBRlna?jahm)5gA@mb z!WtEKM6)OP=ZWSx&A+zfr({@4iUXcI`dKw+Zk+j*sJnD=m|P|{v*VIqphR=ALFGHN zg2f8f7)LBgOQIShtlk!mxsztia~RTKUT-oFn19-^GWuZc@`#DLWoxC@Tq`}3Byn$c z)XTOoYqy)ZVL$FuDah#pQ!&+ERuWk8ea-|ycGwM3>s!#2$9j-hhdmrm_l00~gM)Z#Xf=briT?D+Zg z$zy6X8;h#xi3=Zp_t@MI#vl=Sb@9=Y}ATXV0x z^~ujBW>391JNfL~_uo$c{MnCr=$i=v(&v9Vcl1K~$+s5+vlDEc%kRusAhhHeKbijC z4|itRBd%K5!ZB9~@PaFtml2?kI{W&W47=(2mrw*PcEjD|2!nB*9~jhMvFcW^^?O*Q zr`>ojn)Phl)15a2vwxe+3r*bQUp>F0)gQPH-m-a5$xq8EwKi4Pma5&B+SZi{ba!aJ&fT+^a}>q?au_^!o{ z4Ef`=*Hu-SB;$Fy(d;xe=OC7w&TSh>YZz1aiaZ3$D3jafGPa;|BTAIyi{WJ{;a zrY*xXfcH%t5hRin5`~yrM9Cojfow_OPr0jT0y`)B+-vS~LsK)dKgbapWxtUFEM)bL z8b(A-9FdYHy)S9fBp>ui;32!KXnD(bZAAR9{mh#98n>7Xqe_}MMD=J=%Gs4`d1w?P z_J*}!)RL7eIVn9)P7BNPP|{cRnOu>?YJ0I}^OW4HoFj!Kv0-_pm0Gi9bL_b}HN)Z^ z+PHe6V`X8`Ur20XAtmyk^-=`AbdKa{5_?=3U0pL>pqcI^&Gckd$@@QOW{!5}YNjtg zXPv&>56He|S2@j{Rn8nW{T$^CpmJ8O_9cVaC5Ljq7(`RwmsrrExQoZ zv=~mG{4IGH-ao7l(L-cWe%Gsd75p>38c~D5_e000Bd%{j^B%y1IvzBAQFPF1K-`CD zL^L6q5iN-O5f31~fOrrvsyor#if9Gw)Z5V9hCqeZzlhk5hyh?(csX^vB)W``|2-InPFQN?bC?beJ zZP)i9P!04>#8&|WD9P#_MOVOe-O<~B;9y_pfu6z6p@AN~ues~7p2LCd=-knDpr`b% zFhnoma3xDx-c2Rn4U6-{_NTU|d^Izc+Ib_p=q+y(Nx1Aoweo$nGGz(gRMZcZweKry zXOwj)>6WK0slwJ&+wN5Bo>Xw}2ewD?9YAkz*Nm-W-bl)t=tTRBrDWbXdC@EVKTm~Y zE4S(cF$B9f`T!TJBbN=fScF`5SAacb^2JJosjz@7Zc)JX>uN9Xifl&~`eWtf%9fT! zXuP+j*$UNF$%l+^v32~_Vl&$1T&$YET46-HPKs~jr)d~pjHm(Z{UC85a=-Hb-MDyE z*e?q@=sp$*6mjb*YYOyJiJc2nnG?`W??vome-4D!7K1rP7C6q}TMz>V_d*jj7<`{v zTfp&YtDsS+cJM43OwxAtQc$bK!*$(qptrxft9PKZ>+1&x7LS&MV-6tf2s{S2#rntk YwV~dg`}A+J#!#iwB~af2L1sJs8-@pH00000 delta 899 zcmY+9Ur19?9LLYO|J>g@H}Ca&+tTaIY;HCGFP&x?K_J_Fh)7Aqypj&fm|jYoXd)36 zHTuy*L{tRzP%pKphY<2Xu|L~OKKW7vTG7i`5Yj(7*RbJv_?++Wdw%EpJ7@mLxfcG7 z)oMayjSYy=OUh&3jj<1^v0~3t*%{o$soV_e${S-mhGY~^8}WH~?|hwnZcb461f1fx zLO*{I%aGw~m^c%at|?`rPtV)DqJDU3c5$kG!las@OPRz~kT93CmbfKa3yJ)o*AX|X z1>@w_O{5BO6QOvEeTe_XU^H645g2WNDx1LPj^ZfV2ptwDJSbJHg*ksrBCjg373Ca# z1YEKEB{}D93jR>4z<^uY-?T9-x2w+eN4aj%xw~V=GK5hlN>G>ooS{3>Y5c$50bxfA zZh|Sd0CyZMRIvu{9feqf?~dJs{(_x^-33PopRLm-l)J{QKBc#>Z&*7y+B2xOXnAD( z=co5qu0B^Z=n%Zz7n(R4tO))B%|hg-8!uL7udiN6tX#Z(NP`M7K=OJ-FX1I|t4U)> zkFxsct_DxU-|)1sRdN$2R!Xo;kBr7Ve2mwPdSImp*PzP)bV#s(Outm6*rr|s~dvbdy}$QhKSC|1rIT&$Sgi&<9w#!q0vy$pPK diff --git a/page_objects/__pycache__/section_mileage_config_page.cpython-312.pyc b/page_objects/__pycache__/section_mileage_config_page.cpython-312.pyc index 13d736da6a834b468451a54b75a13e6eaa808d59..4bb60ddc3b2112ee98584a1e93df5f9254a23acf 100644 GIT binary patch delta 2632 zcma);dr(tX8o=+#<0hC0H{M`M2roe}LV=i4G%%||Ej|!@pi^)yqGWh%3v!bz;sk

nAvTqef-hc?d0X+!$9L~?p%~CXsOKUag4sNLR%7#II z2k<9cUKdW^f+6GhA>Xd+7onRt`+yPMb-s5XRVeTy{L!goe0gI!u2+TN-3P<)&IRGv z5hoW|5x&x;#Q)fwg6mpjI7Y9)*YeePC_{#%t0Rf=VbchvD3&=n!eG zpiWRj7xQg3s;2e`^Qmg24Ztl;O9D#t{Bv(PzS*=3f2vmCu`NM(g#w?$Hbsgt7ORhE7Fka89H&VGlA15LGOxMOMV6m?NgcD9VavQ~a6~Tq~*-*V23{QeC3d zD(a$&1FT}gIaZob)+3qqM^pt}EdNiG74KFAGgi^8-Gpic=4kBDYVc==<>X)fu7;Qe z&o&FJWDnIS8LRl&c9E4TkH;I6*dY3UJ3No0HmRjBF7Zx!x}$r#qlb==xXr$Wh``yL zh^h&SrpzzQ&Q1))>1rjj?@q{=Q}Jj(bcmu>QYWbq6!Yy<%X}W5cP`duSw_PBXX^d$ zxA>YI$%C!F8y}8e==l1^p+`3xef@8Yw>3Vk_w`?y7hX zrZ!)5uO*x&qdyuvjDHe`+PFH>vFM?m?hAhV?@2v=d%eHg?z`16adw}t;lTJn-*i3W z*WVt${;to_GjaLYWW(X{o0lx}NSv>$%XhVBynElo`)^EkI(>utEh?g(IC9n3dYq*5 zT{`9O_`uhH-tTBPL|Wh^Pl)snp7&ilYlvKGnM?Y&9hpSsX!jjyF+_TWr5lR0!tY^s zOm+^yF-@LjE2f3|#uZ!w>Ep(8`8KVFBTIJX6z30SegkTWom&Vn0;&MjfNTJNltUF> zd5O_nSXp5#EGjPMI2ovdva)kCR%RD&*}Q5~&dT+xI5~t=0;W$OkSqWzMcF8BABYWr zWMw`e@Q&w4lOV1bBV4h47>rq@&6T+;bAgK(05Ww zp&Vgi-AwE#!;Ub~ZYG)twh?Brn_2vTNt+4~M+Lg%VN-#W^0^UK?`HL`7gl-Lm!IT= z5LZmThbj1urc|LL^W)s}<1Pk`EXr~(%DOjy^`GbOaAogk%KAo1F{)8r=1|r>UACJ^ zY?E|`_LV+K6X|9mUD1ZY)Isf#!8ZJx;q9)15?ASNS4owt%Iu1=+-H6}MN>;&LQi5z z7ix-iv$1{E9yW>mpGPzIM%AJ9Gu9+Go8*vs*k#YO!sMKb_pmSi+*&*n3={5HtKKUY8`cHB~AEIN~VG| zf0V=m6M>%u^Gshz5*oDwUL0{9+i&!;3Gb%036Xn82&XQFUtEcyU0@K#dV#fX}8MrRlF% Z7F%93{)!91dGDqM?PXBNV+zPS{TnNcR676w delta 1320 zcmZ9MYfKbZ6vyYz>L}jk$5{-~m!6Paa4y2_I3fCqG2qWSkq66VTbRxPCS%|9$Ga?yr7?DCD`bi;Z zU!(A^5g%v9m(Dj_w{rFT9&$Q~)*M7r`W7&uQd{8;p5ZNi&S*MF+RgnM(Yy zhzKbZ7htlw1Q<^;$XvdbCj$^rWF|v$a#1XyYs#!Oqy-*ZQ%JWQUR)>;w|w!8NXV!> zTy{%Iw|+}%Cj;^$iDiZRxZkM!le0}p9>AIU5Hbf%^r_H57sWUO;BWUH_?iy_%g3sq zT&9+H?xK77o@ho&sApl^9gG2-;55LEmMDW?J?mm?`4Zn)O{$q1E|;k$q7ojp><4|T zjc8!ubT}!6{?;DNOX;ej0KzLUqs5>uEU0j{BMEIHd>fXTf(jti_8o9~ynt~+B^0fj^ zc!o>=gk8O*Bvp3xe$NWOqGul7>9hF#M$J>w?=aXGL$+YCFOd8J>wTHzl>B;s0Z%q$ z&+P_6mgK;}WdhF={Mk+d3GLlH_de&)!3C;cmlz6lLpu2GL=fcZUIpSN!|cbK1CZr${Zz{z{L+;LG0 z*>}XF!FYUMgZNtIe=WfKTEOdPEh&-gm6cK6Oh*B>q77i6H#8{W~ z#ZNglMB8H75*UqPMIE-N4qH}7tf~V$EUlIWL(;PP&{ho#Yh&qe@1{8#Qi#ebihgxNfrGlX0vBf3iQ2t+5HDa;^mU!<7vn=+#S!!Z=f^M zhlp0hEd<^*6883sE20~%Da5x3Y%A$8VjY21Cv791BmO}ULcv49L_e?N4cl2BIh2$` pn4G9u#c7_xYlKLb5$JVCc0k