From 10db652cbc833b7d071eaf6cd11854977da933ca Mon Sep 17 00:00:00 2001
From: YiLin <482244139@qq.com>
Date: Tue, 26 May 2026 14:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=B9=B3=E5=B7=AE=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=92=8C=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/actions.cpython-312.pyc           | Bin 11718 -> 11718 bytes
 __pycache__/check_station.cpython-312.pyc     | Bin 11178 -> 14468 bytes
 actions.py                                    |  22 ++-
 check_station.py                              | 130 +++++++++++++++++-
 ck/device_b.py                                |   1 +
 globals/__pycache__/apis.cpython-312.pyc      | Bin 20668 -> 20825 bytes
 .../__pycache__/create_link.cpython-312.pyc   | Bin 8654 -> 9819 bytes
 .../__pycache__/driver_utils.cpython-312.pyc  | Bin 41631 -> 41899 bytes
 .../global_variable.cpython-312.pyc           | Bin 609 -> 638 bytes
 globals/apis.py                               |   6 +-
 globals/create_link.py                        |  52 +++++--
 globals/driver_utils.py                       |   9 ++
 globals/global_variable.py                    |   3 +-
 .../__pycache__/login_page.cpython-312.pyc    | Bin 7244 -> 7682 bytes
 page_objects/login_page.py                    |  13 ++
 page_objects/measure_tabbar_page.py           |   4 +-
 page_objects/screenshot_page.py               |   4 +-
 page_objects/section_mileage_config_page.py   |   2 +
 18 files changed, 217 insertions(+), 29 deletions(-)

diff --git a/__pycache__/actions.cpython-312.pyc b/__pycache__/actions.cpython-312.pyc
index a725faebbf013c4c5bf1b399cf14432ef4c5d8ed..9d06141c02b3714a9bae5bd21285b2822b4a4275 100644
GIT binary patch
delta 20
acmX>WeJq;$G%qg~0}vSGZr{kgTNeOCsRlIw

delta 20
acmX>WeJq;$G%qg~0}xbcY~9GcTNeOD2L?C*

