From 3b2063c00773e5d4836175fb4c6573c03112d176 Mon Sep 17 00:00:00 2001 From: YiLin <482244139@qq.com> Date: Fri, 5 Jun 2026 10:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=9C=AA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/check_station.cpython-312.pyc | Bin 14468 -> 16535 bytes actions.py | 96 +++++++++--------- check_station.py | 1 - .../__pycache__/login_page.cpython-312.pyc | Bin 7682 -> 7809 bytes .../measure_tabbar_page.cpython-312.pyc | Bin 18263 -> 18281 bytes .../screenshot_page.cpython-312.pyc | Bin 77843 -> 77857 bytes ...ection_mileage_config_page.cpython-312.pyc | Bin 46109 -> 46109 bytes page_objects/login_page.py | 6 ++ 8 files changed, 55 insertions(+), 48 deletions(-) diff --git a/__pycache__/check_station.cpython-312.pyc b/__pycache__/check_station.cpython-312.pyc index 59327a00f4be42a047157f709996fb538e7d75fe..948b434b3c94e527ecfadb995c301d4e2348d2fc 100644 GIT binary patch delta 1987 zcmaJ?ZA?>F7{2GWMf%0P*dmltxNTttQG^M?P-mQiQ;ZTnw)wS=_Fh>_rFeTQR*T(? z-@%|eX5hq86Wqu&py{%WOkL*JAOGCOChZ!3xWrb;mdua+Fz(OJ@jC5hy7S{X?>#-w zbKdiwbDr+oKKLofyQS5t2-NN_oZ)`95)Y)m_8&y5Kh<%W(f?|!0jB6dS7{vaF4P!N~_X{H+V!v&08cae5VSr{RY$4n^UGt@yacTuR3BHzX>*h|hnJmSJ~m&R zw_dco7o*=#6qY0?-P1oSV4}RWwxyEz*;tHm-r_veT~pW)-l){K&XwJGI~U>29BXTh z>}HJu#ZD5MReB~y;(99yRItoSy@=g1T(IdN2vDKOj6%UMSqN+M^`wvs+w)8ESlKxw zgj*jOB;l_ry`@ja%7d~UfH!B+rm(hA(pCgzr-;+?R|gR!-TAPtq&SCPk3t;|i}{u; zO3$+_l$3HZvLq0-08`;s##}M&m3kmIi;@xNv`A7?W-0|#RzfI|wnz}=1aAS^YL=;? z&eYgI1XMz4hDLp#{QvS$N_l7mGrX*@F4FeN_s9e2G2lMqO6K{)NK?hUXxT0$>^79^ zSZ;^Q$=O|OGxK2lN^11r@};myZwooRUQaWV9-2rU`zn3tSn9}#B=b_0*P=E21_Vrc z#pR#2#Y-l(&{^iuk{mqP&P_`XU$&mIs>8WNa zNQ>cR1|}qKsMU|pmPrqPgSU3*!t2xhGx3CMOQi?DOAQ>qe_~|n#K{K}6V1%3s(gM2 zV({1~_yPn;%~n@8Yv(*1b^tyXkJsRFxxj^X3OufDQseU3S(mTJ(-Gj;k@gAqdx2Anu=LQtjP%{bN}Nanw8HfqUq>;i{Yt3#7~3Ixw@O^CN*rXRts z@+BX0&aSmWhv4#d*JN=n3OTKB8G=uUhkAq3kkHTrZHL?9nv$rdWT-bB2zQBfD@0RU zOtTU>nz`a@^%-@XX^JvUmx_KeP8!8l_id(2)R@q(##y0wac#7?_E1}bGKDuqsoIyW zXN}U@@SbLY0E(OFja~Z6+&_Mov?>fwR)Wapx_$(IKS~sK^W1KS|>hxyH7fNem8v7XaWG z0j4F=Ouv{mZFUZ}WQF5=O?>$tw1mj180h>=znO1A6WjZ*oRza&~-iNn%N6 zeqK=}P^?G|L}-EtWgzj3!zMRBr8Fniu4w6GB?nvH3KmAmj|?F4QyJ&v90zRxp9NZj diff --git a/actions.py b/actions.py index 43a8cce..3578f5e 100644 --- a/actions.py +++ b/actions.py @@ -241,54 +241,56 @@ class DeviceAutomation: task_count = 0 max_tasks = 1 # 最大任务数量，防止无限循环 - while task_count < max_tasks: - # 获取测量任务 - logging.info(f"设备 {self.device_id} 获取测量任务 (第{task_count + 1}次)") - # task_data = apis.get_measurement_task() - # logging.info(f"设备 {self.device_id} 获取到的测量任务: {task_data}") - task_data = { - "id": 39, - "user_name": "czsczq115ykl", - "name": "czsczq115ykl", - "line_num": "L179451", - "line_name": "CDWZQ-2标-资阳沱江特大桥-23-35-山区", - "remaining": "0", - "status": 1 - } - if not task_data: - logging.info(f"设备 {self.device_id} 未获取到状态为1的测量任务，等待后重试") - time.sleep(1) # 等待1秒后重试 - break - # continue - - # 设置全局变量 - global_variable.GLOBAL_CURRENT_PROJECT_NAME = task_data.get('line_name', '') - global_variable.GLOBAL_LINE_NUM = task_data.get('line_num', '') - logging.info(f"设备 {self.device_id} 当前要处理的项目名称：{global_variable.GLOBAL_CURRENT_PROJECT_NAME}") - - # 执行测量操作 - # logging.info(f"设备 {self.device_id} 开始执行测量操作") - if not self.measure_tabbar_page.measure_tabbar_page_manager(): - logging.error(f"设备 {self.device_id} 测量操作执行失败") - - # # 返回到测量页面 - # self.driver.back() - # self.check_and_click_confirm_popup_appium() - - continue # 继续下一个任务 - - logging.info(f"设备 {self.device_id} 测量页面操作执行成功") - - # 在测量操作完成后执行断面里程配置 - logging.info(f"设备 {self.device_id} 开始执行断面里程配置") - if not self.section_mileage_config_page.section_mileage_config_page_manager(): - logging.error(f"设备 {self.device_id} 断面里程配置执行失败") - continue # 继续下一个任务 - - # 任务完成后短暂等待 - logging.info(f"设备 {self.device_id} 第{task_count}个任务完成") - task_count += 1 + # while task_count < max_tasks: + # 获取测量任务 + logging.info(f"设备 {self.device_id} 获取测量任务 (第{task_count + 1}次)") + # task_data = apis.get_measurement_task() + # logging.info(f"设备 {self.device_id} 获取到的测量任务: {task_data}") + task_data = { + "id": 39, + "user_name": "czsczq115ykl", + "name": "czsczq115ykl", + "line_num": "L179451", + "line_name": "CDWZQ-2标-资阳沱江特大桥-23-35-山区", + "remaining": "0", + "status": 1 + } + if not task_data: + logging.info(f"设备 {self.device_id} 未获取到状态为1的测量任务，等待后重试") + time.sleep(1) # 等待1秒后重试 + # break + # continue + # 设置全局变量 + global_variable.GLOBAL_CURRENT_PROJECT_NAME = task_data.get('line_name', '') + global_variable.GLOBAL_LINE_NUM = task_data.get('line_num', '') + logging.info(f"设备 {self.device_id} 当前要处理的项目名称：{global_variable.GLOBAL_CURRENT_PROJECT_NAME}") + + # 执行测量操作 + # logging.info(f"设备 {self.device_id} 开始执行测量操作") + if not self.measure_tabbar_page.measure_tabbar_page_manager(): + logging.error(f"设备 {self.device_id} 测量操作执行失败") + + # # 返回到测量页面 + # self.driver.back() + # self.check_and_click_confirm_popup_appium() + + # continue # 继续下一个任务 + + logging.info(f"设备 {self.device_id} 测量页面操作执行成功") + + # 在测量操作完成后执行断面里程配置 + logging.info(f"设备 {self.device_id} 开始执行断面里程配置") + if not self.section_mileage_config_page.section_mileage_config_page_manager(): + logging.error(f"设备 {self.device_id} 断面里程配置执行失败") + # continue # 继续下一个任务 + + # 任务完成后短暂等待 + logging.info(f"设备 {self.device_id} 第{task_count}个任务完成") + task_count += 1 + + # +++++++++++++white+++++++++++++++++ + logging.info(f"设备 {self.device_id} 已完成{task_count}个任务，结束打数据流程") if task_count == 0: logging.error(f"没有完成打数据的线路，结束任务") diff --git a/check_station.py b/check_station.py index 0c02a46..8eeb3dd 100644 --- a/check_station.py +++ b/check_station.py @@ -266,7 +266,6 @@ class CheckStation: if not self.click_adjustment_button(device_id): self.logger.error(f"设备 {device_id} 点击平差处理按钮失败") return False - return True def click_adjustment_button(self, device_id): diff --git a/page_objects/__pycache__/login_page.cpython-312.pyc b/page_objects/__pycache__/login_page.cpython-312.pyc index 9a8cdc3f004c9e217f016aca36082adf1c934e47..bb4cc2d0cc774c6a3f040e9318f4de8376d46b4c 100644 GIT binary patch delta 854 zcmah_T}V@57=FKV&dzo=cXrO)QIGRyQK>^{6p@5BbxJ9@O`$Hl2no+H78*=#S?8p7 z5kkYCzQ_wP=q3y)kOhYQdZ84x;YCOcFDhE?s>Cjf=sPacAn3h#-rwi>-tWCqGkk=9 zWwn}t*uWVne9bk-ubPcljR2FtVU2giEtWZIa45eI=`*^8%d&naD#qF0eFR;g8B{|f zjIo_m7j#mmWB`p-*|2*jBO5EGEuKoBtpMmnu>zHypkhu2G^55UtY%U;&Bm$5NVjTK z%tQ;qZd}JZa4T){X{PPsKh$#+ZkEc{HBRLet{+9pRj#jSYqmqe=lSwlt4dFS!mHdA zOfy>>A?T6+^K08CPrz$@$RKKF#f*>I(z$lkqU2sAPY_LqY9=UQuTY6Z92T18ylwq~ zzpjeSVhN*D@fX2^WLzh>Q6X*;t31w4k)mmO2bJ3m2-;zsiv7Gmw?h>D$t&=Eu?-bp zx9^o%&3f57z>zBwA4O5fj=D>**S_iv^zS1}W=7}JV>dGo?tB`VPmfGyZqH<%-AGT} z3Y_Z+eSI9u+<*G<;lk&;3)x=E)ZZJ5^qlSv#Y=Omsp3c}kx0>9p}v%OtR?8HZ|SIS zXb7GRoakt7j7KFNaZNP95Uewo;-h&b$hppfP_SYvT@&&rZ4!NR|5IVX8txRKDxfl;nZh+(KvHCKfq*un zz~ngsp4OrW^DD&&m@ke{3o>)Ef}lR5#N+@$&B^|P+>=`bb@ipd=1b3IMyRahP-b9c zh-8?+)bq50Ig+8A5zgnI{6H{}QD(A{kg6nmEpHufB}WRFE@v!ffT-1!om?Pvjr$fy zX>n>%USe*l-{ux!YbM!S%;~8mw*=jN{GA+q;vJox{X_ji;yqo8a8yJR#MYJcRbx5E&H^I2o!EdvCxoPYwHZ$6IN1X^r*$0p zfYccqkm9pqOuo|0XC*+Y&dM?QDl?x|;0Cd^nS2eH&+3B3jXC|)na|oN`YAD=Q(^_O qH}92dWMtev*}EsZ|BQm^vu1+8NqZ>c|^83Jh73tl7F%SKiA}Ed{&e1@NrGP!f(PTJegC#oKa-5 zqd+vj=xRogVg?3AhDz>AvCXRm0vQ>_C;t_cXO(E-NRgbZC^VT-YVua0YDVeJhQj|D TH#>>evP@2t)ZP3>vQ`%WLt7wE diff --git a/page_objects/__pycache__/screenshot_page.cpython-312.pyc b/page_objects/__pycache__/screenshot_page.cpython-312.pyc index 8a3d61761321e8fdf7aeb05b4da0f133f00c809d..86c21359aa16d04bac4bb6e44ae92f1e4303eaef 100644 GIT binary patch delta 2701 zcmaKu3s98T6@WRrKf4R-M!@b9VIRfEBCw5*l13w%1bG;v4Il}u5^%w;!tV0JYFDYE zwz0FuYCPJ%u^J>!B8-NS{uYur*0#w^5{#3qhQV&fhM5i`I(;NEoq?vN_uQShgrwaW zzCHK;=bU@a`Omov4hx;bg6@h=mz=;pzRmhAzwg!MnjsmhO;3OpJ4{O?zlsS%-9~Jm zGb_1G*(R{RM2`;dnVtA?j#g*`&rDoksm8IlW++obX?V=?m~vLD9V3l;41Dh)^LKut z*`*1kdieKt*q-oX<#P$!!Ks&1(>;*3`S{E9`JiAlCX5xx!Pze;a@~<1xFZ(#Vf78u z+#!=IVsf2VMof#(?;6T4jpUcU|41ai{Nu{1NPbnsR3*>1W+`nOSQ6q!hUly{g)7S{ zo++$(s-&!ZeMw zGhxjkw(kV72RD{&vxV3qsAsUnBJref~by+#F3ZR@vrTGY_?wGiKKuzeNcaKn5SV$$X=Rp~TmYEQ5!&=P8ig$Zp@ zVY65t*pXQ2&0Xc49&S_}OT!~lvC-x;V5;xalqq$ggri6NSzjHT?ayX;RrntkM#0faDPPj?#cLVDfN#Any7EH4(1;f+1Z(=L*;GzMpqXePNwp1=3| z8ZEtb9zbw5hQk)z7cR@x0JApK1_It-Q=UK2>h=3t@@jn^(eL$$NjM&kYDq;*BFw-) z9mrH9fIM;Fcp`-4qc0g@QM~*1kbmBN_enAkc#HEmkJ0i=!nR*3!T3;jVk|fcltrk- z&$I%sPHJan^2q+TM}KkNsT4EO)^QGOc(voC)=n{4Nj*~zp3;K#LH;5?ke`qkKL$HG zozR0Hbf&{R9O<;fd|CZ!M-m*8&z#jLvc4^FK49D}pXhD!^*3%Ms@lkB2rtX$tpC%9 zZWOTw!xtQoE5C7JLdEKH=He(=9;2ua($gHm5rV`J)noIZUcPkcZ>*Gf_MIDfd8Em! z#x;5AoV1rsHhF}lgk^+Wx%b_tndOmz#RmRjpJ1A+#3xC=kgy6%2ZGKb61lr#l1d2q zWM4|sRCl)rPODiUFJAM&Fn)H;Y8I=Qo_Cz-IfZCaePex7y|1;zBYH6Rx)B^$c>Uig z@i)LL*M#dn(X%_I;gf$sk-TB>HGz3lMgvfVtWp5c@Zqo+Jq9UAT| z*FQ(eYG`xH`$O-Yh2X^#cea3l>bn`LA2F>RcDx(4%d77$)v!4C-*ec@$hMqNNe&!L zVtrXb8y?zNj|2CfHBBo-H9dAS;JOTpPMFf^HCQ`tgc3P4-b=+8$-=TyIX}1DQUYaM- zO0g^<@ByL(%Ej+8t`f6ocMgLyHCCRKX*Hr{yvqM~qD?Tj->ig#0NMR#1o(3*3`+Y9 za2-NYr4jPrQ2z@?a4BG?)Mtib)z9eY{gPmTyp#fxR}fYb9+w`sKvxPi^wfUtpR_=_ z0?tZ?4EXDMK2Z;bNgSa_Um*+-c-zN2o;Uj%^0$<*i$Dz~P7>DAvYDhIX>BGHsJyh{ zmyTvaoqaWvqciKo`r54lzt`7V0d@|2j-739rVh zr1Cm}*Cj&I5aA}_9|T?l6&;yC;5QDxiWbq57mVLwyneh^KcojmFprU^L4y+;H(qF7 z-gesi72)`q-{t~9pVXHJTOeJsyC56drKeorf{jv}3$n7pq^F}`I!KyLl7(SXv#iPQ Q2{zU*7hjj&b-~*I0ucq*U;qFB delta 2702 zcmaKt4OElY8OME+@Fpha0AYM2gg`JAgFq^C>xK+uEl@n_JO=#WLmEh+v5;gpL_P$m zcBgLm(c;y<^AoXiMLTxpZXN49JzZx{Pp937R(ra)JJX#_sdTkn^=yM~xcl6kN@VTc zbMkwid+&3f``rI~pPS)p8hTA*ykIoy=kVv3)?WXwP8;*h^k|x%dee$%Eq{-s<>CSHpjCUIV>tcFKJc7&N`$HPS_vI%>5TG~Myt33R{Z8|uUkJ8ge( zzS-2L+p6o1_lkEXbk6BgZ5OS%(N9g7l%BuOtM~{2GEF z!t~>vX>4Cktsa``M~ercmTfBxfNLhoMs&+Zq#`_s&4?lnMbjJ%b(2lZw&YE%v=zJi z>ED)SOJaV6eX00aHSD1$O3x-o2hrmhL^RjuBg?eX_pyC|ZmA5zLH1GQEj9?zX`Yld6p%9mW}lsJX@oXK6`|l{MD9DJ^*cdq)sI;ZW4!&CQCY z)8FD(v|fMM)70jxCZ}-tMT82`MeFLf7|x*iGsGDEbA5*Nb2MM0gHsl2YcRnZY;l8L zQ+R)Pasi#*;!q@C;0uDcd%EGbblhWyH|XMqG-hwg1GvamHD6RMxIdht@p?KwFTe7Z z-uv=q^yl`?qv$THeHR6u=0-H=JI4jnOM;hLE^BZKWY zW`N9l8zW)?5iu?%?CD`AjMDdp(_sPq=dc}enECk7T-d{2eo?1#d|slWYD8F3rV)01 z^hTVt1!H#6i|j|4UpNV`39^wMekmLB*sCv1N?ebZ&yIto7_;7mqj`uy#B&@@P%DHz7^3hYMBs_&w3$ZU3=M*58B8m}t?A+_CaHi?}k`(dDzR6uH$iq0{ z5kxtyKOb>cpef>2qV*`^Aq-H3R&2bf^UrH}yrY-AHCMUARC0T;$=~KH$_h7=U|UOU{72*q2U=NDk0cFw=3U%*D|LV~j z-+lJ_z!2$S559i^oR~(;i@6e~1O=wDQp&JDpVQY{Lgjb$m1XZ)e-rU`#gx^(A(0In|^ZJ5W$kL*KoIX$IfWry+pVy52nD|&?Wm) zp#b)b?MnrhO4GyFlbM&@M$RLzKy@EijURMHE{@W4d%m zSHUUSkpX{My9;x?SHa}3*gS&xHA0lyOqGcOTY>S45Pb+dhh!453Y#Ic-jN$@P%1r+ z9Rc~c4VvuBxvj)E5ufLYP|zRfX!HkKf@CFnA3_`+dmt0;8Zw0D|5NvTvQtMYT>YDHO%Gx-VwMU* zfMFasfe=#s9<6r}e?;6uh;7H=l6SGW5G`@#6{00H5_hGLOvtku2PzLywiB^P|_zc0?uaR2}S 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 53f2bf00a4b64b3cbd58c3ea3e6050172eab7e30..775c336c4accd626a4e48b140b68548faa7ddf64 100644 GIT binary patch delta 61 zcmbRHf@$sxCf?J$yj%=G@Iy!>%W@-c|2oFh&2!gXVr10WT(H50i7|ci+D(a!{N93$ NlAjnrWRW~jH2{DF5|#h} delta 61 zcmbRHf@$sxCf?J$yj%=GFu!YarshW8{&kGWo9C{(#K@?zxnP406JzS;wVM(d`8@?0 NB|kBM$Rc^5Y5<&%6E^?= diff --git a/page_objects/login_page.py b/page_objects/login_page.py index bec8b43..fd66518 100644 --- a/page_objects/login_page.py +++ b/page_objects/login_page.py @@ -122,6 +122,12 @@ class LoginPage: pass accounts = apis.get_accounts_from_server("68ef0e02b0138d25e2ac9918") + + # 检查accounts是否为None，如果是则设为空列表 + if accounts is None: + logging.warning("获取账户列表返回None，设为空列表") + accounts = [] + matches = [acc for acc in accounts if acc.get("username") == existing_username] password = None account_id = False