diff --git a/__pycache__/check_station.cpython-312.pyc b/__pycache__/check_station.cpython-312.pyc
index 80eace210b3f8ea1034a2d3d4e08861ae9ee7eef..59327a00f4be42a047157f709996fb538e7d75fe 100644
GIT binary patch
delta 3954
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
UQ8kM(^S=S2_Ycb1Xkp=h0hf@69RL6T

delta 1253
zcmZvbe`s4(6vxla%WGbKy!VnOP12+pX_B^ijk?x$O>w2VU)GAoKPJ<@KNh;YM;rUn
zboZsrTGVw~#rcnni#m{je>i5XI5mSI;$W@=L4+1%E2%;MnNAR#-9QoiaqsI81RuQ5
z{oZrlJ?GwY?pr$g-c!<-qUZwpY+Sie+}U$V3Zu1CUH!+A;ZPkKXvh#sPSuIP(yo$Q
zbz7P<JS9;TOOh&;WL36ocEelpsXj~dMsvxp1`ya_1hl3l&>Sl^mIpv>(S#*XgL+7F
zPNe~G*amvb%C-~KupWM<kMy=hS`o~nd8D|0Vy>Km>W;nh72O<tg4~N<@;*k5Z-Ndg
z(m=Io9`ZRFw$snWn#=YU?+#EmZeeI9A3E}=x#kr<MuBCNTZUzX<J4m!ia1V?YtDY@
z5Hs);i}1bRsYP68IG=}3vB)4%Jd9=Xh4@OJml=W#R*q(-LJVPsRt76?gsCV)8+lPm
zCmdAPZKM0^e8DIdrtl8tvQsE_Ydg4|d?lq&f^11c=x}YP{CX2=BUf7<6j%_&h2z8%
zEK>hma1brj&Ii{y6d@-f$#@%!^f*PGpPiY}aouHB#&N~07AupAgRWbRJV4j|9T`IB
z$WZhR7wZH^-`ffDZ8RA@2)KjJ6ol`m1MZ^uw>Gg@YTyzx_$U@(L-t>n)9Z5jYq@((
z=*9}Q7Vb8dN&r?uEA+M6`IulMg}wlak@c`&Y+hmYrVs6_pLpXLw1*7E^Zu#^&pDrW
zR#6p>abr+LN}%>ZTtM`27u)xSW?6xMxcKRfSKq$*+511f@X3vLKDv3~EcvTl3oiHy
zlX_t)PmfzEmZ$HVnVxu3k;$`(M>DKub$g{)((Alw==zM+t-5TE&*^!yfOUP^oGe$Y
zvi_2oYfrH6IXpYP;N8b!9=scpS}s$UxmbHS*^MGi;1pkTpLAarlIucpEtUO77^F4%
z{Z5E%q(=H<a5);;PdTthqQe!wi*hv<IFRO6`vk__$pcC5YLcf~;c~g0B9hZR9VkgI
z^|X#o(@fav<^)qkhGPt!46N3e?Gv*<)&gsaxsPHAZrf6PcIy$FjTg7Pq@%YZi1^H{
zrrmttw0Q^Uu)W?@o9OMdd#x~IEDXb+P&>101PPJti+q&)Jg|cVvK_v<JYkfNj2rp6
zaa<ffV(4Tz8$w=kC>wXPtBYB?aT7U_?L-dpZZ>{gV1|1btW8=e=IOL9{-;&{cdS2z
zp;B3!HS}S8lCEI4#XL-Li$e%)g0u<lO^`Ri-+<sI_!`jLfXsJLUWal6b~WIk-#k+u
R4h4RNDax&<9b{}U^AGD)EGqy2

diff --git a/actions.py b/actions.py
index 9be5efa..43a8cce 100644
--- a/actions.py
+++ b/actions.py
@@ -48,6 +48,11 @@ class DeviceAutomation:
         self.driver = driver
         self.wait = wait
         self.device_id = device_id
+        
+        if not self.device_id:
+            logging.error("设备 ID 为空，无法初始化自动化")
+            return
+        
         # 初始化权限
         if driver_utils.grant_appium_permissions(self.device_id):
             logging.info(f"设备 {self.device_id} 授予Appium权限成功")
@@ -303,16 +308,19 @@ class DeviceAutomation:
 
 # 主执行逻辑
 if __name__ == "__main__":
-    create_link.setup_adb_wireless()
+    device_id = create_link.setup_adb_wireless()
     automation = None
     try:
-        automation = DeviceAutomation()
-        success = automation.run_automation()
-        
-        if success:
-            logging.info(f"设备 {automation.device_id} 自动化流程执行成功")
+        if not device_id:
+            logging.error("未能获取设备 ID，无法继续执行自动化流程")
         else:
-            logging.error(f"设备 {automation.device_id} 自动化流程执行失败")
+            automation = DeviceAutomation(device_id=device_id)
+            success = automation.run_automation()
+            
+            if success:
+                logging.info(f"设备 {automation.device_id} 自动化流程执行成功")
+            else:
+                logging.error(f"设备 {automation.device_id} 自动化流程执行失败")
     except Exception as e:
         logging.error(f"设备执行出错: {str(e)}")
     finally:
diff --git a/check_station.py b/check_station.py
index 76b5b89..0c02a46 100644
--- a/check_station.py
+++ b/check_station.py
@@ -3,6 +3,8 @@ import time
 import requests
 import pandas as pd
 from io import BytesIO
+from datetime import datetime
+import os
 import subprocess
 import globals.global_variable as global_variable 
 import globals.driver_utils as driver_utils  # 导入驱动工具模块
@@ -84,6 +86,7 @@ class CheckStation:
     #     return device_id
 
     def get_measure_data(self):
+
         # 模拟获取测量数据
         pass
     
@@ -188,7 +191,14 @@ class CheckStation:
         return result
 
     def main_run(self):
-        return self.add_transition_point()
+        if not self.add_transition_point():
+            logging.error("添加转点失败")
+            return False
+        if not self.take_screenshot():
+            logging.error("截图失败")
+            return False
+        logging.info("检查站点成功")
+        return True
 
     def run(self, station_num: int):
         # last_station_num = 0
@@ -247,9 +257,123 @@ class CheckStation:
                 # 错误处理，可以继续循环或退出
         print(f"已处理{over_station_num}个站点")
 
-        # 截图
-        self.driver.save_screenshot("check_station.png")
+        # # 截图
+        # self.driver.save_screenshot("check_station.png")
+        if not self.take_screenshot():
+            logging.error(f"设备 {device_id} 截图失败")
+
+        # 打完数据，截图完毕，点击平差处理按钮
+        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):
+        """
+        点击平差处理按钮
+        
+        Args:
+            device_id: 设备ID
+        
+        Returns:
+            bool: 是否成功点击
+        """
+        try:
+            self.logger.info(f"设备 {device_id} 查找平差处理按钮")
+            
+            # 查找平差处理按钮
+            adjustment_button = self.driver.find_element(AppiumBy.ID, "com.bjjw.cjgc:id/point_measure_btn")
+            
+            # 验证按钮文本
+            button_text = adjustment_button.text
+            if "平差处理" not in button_text:
+                self.logger.warning(f"设备 {device_id} 按钮文本不匹配，期望'平差处理'，实际: {button_text}")
+            
+            if adjustment_button.is_displayed() and adjustment_button.is_enabled():
+                self.logger.info(f"设备 {device_id} 点击平差处理按钮")
+                adjustment_button.click()
+                time.sleep(3)  # 等待平差处理完成
+                return True
+            else:
+                self.logger.error(f"设备 {device_id} 平差处理按钮不可点击")
+                return False
+                
+        except NoSuchElementException:
+            self.logger.error(f"设备 {device_id} 未找到平差处理按钮")
+            return False
+        except Exception as e:
+            self.logger.error(f"设备 {device_id} 点击平差处理按钮时发生错误: {str(e)}")
+            return False
+
+
+    def take_screenshot(self):
+        """
+        通过Appium驱动截取设备屏幕
+        
+        参数:
+            filename_prefix: 断点名称
+            
+        返回:
+            bool: 操作是否成功
+        """
+        try:
+            # 获取项目名称
+            project_name = global_variable.GLOBAL_USERNAME or "用户名"
+            filename_prefix = global_variable.GLOBAL_CURRENT_PROJECT_NAME or "平差页面截图"
+            
+            # 获取当前日期
+            date_str = datetime.now().strftime("%Y%m%d")
+            # if not date_str:
+            #     date_str = datetime.now().strftime("%Y%m%d")
+            
+            # 获取当前时间（如果没有提供），并确保格式合法（不含冒号）
+            time_str = datetime.now().strftime("%H%M%S")
+            
+            # 创建D盘下的截图目录结构：D:\uploadInfo\picture\项目名\年月日
+            screenshots_dir = os.path.join("D:\\", "uploadInfo", "picture", project_name, date_str)
+            
+            # 确保目录存在
+            try:
+                os.makedirs(screenshots_dir, exist_ok=True)
+                logging.info(f"截图目录: {screenshots_dir}")
+            except Exception as dir_error:
+                logging.error(f"创建截图目录失败: {str(dir_error)}")
+                return False
+            line_code = global_variable.GLOBAL_LINE_NUM
+            if not line_code:
+                logging.error(f"未找到与断点名称 {filename_prefix} 对应的线路编码")
+                line_code = "unknown"
+                
+            # 截图保存
+            screenshot_file = os.path.join(
+                screenshots_dir, 
+                f"{line_code}_{filename_prefix}_{time_str}.png"
+            )
+            
+            # 尝试保存截图
+            try:
+                success = self.driver.save_screenshot(screenshot_file)
+                if success:
+                    logging.info(f"截图已保存: {screenshot_file}")
+                    # 验证文件是否真的存在
+                    if os.path.exists(screenshot_file):
+                        logging.info(f"截图文件验证存在: {screenshot_file}")
+                    else:
+                        logging.warning(f"截图文件保存成功但验证不存在: {screenshot_file}")
+                    return True
+                else:
+                    logging.error(f"Appium截图保存失败: {screenshot_file}")
+                    return False
+            except Exception as save_error:
+                logging.error(f"保存截图时发生错误: {str(save_error)}")
+                return False
+                
+        except Exception as e:
+            logging.error(f"截图时发生错误: {str(e)}")
+            return False
+
+
 def get_excel_from_url(url):
     """
     从URL获取Excel文件并解析为字典
diff --git a/ck/device_b.py b/ck/device_b.py
index 755d75f..49f84bf 100644
--- a/ck/device_b.py
+++ b/ck/device_b.py
@@ -87,3 +87,4 @@ def main() -> int:
 
 if __name__ == "__main__":
     sys.exit(main())
+ 
\ No newline at end of file
diff --git a/globals/__pycache__/apis.cpython-312.pyc b/globals/__pycache__/apis.cpython-312.pyc
index 6b2fb5bcc7977e01fe63f5dee6aae6697626d212..6d30a659316a85a0e7aa18935d2116e8f5de0640 100644
GIT binary patch
delta 1872
zcmZ`(Z%k8H6u<Y~zP9hZwzjm;meSHvKv5~^lsc?v0f8DSpmUo`6d6w^6>)og=yb2j
z2ThiY5VM=?pEGgpgF64=x-2f)2ZJK`Zwtv1l~4O%vMgB^682?FmhIeET0^4m!@0lv
zJNKM>PVf2k$FK0y^Vs&lY84TD-<^FrP@cSDyT1}Yqfb|san}VJ!Q~|xgN8JNZ1|GP
z@G>tOWfLGHy%r15WwlOvpw>@+UslAa0v)R_E77pVYereTB3(AHtO#XHnu*4_V!?7C
zija~}d5UZN#HzC{I#(N}*JFNKAMx=M0s{7i-%re%nT~HLrl%rBICtK)z&whS;hgWk
zh{YsoV%iNEyPE>EzRqElG_e)!>VjJ>nuTR>dN1RJI;@&CjYr)%o_<tk!TJe$wSa!E
zvx|~ujX}U@kAYr|m9Lb`RbMV1Ax+BXI)mikS(4vj@N7r9zGzRq2ixh4zsy{Tlx-Oy
zM_V0gaUqRB_pDyQn*MlIxlcGQoaRRB<f06qBlrk<pX@|Oa2Tm(`pw2NE)}3%HN|{S
zAyeojnU+BO&_q6uTBzZ9<jZO(XOVjfk->bS(7^NHikDm)X2IrsaK3zvXxsq~o|`*O
zM*Fj0ypqPHHJq{=QqPKg{r!iAht%EyS=kB1u^5dv$Fe)twqR)=?3Mk@4A8F|zV|wm
zdKThn@9b)hclO3xTDo>@eXTdqO0RD&riY?YY@-*VmAuji$LND-g0}$(QqQ_I;(LIi
z@c3zkzP>Kx*@}g?@H6kS$KJ*nZ{vqso`hH2Y@8`+%br}fikx_ZLsH3S(l288?=%Y>
zYi{glLbpYGdkMN-8UuXCy&UW$SIVqE9)M-4#M!Z)Ox46q9Svl<-T>5e0}s^ndcts%
zKUq!g`QoN6OUeDEC9t`_A#Umv$V0&bn}@}5Q!+#zh4>_{rfXv%+bz({r%1*bEOQx-
z*5QCVLqL8+CLlTxArl}IqQHieeiHLyU3M;zodJZ$T@ebhGt#Y*0KF0m8e~y3(x3!d
zlWYc%n2|}02U(_k)WJFFPXWO!+jVu;&{9u1?<lw?H<XcuV@}sQ=rTMh`!a$iq)TD6
zVM1wjliMlCb}!>a*{z9(v6A-<Hn|1hbf3ijGlFudhCn_(O*(_l8Wu|khF%|ABTQa*
z#>{FVlIo_{>Vq^@E72;Ci??XTlt(Xn??zA5eB6B0DqAzKF4m4-CYV$pkDjloAd?i?
zy>LTW?uIq8Uv=jXY36)ohf&%p2VU$^ysSjpx5?vQRES!U&jXD_a@V{X()+G>QKrSe
z#7>lJDBoE2&rR)E0QD%4Rq3PA=41Hn?6=KJu(6*pa(1faH!KzDQc+SsfjGALEc*Fb
zQ{TG-y~E0&;?kp;IY`}Y6}};Wv*Nx1C9U=jr}rv~3PjohCP=rp)vP)S=yN8YL3s2L
zH0MD}TJcEx6Ptac{Vy{r3O#nLo^h-m+495}9&ennHD%AYCAq$H@#?l(G-0xDHlYc3
z4DfANE!aC;1+!Hlu#+Zd+j25l8aK98k-I?yP<N|%pzbaw4A=S-eljJ-T^(UE9k#$`
zx~?+eA@@9d!k_I<Tp$ab(|<cp;}7UqGRYr@a{tKwn)Grjn0{x;z>uo29u(%egyz8_
zg-ydh=GehQ^6=o^Cgl{Z?CxpbgR%W${~TiL`2L&ft(Ixmt;7!}W*WNYb#kti^kD2d
bw|x$=_2Qf3{g-yl>v(=27r;fzNyz&@eZs)k

delta 1833
zcmaJ=ZERCj7(VBodwY9t+pSx_yMAnJkPO;k5w<RlZ5>OuP6`8JB1XW;fzdHx+!iK!
zFAz;kG|OB#KUm}=xR?MABczFughUuH#_$89KLlgKAEPlbEZHyp<$K%S!Q!+@-}9dL
z<9R>sc^*#S>mTE?`!<`5;CJeS&oggtyjnIJ!BgyEB;YwGA<C;LgEgKC)I`NIoF?Qj
zi{Sw4i8^pW<Ef<bY*RGiRk6ye0+laYCV3qXA<d+k2F$F2b4b?xO$aF|$R3RbOw^`3
zPByG7VzAjYe)Gsx34ztd#(JvQ<MljCc%1A)LnVYj3QwJ?$l5(F_M{<z3!1~zk0!ZN
zB}tXC9zg%9Js9>*;-VF!4B7^NO;)8&v|}@LWKk_Tio<8bXjavl#Uq}goqe|2iVG3!
zJ3|WwX_ZljhRzUGR;?{iU}OuAira|LaL!XKiI6HA(5DftK1+-n2G2G<0j6Qfb3SZk
zxISR6L&{doTr~5vB3HrQZ>wh24X%aNgqzLB%wyb0h*oN#4dY?-CfSaLaV^S~7LCw=
z*Qo#W9PqQv^)6w{Q}~*t;L8E@z?1==E40OW*9heQy9(=RuPvknjJhz;GZmLDRk2o2
zH5;kMI4V)O{qQ{%Zj6j<&0l{$iv?vTz~(#Fy@xG(KvVj4v5)=G_ysO!6HObjjXi0q
zW8Qd*w}Ff8jjxptg3<&pAluJAiPzZDSb7CN_SBq@KX6C#zr<tY_)8qJxW_F&%C&!G
z4?*;3M}2n`O*PxQ1awPk0sXdVr7mNBkaw(!5FB>}NB2r{*P9T#my?+=52l&r0+?o2
z5?zl5(=KvPPKZ5jGV6B3Wj2x!UyPIcaVuQD<`ZJtPQI}VY3yR7Ej4xL;NzV_6l<7r
z8b?WiX@nNI22A6n((7Us>wWCgHktLyZU+I5ahIh9h6$>`MtcH0E(M#YtO^72$%bkZ
z&`BuLi2x7T&}tX^HYCZ^UZ7&V{&eesR~02+dusp}qJqw6cx6`2S%0p?C;ge}Y-SU!
z?x304eXu)Cq8?Q`f|Y+q{od-ffVU7O7nxE`{VD=pRH^c5be3Pt4S3HBoaog=qd`l~
z!J>RMXWXqY@}V{td)(%YipRvGHfq!0{10CEp~upXy&5a<ZRb<$KoPr<26GN0Ocjl`
zj-afKhL-jyzG6S@=XPIsQ5(6Cfdo`&Flw>Y2`RQjjm2x&j*7z=L*+AxF3c%I>{`cL
zxG%qULpe6R4)DtEe5&&|jP2}&<W{#u83NlQv2Q4|>##DYIQ5AA>|%16e^7VGdoxNl
zx9f0rkD@4G$XY<KUz7DKhCvzExzY#3JAvlBsJs)O==!P5exhs6jO_mL_=B>#d|OwV
z>-#XVA{jt88||HqXv)+A`YjUGWo#M9+s+zYHae0%az{#-l1?&R&Vy;%DS&C(M|3?9
zOj*fvbHdqONoFdoaG43!r9^U16jIjwpQ#I^G#>jXJ%*36Rh!a+3O)Xj*EadMRXVjF
zk<5XdqBpMSo=a#RBvSOH|7~u0;~+gexTjTlm)-2$(zOdVbaD3_($6dVzRca&Fyp+D
qx_12g#?A8u<6H;n#n^d%+Z@u*i!Wc<eQC#hL7%5w2v;ia0Pa6;`k{~j

diff --git a/globals/__pycache__/create_link.cpython-312.pyc b/globals/__pycache__/create_link.cpython-312.pyc
index e1734320321afec643f51e620c644660b67eef62..8f844f349e718ad14d1736571e69757b538f38c3 100644
GIT binary patch
delta 2566
zcmbtVYfN0n6`r||-Fx@J?%fCPg$pdDi^a<##Q_^k47iPBB+IR9JC(QVy*JKc*d?=f
zjZMK=sj7lQ3eo&9QS1g}M<OA$NkFyhI&mLTY&A{07#foeKiWtOM5^Q!5Glex+?nOs
zCjUBD^WAgLIdkrrGw00t+rH1AOZnJrHUKi7S+%!ZD0(mD5X5tgs9zzhOF+bJut-oC
zg?*PB)8QewTPgsWK=tWx15^d6ijFAoV?0r)w)&Z4;4tU_XW3(*1A27$Q&=Q*@)7NY
zl3g)f;8ZY#R1c4zKv!{0P=o%E5(u7(=~RS5DD2^okr+lM3T6rx0z^HBk&Q92@vL8M
z*8-s+u4Rt&q!W>i%y1il3n0PqeBqpwbt&hyoMHW__J@Z1TJ(e(4W5~iI(l`p7Uw{B
zU-v^x{*)zu+TxB1?yu*JjwQf+bJb6j8A<)-k_Uo2!4vh>F!jpva%B~`xu?F0{p0r_
z!HK^!b&QQV6*Gj}TLW5aAgG3s9n1V>n1(;#Wxk9EW&8#IDYFdlZQXbQ)%Gwkvp*CJ
zs(!jNZ$Lq*gd1k4u8h*~t9mzINj~cEZ}k<hd}2|*z`-mWHF;n*UNu!XcM>6@rcoY+
zd<vC#uemV8P01nxF+KeQwOvA4rTD!0Ao1z1=6t@EFd8S8&66;zoREGpH-|_lmdxdJ
z>~j_gB2YL5v_kxZNyo!5)!hYKbeqbX#29s*jBcijX%TU8TDA@XLK^W8q&%J_lo^L4
z*N<3*JN;eaja7qd3jk2`UEmF%2v^v#bshxgL=lKUlQwi(=$Ze|Pz;Ju(J3a)i6yJk
zXx$LEq~Z#zy=>d}hGgsgu6c~^kqihFshiib@b9E-JYW@B-8%h5679N9QYT&fX|g#q
zB7z>+!eYY4BhdN(#i8ok;$ZvsIA~dGo&wO4O#{n8u;pUUb{Ap)$hNTByLb{-$A5*@
zLP|Mh!yGAPV(S<fg#G0kwM*nQKa+#VQ^>!z4k~5qfR2H47HX+yQ#G%f+oo#Ooa<IV
z7q_wO4RD3opy`hl(9NCa&RN#p9dMfy+nr>oZvT}HsmIy;Wtikcq=5VZpR|=a5lucs
z!_+BO?5rv+Cr<_b#FpN3^Zoec(Z#!iizEGy?({B<-G~odmA|4#|L9KN4?7LM_Vz%e
zt<>M9bTTDAGTS{2qPZ5+g*AoTPmvn(@x_&XdH(V{^L-!2d&lLiHIMG}FW$JhFmiqI
z`Zc*eX-baYe1HBoR|zkEy>GGj>Mxoi^16j}g~KX3qaryzcq4vsG=A;9#mTp-<u7ya
zUu@-=wO4Q+3)+c~+V|>_gDgZ=Tx(D7iAha?R<${#HH9KUrIFs7sEUer5%B0^#x<wB
z?IEP02EvPR;gJ7y@>YpKH72zA&U!n10gYT!nh$ASEzqWh^+Zu#8z_w~GOY>MjG@DX
z^-D6t^F1U7E`V8E>V*SyoESBgjT=Y1Z#6{?`)0U?gwDX5KNp<qm+jDzH&48NV)V$v
zlDesqx@pVaUT#(}4OsdtLvTjOoRyrHa$n0G-ZA>KXkN{<w3}SHL~Q6Y^qXdl(%_+s
zHFG8@>ezkj`CA9?+oQIFGp6QeX6<PS9+=V+DMsEoC)gee=~F`btT|(-ayV;LncR2F
zI9=HgH8sxJT@USrQ})75;wwET8WNfK$Bsf)6eaw!<E5T7V6+T)`aG}f7&1&5@`sO3
z8%kC(0dI(!N=9ECJwARWYN(yz>Sm4BuU8r&Fgce1<jpa`lwisG@rnbOT(pZ2U(C^z
z12e*NpIIF1oh8Y$mQUKp4^5<w3(=IPXN2lGi{mlvBhJSwGI-vaLF|drXC^DLCrYbf
zdStkMXVVVwC!wBcssVqlsW08X2Yj?cY}&<sR0S#4IQCbw_auR0M%w<T*n3a$l-?tL
zUu5qKkf0ynDaHZMPxzd*5aNm9RGBU6GW!`w`ZKq^mJ7BD@f`5Do6%nUNk&<2J#hqO
zQlRC8vMJ<HNS2rjXJvk@dzyZ`C;pxJHtdPylaKZKSp4}1^Sy)di*Lq%e|ur<mHA7<
z3%Bns-u?Cbuim0bO;^#o1?5t(Q;;d-QJ`jG3{pwmsXpX?F~*-lp-4NTooXx7V|;6<
zgH$EWOk&av3W=0VfWAZ58zbS9UPV0<@RJ@)x(q-b3dPvwDuy+9kE@{|ndY{zszutp
zKINphBY@OaH5^6?(fp9i@ay=RYtm@3|I_AL291!<n(*h`h0i8ZfHmuZkeN8ZQ07WA
zL(|1jI>VLC8ZC&n(U{=%w)p}<uh#?7Uc&G&B&_tEfoL~EM=4a{<MO?_WFV6Lo3{D2
zZPHyO{h)?|zBbkCeH$b#C#!Q+*xeRVBCTpIdI|qDud-SX3zxH9P+qF#pl#Vy19O)e
km~tpB1>p-2S`)`vz?phGAFvt!;!^*?rIQNcGL!cH0}Gm!<p2Nx

delta 1694
zcmaJ>T})g>6rQ<v?(W`uckeC>3%mU8!Xmv^+NEG>f$|f6e4rAH+E`7x+3wx6OW7Z1
zFQvsLkocg)CZO|BqV?y6ga%^J?L&Ri7>y=P3<wI|lEy}p#)l>pYGRt0ICIy9whzu`
zzBzNw*>BF=bLQMS@nes2)8UW+9bYECh)coGl^3C6p<ABL-E$PKkQ8h{OWYzNAH#M|
z<;fYYfh`|!Rh){*9nMee{K>Ww>g%R6qf(dxe>lo!PEVhndw!wiYxG0Qx?^ane^V}+
zIX-=SL#|$xtJh@z3i9t#XOP?GJ2^KaFr-X+B(9Idld%kTk#5UXSWIqP{K7NTSV?&6
zFC6xeTh`?|=B;vuBbrJkV^KYxN`~VaHUr?O$?wO-<TG1P2+>U&*|0T1Pfir?BIqUe
z9V+yZ3Z=<&h#E1Y#?=gJ7=%bfsrLn#7^GlW*$IsMX{I_zK2ctvG2K&Yg;uKQ&XqW?
z!%7boqjc^KkxJ$#oaM+>Uubd|?V0uj4QYaA(X6_)pvr<pn3vBAI=hBBhHV9DfBk>!
zl5LS4P6q^<I01E8&Tj!2mWZpoT$$kXCsf`nH%<#73(wPo@w^B$NdqI637*WBm-+Z%
zrNFSiX8B<ku@_e~pe!0L-q#l-O)gvq0_x!*gT(<spi&u&Aw-peCY?V(k8|n&-5UVS
zo&_HQ&G8Yx|L04J2y~fDxhuVoaz1&5p~tQOFV8>1>dZpQ>UxZ|s1E4fLa;%Ac?eE{
z%L8NJB7X{uLDl`f=UD5w6iKJ!qlrV&gf`AKM#jaaBS#N~=&y-x(<+CZl)|uNbS;MQ
zpJpMk)L}1imWIfi9+7mGHU;}t1)JsOVBW$|DjiE2d`8EHwYTr&;43Fi;AWzic1;>$
z-^FMw%_<tVP+!$z$oUAu=@ixtTOx8XJQj)T^sVR-tcUe@B8GbyE6Svz=ksrXJz>8&
zFiVVK&-><y@E}#aMQ28(pM45!x=W`9wvf1DKfK%}FHGF%Uy*v&QSTN~Hc-hbD%li0
zv-;fY3&HFB^1xcCYsJ>R<@9Yh1FO!!p756y36^a;DfZS|WU=UXyN|Sa-<YfbvU5hA
zR^L51C#_1gpT4>#H9n{Yg0y09TsXJz+VX`Jsbd{=ZpyB|AIQMv+W}B4`ql2*=IQz{
z!@~bY=swbW419Y`>=XF!5TqET>b=1p2rKwqjXtw0K!X#Ykow$`uMxucaz?qIcR+9n
zAUf5$LEKIP)rV_3>A!Fp16Byw$Do3NnZk0Cs=jG?mhA(%u9|CbQg!CD$l4FCWZ+^@
z#bB?87#xn#f`~<M^qe7_#i`LWX3YXOGhj(Igpt%3Ef<yuN@;eRT4t<cMtL-ICalFS
z#G|we)-&}}3>p9+Gl2u}D7g{nr9J4MfL97r!#tgtw@FRyb=ju;=C0ZWeNa$xw`;$G
z&)rvmsN5gmm<F>hW!S>uL?oUJhgFE%sY2!Gw_vLev(m&bF=!@tgWq?Wmo(cW>!SH9
zu!u1`l@TQ)iC8#%4VcVkp*^&<CsNwzNUQ^okbCtltvn3umQ+FiP6vYSU3(j>+3Dpf
hV9`!5j6$evzsv(<e`owB-ggI;{*1ia0zl;^-@hY{Y}Wt)

diff --git a/globals/__pycache__/driver_utils.cpython-312.pyc b/globals/__pycache__/driver_utils.cpython-312.pyc
index 5daf3b16ed269369746f3f7b11bebea6af64c2bb..19c7ca9ecede32b7176f93a8bcfc0e8062fd745a 100644
GIT binary patch
delta 2667
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
KK}#^5Nd6DF|A#jK

delta 2565
zcmbVOZEO@p7@pbLy}RALk8W?T*Sp^JK6-7X5L+n*QB%`Pg<z3DThuC;7$+&vP{VS7
zNA}thkp#KWGm`*P2t<jI)R>s{hcPh`4IiOJ3Nae-k1;CIU&QjmAAZf;+_u|t`on87
zJM+HtzVGuq^UkDGSA?^d1pl<prvUo9_vuGFJl}ojABzc(18XAolL#}`-qh|CTw&eG
z{^}EcN2I8)CXa4b$fT~5;;_6O0xV+51lWb$*n?%PV0B1dV)It9`R=p%aRAp0$wOj6
zz*+&BLJ!#XIsgSx204k8#$$D+h->Lz@O^zsWPqttG9_|zvtEm};RgUPI!uH^2Yl3l
zNJ&pfbvV3JB^L)mQaz4D0eR@9I&q{e2Z^>T=EBkYy=1yCz{qvRrXVi?!4Salw_(9$
zx+tP!G`D-6Un5T7r0E{=6vY3F5v5EwIkzvQrtONjiD&~s@@2o5M7QcFQ`MhhC<mKO
zGzrcKb|eHQG@>TT1vz#A%z2-~=Cb!6pxc;k{ebGG4fn8F6M(=LsNp_=>b)gcJpC#f
z1pDE#7V`JN)7ID)kAM^-OeUUvOI;-ZFb?i{faJB-KG!MuQ(0l1B3w~ctXm_!3<(_8
zt;y$iA^40Xzo@xj&T7E#O7Nuh`HrJ*IBRX({Re_xt9NhS4U^U-vr`CfrOkN)U|0}M
z(L}?vKuItT%49-Mt`ST)2{59KAu=v>E}fBVc9e%SuLD(PiiWb^o*v4tG#(H0XxACE
z5J7uQCO?m*$eVhj&i!tu-z3_RkWlcj?n-dK*Ywac5EpV_pXu2Lj0U!+Qp4}eQGz2`
z=3CF>15O{VDae$nQqBR54@||B8D--Fy9FFSJyj>0F3!eXVMDYR!er>6AC{ZE9&@wi
zEMkJ4VUju<_0xV)sB-MSC^?PX?2mgLJe*t~<7sM5g=!ouGoJ4v`UWt@&~VM8g~baM
z+bbO1avmRAs#W>qSpE6KH9D9!A-=!P37aF-<OQW^FaF4TwWGo_><q}OGL>p)#FlO0
zn~M^EK1N1g3%~?Zf~?-`V;3sI%hsF1;v=ny<0xGb$H&07^QegFTO5^-=G7*UD?hHR
zb_N*z1vdw*Q~-N&0do9MQ;?s+f(i}1<dcq)g8(Z9_o%xh6mQ$}yvl9+;eNnx<&uK!
z1(lybkb~570b2%BCFc&+b(B-7qbe11f+nN0Mah!(c8We>KMl6r4NNE;bKbc@F!IA9
z%HP<OYbuoE<)B7NJa#w*CDL^`Oq-QnNM{TCpb6{?YjiP{mvI6K=LuJ7pFS>Jq?&N3
zc!#T>tadFHH06qQ^MXldL3_`LXQ}R0pghcAr+Ai><Bdu?_2O^?4!9$64svA$WD|Sj
zamE>xS4U1QIp|}y%ypG8=d0LU7CWg|0onfF*KHB76bIJ#@4#$*@~S<nrWAk14WT3z
zn`k$mU)ExsKk^84u?O0yCF0RZxYjy*G>K|8Bg|~|Y)G&nVtswA71pez{{ZY+Pani_
za5oBqy7gdboiz4Fx7eqGi-ESM=(whP1zmj6l5Om51D8daE-w4K!}N2dHA2U$Le{;Z
z8C+B4-d1!???%08G#zFMrsL%?Em6mGD`J*5c?0!!W;VppOxQ&&GjWMpX41?%)7-pi
zIl8WF6zJl**TWWiwq{ccx{+a-ZnQ<{d=|0!tfxFrNo?LC(XF$~yBq1^mMRaV(Jj6E
ziGeu!DlQGAt?cnnAe<(Do*0FnS?0-Y0=#bBKJ^!b-&^0F-h$vSR{J>#MOVVqd+08p
vpN});&(&3PY&Ex?Y<#CH(JMghx2>WIvv4k|!O&cb8;0)HrlDqJsG|P>{Hi$E

diff --git a/globals/__pycache__/global_variable.cpython-312.pyc b/globals/__pycache__/global_variable.cpython-312.pyc
index c02f3b2fd6705d8c3540b1dc17be249f50f75a4e..ce0d191cf3b8b5937916d2d1e8664ef22a572783 100644
GIT binary patch
delta 160
zcmaFJ@{fi0G%qg~0}$}dy_p#}kyp~r2FRJtkirnfkir<n2&9>Sm>Gy!QkYVh)0v`J
z(;1@JG8v-Sfiwq@<^*CcAm#@0c_t>vGxAPsP!SSz_wjdf^oe(LcJ>eT3yJr1*|<2C
uQCSRVIwKGlhXRQY%#4hT4}?W8FbLcbl5gO@AtH8xL2$AxlLLzgP#OSEuOnmt

delta 143
zcmeyz@{oo1G%qg~0}v#MRA=%`<duxF0CJ`?q%cG=q%cM?0%;~7W=>&BVNPd?Vo7I+
zV$EcTVgu6bK$-)HIf0l9$mgzP(PX{FaEm*+s<N~yKQFyJHSZ<J=$Fhu!cUWDVvEYg
c-7$<@qChSq5EuJTR%8;HY|UiPA`IjL01Ij#tpET3

diff --git a/globals/apis.py b/globals/apis.py
index 6864abc..a989cc7 100644
--- a/globals/apis.py
+++ b/globals/apis.py
@@ -325,7 +325,8 @@ def get_work_conditions_by_linecode(linecode: str) -> Optional[Dict[str, Dict]]:
     while retry_count < max_retries:
         try:
             # 准备请求参数
-            payload = {"linecode": linecode}
+            account_id = global_variable.GLOBAL_ACCOUNT_ID
+            payload = {"linecode": linecode, "account_id": account_id}
             headers = {
                 'Content-Type': 'application/json',
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
@@ -422,7 +423,8 @@ def get_user_max_variation(username: str) -> Optional[int]:
     
     # 1. 准备请求参数与头部
     # 接口要求的POST参数（JSON格式）
-    payload = {"username": username}
+    account_id = global_variable.GLOBAL_ACCOUNT_ID
+    payload = {"username": username, "account_id": account_id}
     # 请求头部：指定JSON格式，模拟浏览器UA避免被接口拦截
     headers = {
         "Content-Type": "application/json",
diff --git a/globals/create_link.py b/globals/create_link.py
index f9d915b..62eb24e 100644
--- a/globals/create_link.py
+++ b/globals/create_link.py
@@ -17,8 +17,12 @@ from urllib3.connection import port_by_scheme
 
 def run_command(command):
     """执行系统命令并返回输出"""
-    result = subprocess.run(command, shell=True, capture_output=True, text=True)
-    return result.stdout.strip()
+    try:
+        result = subprocess.run(command, shell=True, capture_output=True, text=True, encoding='utf-8', errors='ignore')
+        return result.stdout.strip()
+    except Exception:
+        result = subprocess.run(command, shell=True, capture_output=True, text=True, errors='ignore')
+        return result.stdout.strip()
 
 
 # =======================
@@ -131,18 +135,39 @@ def cleanup_wireless_connections(target_device_ip=None, target_port=4723):
 def start_appium():
     appium_port = 4723
     print(f"🚀 启动 Appium Server（端口 {appium_port}）...")
-    subprocess.Popen(
-        ["appium.cmd", "-a", "127.0.0.1", "-p", str(appium_port)],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL
-    )
-    # 检查端口是否就绪（替代固定sleep）
+    
+    # 先检查端口是否已被占用
+    try:
+        import socket
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.settimeout(1)
+        result = sock.connect_ex(("127.0.0.1", appium_port))
+        sock.close()
+        if result == 0:
+            print(f"✅ Appium Server 已在运行（端口 {appium_port}）")
+            return True
+    except Exception:
+        pass
+    
+    # 启动 Appium Server
+    try:
+        subprocess.Popen(
+            ["appium.cmd", "-a", "127.0.0.1", "-p", str(appium_port)],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
+    except FileNotFoundError:
+        print("❌ 未找到 appium.cmd，请确认 Appium 已正确安装")
+        return False
+    except Exception as e:
+        print(f"❌ Appium Server 启动失败: {str(e)}")
+        return False
+    
+    # 检查端口是否就绪
     max_wait = 30  # 最大等待30秒
     start_time = time.time()
     while time.time() - start_time < max_wait:
         try:
-            # 尝试连接Appium端口，验证是否就绪
-            import socket
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             sock.settimeout(1)
             result = sock.connect_ex(("127.0.0.1", appium_port))
@@ -190,7 +215,7 @@ def setup_adb_wireless():
 
     if not usb_devices:
         print("❌ 未检测到 USB 设备")
-        return
+        return None
 
     for serial in usb_devices:
         print(f"\n🔎 处理设备: {serial}")
@@ -261,7 +286,10 @@ def setup_adb_wireless():
         #     print("🔄 关闭Appium连接...")
         #     driver.quit()
         
-        break  # 处理完第一个设备后退出，如需处理多个设备可移除此行
+        return wireless_id  # 返回无线连接的设备ID
+    
+    print("❌ 未能成功建立无线连接")
+    return None
 
 
 # =======================
diff --git a/globals/driver_utils.py b/globals/driver_utils.py
index e03e916..f7ab746 100644
--- a/globals/driver_utils.py
+++ b/globals/driver_utils.py
@@ -547,6 +547,10 @@ def grant_appium_permissions(device_id: str, require_all: bool = False) -> bool:
     """
     修复版：为 Appium 授予权限（使用正确的方法）
     """
+    if not device_id:
+        logging.error("设备 ID 为空，无法授予 Appium 权限")
+        return False
+    
     logging.info(f"设备 {device_id}：开始设置Appium权限")
     
     # 1. 使用系统设置命令（替代原来的pm grant尝试）
@@ -1084,6 +1088,11 @@ def go_main_click_tabber_button(driver, device_id, tabber_button_text, max_retri
     返回:
     bool: 成功返回True，失败返回False
     """
+    # 检查沉降观测应用是否已启动
+    if not is_app_launched(driver):
+        logging.warning(f"设备 {device_id} 沉降观测应用未启动")
+        return False
+    
     retry_count = 0
     
     while retry_count < max_retries:
diff --git a/globals/global_variable.py b/globals/global_variable.py
index 86549ce..91262ec 100644
--- a/globals/global_variable.py
+++ b/globals/global_variable.py
@@ -1,11 +1,12 @@
 # 全局变量
 GLOBAL_DEVICE_ID = "" # 设备ID
 GLOBAL_USERNAME = "czyuzongwen" # 用户名
+GLOBAL_ACCOUNT_ID = "" # 账号ID
 GLOBAL_CURRENT_PROJECT_NAME = "" # 当前测试项目名称
 GLOBAL_LINE_NUM = "" # 线路编码
 GLOBAL_BREAKPOINT_STATUS_CODES = [0,3] # 要获取的断点状态码列表
 GLOBAL_UPLOAD_BREAKPOINT_LIST = []
-GLOBAL_UPLOAD_BREAKPOINT_DICT = {}
+GLOBAL_UPLOAD_BREAKPOINT_DICT = {}                                  
 GLOBAL_TESTED_BREAKPOINT_LIST = [] # 测量结束的断点列表
 LINE_TIME_MAPPING_DICT = {} # 存储所有线路编码和对应的时间的全局字典
 GLOBAL_BREAKPOINT_DICT = {} # 存储测量结束的断点名称和对应的线路编码的全局字典
diff --git a/page_objects/__pycache__/login_page.cpython-312.pyc b/page_objects/__pycache__/login_page.cpython-312.pyc
index de856eb1c95130b856e961d876ecde659ba10c94..9a8cdc3f004c9e217f016aca36082adf1c934e47 100644
GIT binary patch
delta 1413
zcmah|T})e596#q?Xzy)%`vI5I+d@}hK!Cz#kU3e$M}hePg)JFdSabxr4N^CXw{0rR
zt#u>@j7-@Mx^#$RF)DHK6Ad`$$R4Ikw$3{@4QqTbh5~yUn-7}kgXdD}#TR!T{^$Sk
z`<?&qd|lr;?9yLj7!APV=9xSFr?z~q|5>BnuLj^WpwT{qV^*vEgNX9#2*pzoT2u>1
zMKw=z81E~US^pip<~&SgBGmulv^;g5*g(=E%~K&Ll!|mPFTGwjoA!bbpiV<xt4<^*
z0ndo^B$&!bw}D`Q!+?$9D^GjM%<I>AhAC3vpent&M5L4i4MgB`Dx|dM+lJntt$GM}
zV?@K#5v`~dHRzOn2yRC@Lvf}~)cLAq2-<5XC@_gyKI<6fVx8Hd23vM2Q)v>cL6otK
z1ir`7CBv?k9Hla3e#jnj73_Ks27nDMb;e@GqEy#=<VQIrBP)IZAGJV?!!gySKDFsh
zDl>0gS8dyTRzp+~fS?PE6JyDj$Sx3u|Hg(?+)F^vOGH#*uu*|XXVOMp>2<dPp(4UO
zq;p=dK8+Wdw0eBgMB0}%;AhCZ%nVVfISj)frJyW7l!e*LuYI_BZfqs?P4e5fmeJd$
z8`1VXg8a%7)L>5_5cUgvLetaR>kkbCyZiZ20WKxSzP|hFiR9>Kt6zSQd~<GT;oS1^
zPw!nk6AE~Rfu5t@-NzWGL*eWW;jaNwSVu_y0gmN&K3ZLvNKU@H33l(|SaR-*RqZF2
zmgX-w_VgSHcu^qhM|&t2Gg1Oq7e-cQUSFF3I5~3R?nJECQRYD2?C&iJ(-UnS?#8z6
z#-^r@&i4J?Pc;i$Fbg@^24f+11X*^13<QNTJvz=FB811#B3qTI$7u)B<ZPp>NB~{|
zYZ;+gcTOXWF6P=spIqeZqfg&4m=|q@(~rbz&(_82X3B5bYR0KG6|fgi?~5HedpLG@
zrft6XR(`{{=GW}}>CT(k<%>Jr6CJnNnqOGk>9&(?Qc<(iazJW6C>`V_uV3N^rGgiK
zVudAK?l{>o-6vJmOO*{$L!Y$u`P*#&8U+Z(Halsyz`Q0Bnz#gO`D<-2B$%AvjO^bJ
zR3P^m_~)7v{gC@;bQteoxUtAn4K9}$J!WuuM-zjCD;Y+Q9b92K*{|e0B^lqTGi0lE
zt8nUSmeo@Mt~%ZIIJo9))Z^*8O9scygvUn4Eix)@Cp<-D+@Y2I3c|CUj90GbtLgSq
zGVUs9FI15?3NzbF-y5+&)h_v<UFZbY1zXVyR|w~j#`?bMfShhcUs-pk!Z4HjJ&5jG
zBhZEXHs0>WwS=zki2pf!-Bmq<{Q;pxhSRcn7Tvd5pciTKsttYuau0xP1rx6Q1B}*P
AUjP6A

delta 978
zcmaixO-~a+7{_OJ+ikbq?)G)*_9c}U(Sk})L7-5r7!$(Qa4;sI7jTVGFpzCcE!m|?
zJa{06I0r>TG%-ekiAMPXZ~zipJ!oQ(6Y&!?c+jW^X9{&gJTQm<JkK+~d0u9wJBw|6
z!Qrq0yf*T0M#AB@{1=<$F$2Iuz#^SLuw=LYpoTSz>eVcYMZ#R_5TW-j#rg{FM0BfW
zN>%MWC0_m?0Ram%kUIQ7lWIgIA;c-H&MFq&rr9(W$wCeuK_3HkjBeNLsU}RslK4om
zPvQhmfWm1kR>!=#(g6gS=1T6=@rq^a3Tu$Kj~1LUfF3xj1>T6~gbYNoGwLCA902Sz
zGfDxVHlQg!l6M*GKGoa?Nd_wCpl0C=li7VS{Gx3}cNI(Vl;`r!)5iUruNFYi4`wO%
z%)MK5Kghz}0GxS;Ub|{z9hK{KKyB2yeM*R#t_rVlh;vI)mCj9ZIiFJAvoH&Gszm)L
z?%onqJU`g9P7J2g*>P1t3!YE#Jeu@|=nK&ZdgNV4S>G971Vd^Kk!pg|>5Lk6pmpB>
zsuvqg_%Q*xBsQ_DIN5DbG7T@?7ZcF`RS-9VHP4#oI-bVo;tLI*gDtbxEiSOs=l8?V
z2nAizrq}<w)CVbt@0-*6XPW_4SK!Z*8{L&o=I`LN(}`MH1S|E<-gdCk+U>y3s>vxs
zu<DhFeN>WJ)0)LZ)E>o=wU&U)gLUETY3#fg5<K1t5yBSQsopqUh%wkMLP}=nB5fx&
zPstv-=q$%YHff`ak?N$GHh(aileXtw0mzUqP-Cb&*bjTqe6R*CqUGQV<{}CApwUn(
zlY(aH`v7_w(qRl83@fJ+_-vEAJ~loyIF>#(I5Cn|&k>v@a+!#Wh=Apnwe!Zfa&zoj
TT)m2x!zY9x3QF66Xc_to56!=)

diff --git a/page_objects/login_page.py b/page_objects/login_page.py
index 7c29a71..bec8b43 100644
--- a/page_objects/login_page.py
+++ b/page_objects/login_page.py
@@ -123,8 +123,21 @@ class LoginPage:
 
             accounts = apis.get_accounts_from_server("68ef0e02b0138d25e2ac9918")
             matches = [acc for acc in accounts if acc.get("username") == existing_username]
+            password = None
+            account_id = False
             if matches:
                 password = matches[0].get("password")
+
+                # ✅ 关键：把 account_id 存入全局变量
+                account_id = matches[0].get("account_id", False)
+                # 只有 account_id 存在时才存全局
+                if account_id is not False:
+                    global_variable.GLOBAL_ACCOUNT_ID = account_id
+                    logging.info(f"匹配到账号信息：username={existing_username}, account_id={account_id}")
+                else:
+                    logging.warning(f"账号 {existing_username} 未返回 account_id，已设为 False")
+            
+
             
             password_field.send_keys(password)
 
diff --git a/page_objects/measure_tabbar_page.py b/page_objects/measure_tabbar_page.py
index fffeb51..c3c45b3 100644
--- a/page_objects/measure_tabbar_page.py
+++ b/page_objects/measure_tabbar_page.py
@@ -120,8 +120,8 @@ class MeasureTabbarPage:
                     # 向上滑动
                     # 记录滑动前的项目，用于判断是否滑动到顶
                     before_scroll_items = self.get_current_items()
-                    start_y = list_container.location['y'] + list_container.size['height'] * 0.05
-                    end_y = list_container.location['y'] + list_container.size['height'] * 0.95
+                    start_y = list_container.location['y'] + list_container.size['height'] * 0.2
+                    end_y = list_container.location['y'] + list_container.size['height'] * 0.8
                 
                 # 执行滑动
                 self.driver.swipe(start_x, start_y, start_x, end_y, 1000)
diff --git a/page_objects/screenshot_page.py b/page_objects/screenshot_page.py
index b75cf4d..5c38c5f 100644
--- a/page_objects/screenshot_page.py
+++ b/page_objects/screenshot_page.py
@@ -192,8 +192,8 @@ class ScreenshotPage:
                 # 向上滑动
                 # 记录滑动前的项目，用于判断是否滑动到顶
                 before_scroll_items = self.get_current_items()
-                start_y = list_container.location['y'] + list_container.size['height'] * 0.05
-                end_y = list_container.location['y'] + list_container.size['height'] * 0.95
+                start_y = list_container.location['y'] + list_container.size['height'] * 0.2
+                end_y = list_container.location['y'] + list_container.size['height'] * 0.8
                 self.logger.info("向上滑动列表")
             
             # 执行滑动
diff --git a/page_objects/section_mileage_config_page.py b/page_objects/section_mileage_config_page.py
index 85fa1e5..1ecfc10 100644
--- a/page_objects/section_mileage_config_page.py
+++ b/page_objects/section_mileage_config_page.py
@@ -1086,6 +1086,8 @@ class SectionMileageConfigPage:
             if not self.click_start_measure_btn():
                 return False
 
+            
+
             # if not self.check_station_page.run():
             #     self.logger.error("检查站页面运行失败")
             #     return False