types
@@ -19170,6 +19346,8 @@ imported by:
•
subprocess
•
sysconfig
•
tempfile
+ •
tkinter
+ •
turtle
•
typing
•
typing_extensions
•
urllib.parse
@@ -20916,6 +21094,7 @@ imported by:
•
tarfile
•
tempfile
•
threading
+ •
turtle
•
typing
•
typing_extensions
•
urllib.parse
diff --git a/build/沉降观测自动截图/沉降观测自动截图.pkg b/build/沉降观测自动截图/沉降观测自动截图.pkg
index b8ed3f0..6c4c4b6 100644
Binary files a/build/沉降观测自动截图/沉降观测自动截图.pkg and b/build/沉降观测自动截图/沉降观测自动截图.pkg differ
diff --git a/dist/沉降观测自动截图.exe b/dist/沉降观测自动截图.exe
index 6679d7c..f06444b 100644
Binary files a/dist/沉降观测自动截图.exe and b/dist/沉降观测自动截图.exe differ
diff --git a/globals/__pycache__/apis.cpython-312.pyc b/globals/__pycache__/apis.cpython-312.pyc
index a1bd2a1..e73dbff 100644
Binary files a/globals/__pycache__/apis.cpython-312.pyc and b/globals/__pycache__/apis.cpython-312.pyc differ
diff --git a/globals/__pycache__/driver_utils.cpython-312.pyc b/globals/__pycache__/driver_utils.cpython-312.pyc
index f26e232..ee311c8 100644
Binary files a/globals/__pycache__/driver_utils.cpython-312.pyc and b/globals/__pycache__/driver_utils.cpython-312.pyc differ
diff --git a/globals/apis.py b/globals/apis.py
index fbd0ef7..64dfe38 100644
--- a/globals/apis.py
+++ b/globals/apis.py
@@ -1,9 +1,385 @@
+from turtle import done
import requests
import json
import logging
import socket
from typing import Optional, Dict, Any
import globals.global_variable as global_variable
+import os
+from datetime import datetime
+import re
+import threading
+
+def fetch_and_save_track_file(url, base_save_dir="D:\\uploadInfo\\Logs"):
+ """
+ 获取追踪文件并保存到指定目录结构：base_save_dir\\年月日\\文件名
+
+ :param url: 文件的完整URL地址
+ :param base_save_dir: 基础保存目录，默认为 D:\\uploadInfo\\Logs
+ :return: 成功返回保存的完整文件路径，失败返回None
+ """
+ try:
+ # 从URL中提取文件名
+ filename = os.path.basename(url)
+
+ # 获取当前日期，格式：YYYYMMDD
+ current_date = datetime.now().strftime("%Y%m")
+
+ # 构建完整的保存路径
+ save_dir = os.path.join(base_save_dir, current_date)
+ save_path = os.path.join(save_dir, filename)
+
+ print(f"正在从 {url} 获取文件...")
+ print(f"文件将保存到: {save_path}")
+
+ # 发送GET请求获取文件
+ response = requests.get(url)
+ response.raise_for_status() # 检查请求是否成功
+
+ # 尝试用UTF-8解码内容（根据之前看到的内容，应该是UTF-8）
+ try:
+ content = response.content.decode('utf-8')
+ except UnicodeDecodeError:
+ # 如果UTF-8失败，尝试其他常见编码
+ for encoding in ['gbk', 'gb2312', 'utf-8-sig']:
+ try:
+ content = response.content.decode(encoding)
+ print(f"使用 {encoding} 编码成功解码")
+ break
+ except UnicodeDecodeError:
+ continue
+ else:
+ print("无法解码文件内容，所有尝试的编码都失败")
+ return None
+
+ # 创建目录（如果不存在）
+ os.makedirs(save_dir, exist_ok=True)
+
+ # 保存文件到指定路径
+ with open(save_path, 'w', encoding='utf-8') as f:
+ f.write(content)
+
+ print(f"✅ 文件已成功保存到: {save_path}")
+ print(f"文件大小: {len(content)} 字符")
+
+ return save_path
+
+ except requests.exceptions.RequestException as e:
+ print(f"❌ 网络请求失败: {e}")
+ return None
+ except Exception as e:
+ print(f"❌ 处理文件时发生错误: {e}")
+ return None
+
+def parse_track_file(file_path):
+ """
+ 解析本地追踪文件内容
+
+ :param file_path: 本地文件路径
+ :return: 解析后的记录列表
+ """
+ records = []
+
+ try:
+ # 读取文件内容
+ with open(file_path, 'r', encoding='utf-8') as f:
+ content = f.read()
+
+ lines = content.strip().split('\n')
+
+ for line in lines:
+ if not line.strip():
+ continue
+
+ # 按逗号分割
+ parts = line.split(',', 3)
+
+ if len(parts) >= 4:
+ try:
+ timestamp = parts[0].strip()
+ level = parts[1].strip()
+ account_info = parts[2].strip()
+ message = parts[3].strip()
+
+ # 从消息中提取线路ID和结束时间
+ line_id_match = re.search(r'：([A-Z]\d+)', message)
+ end_time_match = re.search(r'结束时间：([\d-]+\s[\d:.]+)', message)
+
+ record = {
+ 'timestamp': timestamp,
+ 'level': level,
+ 'account': account_info.replace('账号信息：', '').strip() if '账号信息：' in account_info else account_info,
+ 'message': message
+ }
+
+ if line_id_match:
+ record['line_id'] = line_id_match.group(1)
+ if end_time_match:
+ record['end_time'] = end_time_match.group(1)
+
+ records.append(record)
+ except Exception as e:
+ print(f"解析行失败: {line[:50]}... 错误: {e}")
+ continue
+
+ print(f"✅ 成功解析 {len(records)} 条记录")
+ return records
+
+ except FileNotFoundError:
+ print(f"❌ 文件不存在: {file_path}")
+ return []
+ except Exception as e:
+ print(f"❌ 解析文件时发生错误: {e}")
+ return []
+def deduplicate_by_line_id(records):
+ """
+ 按线路ID去重，重复的线路ID保留后面出现的记录（新写入的时间）
+
+ :param records: 原始解析记录列表
+ :return: 去重后的记录字典（key=line_id, value=record）
+ """
+ deduplicated_records = {}
+
+ for record in records:
+ # 只处理有线路ID的记录
+ if 'line_id' not in record or not record['line_id']:
+ continue
+
+ line_id = record['line_id']
+ # 后续出现的同线路ID记录会覆盖之前的，实现"取后面新写入的时间"
+ deduplicated_records[line_id] = record
+
+ print(f"✅ 按线路ID去重后剩余 {len(deduplicated_records)} 条记录")
+ # 转换为列表返回（字典values是去重后的记录）
+ return list(deduplicated_records.values())
+
+def get_latest_end_time(records, time_format="%Y-%m-%d %H:%M:%S.%f"):
+ """
+ 从解析后的记录中筛选出最晚的结束时间
+ :param records: 解析后的记录列表
+ :param time_format: 时间格式化字符串
+ :return: 最晚的结束时间字符串（原始格式）
+ """
+ end_times = []
+ for record in records:
+ # 过滤无结束时间的记录
+ if 'end_time' not in record or not record['end_time']:
+ continue
+ try:
+ # 转换为datetime对象用于对比
+ time_obj = datetime.strptime(record['end_time'], time_format)
+ end_times.append((time_obj, record['end_time']))
+ except ValueError as e:
+ print(f"时间格式解析失败: {record['end_time']}, 错误: {e}")
+ continue
+
+ if not end_times:
+ print("❌ 未找到有效结束时间")
+ return None
+ # 按datetime对象排序，取最后一个（最晚）的原始时间字符串
+ end_times.sort(key=lambda x: x[0])
+ latest_time = end_times[-1][1]
+ # 核心修改：截取到小数点前（去掉毫秒）
+ latest_time = latest_time.split('.')[0] # 按小数点分割，取第一部分
+ print(f"✅ 找到最晚结束时间: {latest_time}")
+ return latest_time
+
+
+def write_to_file(content, file_path=r"D:\uploadInfo\end.txt", encoding='utf-8'):
+ """
+ 将内容写入指定文件
+ :param content: 要写入的内容
+ :param file_path: 目标文件路径
+ :param encoding: 文件编码
+ :return: 写入是否成功
+ """
+ if content is None:
+ print("❌ 无有效内容可写入")
+ return False
+ try:
+ # 确保目录存在
+ os.makedirs(os.path.dirname(file_path), exist_ok=True)
+ with open(file_path, 'w', encoding=encoding) as f:
+ f.write(content)
+ print(f"✅ 最晚结束时间已成功写入 {file_path}")
+ return True
+ except Exception as e:
+ print(f"❌ 写入文件失败: {e}")
+ return False
+# def writer_file_status(username, last_time, to_status):
+# """
+# 安全地向 time.txt 中写入指定格式的新行
+# 格式: 用户名 时间戳(YYYY-MM-DD HH:MM:SS) 状态
+# 例如: CZSCZQ13A1xuliguo 2026-02-10 13:30:00 done
+
+# :param username: 用户名（如CZSCZQ13A1xuliguo）
+# :param from_status: 原状态（保留参数，兼容旧调用）
+# :param to_status: 目标状态（如done/running）
+# :return: 写入是否成功
+# """
+# # 确保文件存在（不存在则创建空文件）
+# ## --- 配置区 ---
+# API_URL = "http://your-api-server.com/api/tasks"
+# MAX_WORKERS = 3
+# TIME_FILE_PATH = r"D:\uploadInfo\time.txt"
+# POLLING_INTERVAL = 600 # 10分钟轮询一次
+
+# # 文件操作锁，防止多线程同时写入文件造成冲突
+# file_lock = threading.Lock()
+# if not os.path.exists(TIME_FILE_PATH):
+# try:
+# with open(TIME_FILE_PATH, 'w', encoding='utf-8') as f:
+# pass
+# print(f"📄 文件 {TIME_FILE_PATH} 不存在，已创建")
+# except Exception as e:
+# print(f"❌ 创建文件失败: {e}")
+# return False
+
+# success = False
+# with file_lock: # 加锁防止多线程写入冲突
+# try:
+# # 1. 获取当前时间，格式化为 YYYY-MM-DD HH:MM:SS
+# # last_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+# # 2. 构造指定格式的新行（核心修改处）
+# new_line = f"{username} {last_time} {to_status}\n"
+
+# # 3. 以追加模式写入文件
+# with open(TIME_FILE_PATH, 'a', encoding='utf-8') as f:
+# f.write(new_line)
+
+# success = True
+# print(f"📝 [文件更新] 已写入新行: {new_line.strip()}")
+# return success
+# except Exception as e:
+# print(f"❌ 写入新行失败 ({username}): {e}")
+# return False
+
+def writer_file_status(username, last_time, to_status):
+ """
+ 安全地向 time.txt 中写入/更新指定格式的行
+ 格式: 用户名 时间戳(YYYY-MM-DD HH:MM:SS) 状态
+ 例如: CZSCZQ13A1xuliguo 2026-02-10 13:30:00 done
+
+ :param username: 用户名（如CZSCZQ13A1xuliguo）
+ :param last_time: 时间戳
+ :param to_status: 目标状态（如done/running）
+ :return: 写入是否成功
+ """
+ # 确保文件存在（不存在则创建空文件）
+ TIME_FILE_PATH = r"D:\uploadInfo\time.txt"
+
+ # 文件操作锁，防止多线程同时写入文件造成冲突
+ file_lock = threading.Lock()
+ if not os.path.exists(TIME_FILE_PATH):
+ try:
+ with open(TIME_FILE_PATH, 'w', encoding='utf-8') as f:
+ pass
+ print(f"📄 文件 {TIME_FILE_PATH} 不存在，已创建")
+ except Exception as e:
+ print(f"❌ 创建文件失败: {e}")
+ return False
+
+ success = False
+ with file_lock: # 加锁防止多线程写入冲突
+ try:
+ # 读取文件所有行
+ lines = []
+ username_found = False
+
+ # 如果文件不为空，读取现有内容
+ if os.path.getsize(TIME_FILE_PATH) > 0:
+ with open(TIME_FILE_PATH, 'r', encoding='utf-8') as f:
+ lines = f.readlines()
+
+ # 处理每一行，查找并更新匹配的用户名
+ for i, line in enumerate(lines):
+ parts = line.strip().split()
+ if len(parts) >= 3 and parts[0] == username:
+ # 找到匹配的用户名且时间不一致，更新该行
+ # lines[i] = f"{username} {last_time} {to_status}\n"
+ username_found = True
+ existing_time = f"{parts[1]} {parts[2]}" # 组合日期和时间
+ existing_status = parts[3] if len(parts) > 3 else ""
+ # print(f"🔄 [文件更新] 已更新用户 {username} 的状态和时间为: {last_time} {to_status}")
+ # 检查时间和状态是否都一致
+ if existing_time == last_time and (existing_status == "done" or existing_status == "running" or existing_status == "ok"):
+ # 完全一致，不需要更新
+ print(f"⏭️ [文件更新跳过] 用户 {username} 的时间和状态与已有记录一致")
+ need_update = False
+ else:
+ # 时间或状态不一致，需要更新
+ lines[i] = f"{username} {last_time} {to_status}\n"
+ need_update = True
+ print(f"🔄 [文件更新] 已更新用户 {username} 的状态和时间为: {last_time} {to_status}")
+ break
+
+ # 如果没找到用户名，添加新行
+ if not username_found:
+ new_line = f"{username} {last_time} {to_status}\n"
+ lines.append(new_line)
+ print(f"📝 [文件更新] 已添加新用户行: {new_line.strip()}")
+
+ # 将更新后的内容写回文件
+ with open(TIME_FILE_PATH, 'w', encoding='utf-8') as f:
+ f.writelines(lines)
+
+ success = True
+ return success
+
+ except Exception as e:
+ print(f"❌ 写入/更新失败 ({username}): {e}")
+ return False
+def display_file_info(file_path, records=None):
+ """
+ 显示文件信息和内容预览
+ :param file_path: 文件路径
+ :param records: 解析后的记录（可选）
+ """
+ if not os.path.exists(file_path):
+ print(f"❌ 文件不存在: {file_path}")
+ return
+
+ # 获取文件信息
+ file_size = os.path.getsize(file_path)
+ file_mod_time = datetime.fromtimestamp(os.path.getmtime(file_path))
+
+ print("\n" + "="*60)
+ print("📁 文件信息")
+ print("="*60)
+ print(f"文件路径: {file_path}")
+ print(f"文件大小: {file_size} 字节")
+ print(f"修改时间: {file_mod_time.strftime('%Y-%m-%d %H:%M:%S')}")
+
+ # 显示文件内容预览
+ print("\n" + "="*60)
+ print("📄 文件内容预览（前5行）")
+ print("="*60)
+
+ try:
+ with open(file_path, 'r', encoding='utf-8') as f:
+ lines = []
+ for i, line in enumerate(f):
+ if i < 5: # 只读取前5行
+ lines.append(line.strip())
+ else:
+ break
+
+ for i, line in enumerate(lines, 1):
+ print(f"{i:2d}. {line[:100]}{'...' if len(line) > 100 else ''}")
+ except Exception as e:
+ print(f"读取文件预览失败: {e}")
+
+ # 显示解析结果
+ if records:
+ print("\n" + "="*60)
+ print("📊 解析结果统计")
+ print("="*60)
+ print(f"总记录数: {len(records)}")
+
+ if records:
+ print("\n第一条记录详情:")
+ for key, value in records[0].items():
+ print(f" {key}: {value}")
def send_tcp_command(command="StartMultiple", host="127.0.0.1", port=8888, timeout=10):
"""
diff --git a/invalid_scheduler.py b/invalid_scheduler.py
index db64367..d1c521f 100644
--- a/invalid_scheduler.py
+++ b/invalid_scheduler.py
@@ -10,7 +10,7 @@ from datetime import datetime, timedelta
## --- 配置区 ---
API_URL = "http://your-api-server.com/api/tasks" # 替换为真实的接口地址
MAX_WORKERS = 3 # 最大并发线程数，建议根据网络带宽调整
-TIME_FILE_PATH = r"D:\time.txt" # 电脑D盘下的路径
+TIME_FILE_PATH = r"D:\uploadInfo\time.txt" # 电脑D盘下的路径
def parse_time_config():
"""
diff --git a/main.py b/main.py
index 66af5a0..b08b172 100644
--- a/main.py
+++ b/main.py
@@ -144,7 +144,7 @@ class DeviceAutomation(object):
measure_page_btn.click()
- # 处理平差
+ # 处理截图
self.screenshot_page.screenshot_page_manager(self.device_id)
return True
diff --git a/page_objects/__pycache__/screenshot_page.cpython-312.pyc b/page_objects/__pycache__/screenshot_page.cpython-312.pyc
index 16c8933..5db7581 100644
Binary files a/page_objects/__pycache__/screenshot_page.cpython-312.pyc and b/page_objects/__pycache__/screenshot_page.cpython-312.pyc differ
diff --git a/page_objects/screenshot_page.py b/page_objects/screenshot_page.py
index d261164..447599a 100644
--- a/page_objects/screenshot_page.py
+++ b/page_objects/screenshot_page.py
@@ -1,4 +1,5 @@
# screenshot_page.py
+from socket import TCP_NODELAY
import subprocess
import logging
import time
@@ -543,9 +544,10 @@ class ScreenshotPage:
# 获取项目名称
project_name = global_variable.get_current_project_name() or "默认项目"
- # 获取当前日期（如果没有提供）
- if not date_str:
- date_str = datetime.now().strftime("%Y%m%d")
+ # 获取当前日期
+ date_str = datetime.now().strftime("%Y%m%d")
+ # if not date_str:
+ # date_str = datetime.now().strftime("%Y%m%d")
# 获取当前时间（如果没有提供），并确保格式合法（不含冒号）
if not time_str:
@@ -610,14 +612,28 @@ class ScreenshotPage:
"""
try:
# D盘txt文件路径
- txt_file_path = "D:\\uploadInfo\\screenshot_status.txt"
+ # txt_file_path = "D:\\uploadInfo\\screenshot_status.txt"
+ date_str = datetime.now().strftime("%Y%m%d")
+ project_name = global_variable.get_current_project_name() or "默认项目"
+ # 创建D盘下的截图目录结构：D:\uploadInfo\picture\项目名\年月日
+ screenshots_dir = os.path.join("D:\\", "uploadInfo", "picture", project_name, date_str)
+
+ # 确保目录存在
+ try:
+ os.makedirs(screenshots_dir, exist_ok=True)
+ self.logger.info(f"截图数据保存目录: {screenshots_dir}")
+ txt_file_path = os.path.join(screenshots_dir, "screenshot_status.txt")
+ except Exception as dir_error:
+ self.logger.error(f"创建截图目录失败: {str(dir_error)}")
+ return False
# 获取当前时间
current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
# 状态信息
status = "成功" if success else "失败"
- status_line = f"{current_time} - {breakpoint_name} - 截图{status}\n"
+ logo = "✅" if success else "❌"
+ status_line = f"{logo}{current_time} - {breakpoint_name} - 截图{status}\n"
# 追加写入文件
with open(txt_file_path, 'a', encoding='utf-8') as f:
@@ -1031,16 +1047,22 @@ class ScreenshotPage:
# 获取列表元素
list_view = self.driver.find_element(AppiumBy.ID, "com.bjjw.cjgc:id/auto_data_list")
+ self.logger.info(f"时间戳1: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())}")
same_content_count = 0
# 初始化第一次的子元素文本
initial_child_elements = list_view.find_elements(AppiumBy.CLASS_NAME, "android.widget.TextView")
- current_child_texts = "|".join([
- elem.text.strip() for elem in initial_child_elements
- if elem.text and elem.text.strip()
- ])
-
+ self.logger.info(f"时间戳2: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())}")
+ # current_child_texts = "|".join([
+ # elem.text.strip() for elem in initial_child_elements
+ # if elem.text and elem.text.strip()
+ # ])
+ current_child_texts = "|".join(
+ elem_text.strip() for elem in initial_child_elements
+ if (elem_text := elem.text) and elem_text.strip()
+ )
+ self.logger.info(f"时间戳3: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())}")
for i in range(max_swipes):
# 执行下滑操作
self.driver.execute_script("mobile: scrollGesture", {
@@ -1050,14 +1072,12 @@ class ScreenshotPage:
'duration': 500
})
- # time.sleep(0.5)
-
# 获取滑动后的子元素文本
new_child_elements = list_view.find_elements(AppiumBy.CLASS_NAME, "android.widget.TextView")
- new_child_texts = "|".join([
- elem.text.strip() for elem in new_child_elements
- if elem.text and elem.text.strip()
- ])
+ new_child_texts = "|".join(
+ elem_text.strip() for elem in new_child_elements
+ if (elem_text := elem.text) and elem_text.strip()
+ )
# 判断内容是否变化：若连续3次相同，认为到达底部
if new_child_texts == current_child_texts:
@@ -1354,7 +1374,7 @@ class ScreenshotPage:
# 获取当前年月日（例如：20251023）
current_date = datetime.now().strftime("%Y%m%d")
# 拼接格式：年月日.1.用户名.txt
- filename = f"{current_date}.1.{global_variable.get_username()}.txt"
+ filename = f"{current_date}_1_{global_variable.get_username()}.txt"
file_path = os.path.join(log_directory, filename)
# 轮询等待文件出现
@@ -1426,7 +1446,7 @@ class ScreenshotPage:
self.logger.error(f"设备 {device_id} 加载线路时间映射字典失败")
return False
- # time.sleep(5)
+ time.sleep(5)
# 循环检查数据数量是否一致，直到获取到完整数据
retry_count = 0
@@ -1466,7 +1486,7 @@ class ScreenshotPage:
# 检查GLOBAL_BREAKPOINT_DICT是否为空，如果为空则初始化一些测试数据
if not global_variable.get_upload_breakpoint_dict():
self.logger.warning("global_variable.get_upload_breakpoint_dict()为空，正在初始化测试数据")
- # 添加一些测试断点数据，实际使用时应该从其他地方加载
+ # 添加一些测试断点数据，实际使用时是接口返回
# 注意：这里的值应该是字典，与section_mileage_config_page.py中的数据结构保持一致
global_variable.set_breakpoint_dict({
"CZSCZQ-3-康定2号隧道-DK297+201-DK297+199-山区": {
@@ -1479,83 +1499,158 @@ class ScreenshotPage:
}
})
- # 开始循环
+ breakpoint_names = list(global_variable.get_upload_breakpoint_dict().keys())
+ self.logger.info(f"设备 {device_id} 获取的断点名称列表: {breakpoint_names}")
+ processed_breakpoints = [] # 创建一个列表，用于记录已处理的断点
+ # 开始循环处理断点
+ # 检测当前页面获取到的标段是否在breakpoint_names中
+ max_scroll_attempts = 100 # 最大滚动尝试次数
+ scroll_count = 0
+ previous_items = set() # 记录前一次获取的项目集合，用于检测是否到达边界
+ found_any = False # 标记是否找到并处理了任何断点
+ max_retry_attempts = 3 # 每个断点的最大重试次数
all_success = True
- for breakpoint_name in global_variable.get_upload_breakpoint_dict().keys():
- self.logger.info(f"开始处理要平差截图的断点 {breakpoint_name}")
- # 把断点名称给find_keyword
- if not self.find_keyword(breakpoint_name):
- self.logger.error(f"设备 {device_id} 未找到包含 {breakpoint_name} 的文件名")
- all_success = False
- continue
- if not self.handle_measurement_dialog():
- self.logger.error(f"设备 {device_id} 处理测量弹窗失败")
- all_success = False
- continue
-
- if not self.check_apply_btn():
- self.logger.error(f"设备 {device_id} 检查平差处理按钮失败")
- all_success = False
- self.click_back_button(device_id)
- continue
-
- # 根据断点名称在get_upload_breakpoint_dict()中获取线路编码
- line_code = global_variable.get_upload_breakpoint_dict().get(breakpoint_name)
- if not line_code:
- self.logger.error(f"设备 {device_id} 未找到断点 {breakpoint_name} 对应的线路编码")
- all_success = False
- continue
-
- # 根据线路编码查找对应的时间
- date_str, time_str = self.get_line_end_time(line_code)
- if not time_str or not date_str:
- self.logger.error(f"设备 {device_id} 未找到线路 {line_code} 对应的时间")
- all_success = False
- continue
-
- # 修改时间
- if not self.set_device_time(device_id, time_str, date_str):
- self.logger.error(f"设备 {device_id} 设置设备时间失败")
- all_success = False
- continue
-
- # 滑动列表到底部
- if not self.scroll_list_to_bottom(device_id):
- self.logger.error(f"设备 {device_id} 下滑列表到底部失败")
- all_success = False
- continue
+ while scroll_count < max_scroll_attempts:
+ # 获取当前页面中的所有项目
+ current_items = self.get_current_items()
+ self.logger.info(f"当前页面找到 {len(current_items)} 个项目")
- # 2. 点击最后一个spinner
- if not self.click_last_spinner_with_retry(device_id):
- self.logger.error(f"设备 {device_id} 点击最后一个spinner失败")
- all_success = False
- continue
-
- # 3. 再下滑一次
- if not self.scroll_down_once(device_id):
- self.logger.warning(f"设备 {device_id} 再次下滑失败，但继续执行")
-
- # 平差处理完成后截图
- time.sleep(0.2) # 等待平差处理按钮点击后的界面变化
- logging.info("断点保存到上传列表成功，开始截图")
- # png_time = date_str + " " + time_str
- if not self.take_screenshot(breakpoint_name, date_str, time_str):
- self.logger.error(f"设备 {device_id} 截图失败")
- self.write_screenshot_status(breakpoint_name, success=False)
- all_success = False
- else:
- self.write_screenshot_status(breakpoint_name, success=True)
+ # 检查当前页面的项目是否在breakpoint_names中
+ for item in current_items:
+ # 检查项目是否在breakpoint_names中且未处理
+ if item in breakpoint_names and item not in processed_breakpoints:
+ self.logger.info(f"找到目标断点: {item}")
+ found_any = True
+ line_code = None
+ # 获取线路编码
+ try:
+ line_code = global_variable.get_upload_breakpoint_dict()[item]
+ except KeyError:
+ self.logger.error(f"未找到断点 {item} 的线路编码")
+ continue
- # 点击返回按钮并处理弹窗
- if not self.execute_back_navigation_steps(device_id):
- self.logger.error(f"设备 {device_id} 处理返回按钮确认失败")
- all_success = False
- # 启用WiFi
- # if not self.enable_wifi(device_id):
- # self.logger.error(f"设备 {device_id} 启用WiFi失败")
- # return False
+ # 重试处理断点
+ retry_count = 0
+ while retry_count < max_retry_attempts:
+ self.logger.info(f"开始处理断点 {item} (第 {retry_count + 1} 次尝试)")
+
+ # 点击目标项目
+ if not self.click_item_by_text(item):
+ self.logger.error(f"点击目标断点失败: {item}")
+ retry_count += 1
+ all_success = False
+ continue
+
+ if not self.handle_measurement_dialog():
+ self.logger.error(f"设备 {device_id} 处理测量弹窗失败")
+ retry_count += 1
+ all_success = False
+ continue
+ if not self.check_apply_btn():
+ self.logger.error(f"设备 {device_id} 检查平差处理按钮失败")
+ retry_count += 1
+ all_success = False
+ self.click_back_button(device_id)
+ continue
+
+ # 根据线路编码查找对应的时间
+ date_str, time_str = self.get_line_end_time(line_code)
+ if not time_str or not date_str:
+ self.logger.error(f"设备 {device_id} 未找到线路 {line_code} 对应的时间")
+ retry_count += 1
+ all_success = False
+ continue
+
+ # 修改时间
+ if not self.set_device_time(device_id, time_str, date_str):
+ self.logger.error(f"设备 {device_id} 设置设备时间失败")
+ retry_count += 1
+ all_success = False
+ continue
+
+ # 滑动列表到底部
+ if not self.scroll_list_to_bottom(device_id):
+ self.logger.error(f"设备 {device_id} 下滑列表到底部失败")
+ retry_count += 1
+ all_success = False
+ continue
+
+ # 2. 点击最后一个spinner
+ if not self.click_last_spinner_with_retry(device_id):
+ self.logger.error(f"设备 {device_id} 点击最后一个spinner失败")
+ retry_count += 1
+ all_success = False
+ continue
+
+ # 3. 再下滑一次
+ while True:
+ if self.scroll_down_once(device_id):
+ self.logger.warning(f"设备 {device_id} 下滑成功，跳出下滑一次循环")
+ break
+ else:
+ self.logger.warning(f"设备 {device_id} 下滑失败，循环执行下滑一次")
+
+
+ # 平差处理完成后截图
+ time.sleep(0.2) # 等待平差处理按钮点击后的界面变化
+ logging.info("断点保存到上传列表成功，开始截图")
+ # png_time = date_str + " " + time_str
+ if not self.take_screenshot(item, date_str, time_str):
+ self.logger.error(f"设备 {device_id} 截图失败")
+ self.write_screenshot_status(item, success=False)
+ retry_count += 1
+ all_success = False
+ else:
+ self.write_screenshot_status(item, success=True)
+
+ # 点击返回按钮并处理弹窗
+ if not self.execute_back_navigation_steps(device_id):
+ self.logger.error(f"设备 {device_id} 处理返回按钮确认失败")
+ retry_count += 1
+ all_success = False
+
+ # 成功处理完一个断点，添加到已处理列表
+ processed_breakpoints.append(item)
+ if item in processed_breakpoints: # 跳过重复处理
+ self.logger.info(f"成功处理断点: {item}")
+ break # 跳出重试循环
+
+ # 检查是否重试次数用完仍未成功
+ if retry_count >= max_retry_attempts:
+ self.logger.error(f"断点 {item} 经过 {max_retry_attempts} 次重试后仍然失败")
+ # 重新获取当前页面项目，因为可能有新的项目加载
+ break
+
+
+ # # 根据截图结果更新time.txt文件状态
+ # status = "ok" if all_success else "true"
+ # # self.update_upload_info_status(status)
+ # username = global_variable.get_username()
+ # self.update_file_status(username, "running", status)
+ # self.logger.info(f"{username} 截图完成状态为 {status}")
+
+ # self.logger.info(f"设备 {device_id} 截图页面操作执行完成，状态: {status}")
+ # return True
+
+
+ # 向下滑动列表以加载更多项目
+ if not self.scroll_list(direction="down"):
+ self.logger.error("向下滑动列表失败")
+ break
+
+ # 检查是否到达底部：连续两次获取的项目相同
+ if current_items == previous_items and len(current_items) > 0:
+ self.logger.info("连续两次获取的项目相同，已到达列表底部")
+ break
+
+ # 更新前一次项目集合
+ previous_items = current_items.copy()
+
+ scroll_count += 1
+ self.logger.info(f"第 {scroll_count} 次向下滑动，继续查找...")
+
# 根据截图结果更新time.txt文件状态
status = "ok" if all_success else "true"
# self.update_upload_info_status(status)
@@ -1564,7 +1659,109 @@ class ScreenshotPage:
self.logger.info(f"{username} 截图完成状态为 {status}")
self.logger.info(f"设备 {device_id} 截图页面操作执行完成，状态: {status}")
- return True
+ # return True
+ # 检查是否所有断点都处理完成
+ if len(processed_breakpoints) == len(breakpoint_names):
+ self.logger.info(f"设备 {device_id} 平差页面操作执行完成")
+ return True
+ elif found_any:
+ self.logger.warning(f"设备 {device_id} 部分断点处理完成，已成功处理 {len(processed_breakpoints)}/{len(breakpoint_names)} 个断点")
+ return True
+ else:
+ self.logger.warning(f"设备 {device_id} 未找到任何目标断点")
+ return True
+
+
+
+
+
+ # # 开始循环
+ # all_success = True
+ # for breakpoint_name in global_variable.get_upload_breakpoint_dict().keys():
+ # self.logger.info(f"开始处理要平差截图的断点 {breakpoint_name}")
+ # # 把断点名称给find_keyword
+ # if not self.find_keyword(breakpoint_name):
+ # self.logger.error(f"设备 {device_id} 未找到包含 {breakpoint_name} 的文件名")
+ # all_success = False
+ # continue
+
+ # if not self.handle_measurement_dialog():
+ # self.logger.error(f"设备 {device_id} 处理测量弹窗失败")
+ # all_success = False
+ # continue
+
+ # if not self.check_apply_btn():
+ # self.logger.error(f"设备 {device_id} 检查平差处理按钮失败")
+ # all_success = False
+ # self.click_back_button(device_id)
+ # continue
+
+ # # 根据断点名称在get_upload_breakpoint_dict()中获取线路编码
+ # line_code = global_variable.get_upload_breakpoint_dict().get(breakpoint_name)
+ # if not line_code:
+ # self.logger.error(f"设备 {device_id} 未找到断点 {breakpoint_name} 对应的线路编码")
+ # all_success = False
+ # continue
+
+ # # 根据线路编码查找对应的时间
+ # date_str, time_str = self.get_line_end_time(line_code)
+ # if not time_str or not date_str:
+ # self.logger.error(f"设备 {device_id} 未找到线路 {line_code} 对应的时间")
+ # all_success = False
+ # continue
+
+ # # 修改时间
+ # if not self.set_device_time(device_id, time_str, date_str):
+ # self.logger.error(f"设备 {device_id} 设置设备时间失败")
+ # all_success = False
+ # continue
+
+ # # 滑动列表到底部
+ # if not self.scroll_list_to_bottom(device_id):
+ # self.logger.error(f"设备 {device_id} 下滑列表到底部失败")
+ # all_success = False
+ # continue
+
+ # # 2. 点击最后一个spinner
+ # if not self.click_last_spinner_with_retry(device_id):
+ # self.logger.error(f"设备 {device_id} 点击最后一个spinner失败")
+ # all_success = False
+ # continue
+
+ # # 3. 再下滑一次
+ # if not self.scroll_down_once(device_id):
+ # self.logger.warning(f"设备 {device_id} 再次下滑失败，但继续执行")
+
+ # # 平差处理完成后截图
+ # time.sleep(0.2) # 等待平差处理按钮点击后的界面变化
+ # logging.info("断点保存到上传列表成功，开始截图")
+ # # png_time = date_str + " " + time_str
+ # if not self.take_screenshot(breakpoint_name, date_str, time_str):
+ # self.logger.error(f"设备 {device_id} 截图失败")
+ # self.write_screenshot_status(breakpoint_name, success=False)
+ # all_success = False
+ # else:
+ # self.write_screenshot_status(breakpoint_name, success=True)
+
+ # # 点击返回按钮并处理弹窗
+ # if not self.execute_back_navigation_steps(device_id):
+ # self.logger.error(f"设备 {device_id} 处理返回按钮确认失败")
+ # all_success = False
+
+ # 启用WiFi
+ # if not self.enable_wifi(device_id):
+ # self.logger.error(f"设备 {device_id} 启用WiFi失败")
+ # return False
+
+ # # 根据截图结果更新time.txt文件状态
+ # status = "ok" if all_success else "true"
+ # # self.update_upload_info_status(status)
+ # username = global_variable.get_username()
+ # self.update_file_status(username, "running", status)
+ # self.logger.info(f"{username} 截图完成状态为 {status}")
+
+ # self.logger.info(f"设备 {device_id} 截图页面操作执行完成，状态: {status}")
+ # return True
except Exception as e:
self.logger.error(f"设备 {device_id} 执行截图页面操作时出错: {str(e)}")
# 保存错误截图
diff --git a/scheduler.py b/scheduler.py
index 0454f72..1ab4c56 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -114,12 +114,12 @@ def normalize_datetime(time_str):
def get_combined_tasks():
"""
- 结合接口(is_ok==1)和本地文件(true)筛选任务
+ # 结合接口(is_ok==1)和本地文件(true)筛选任务
+ 结合接口(is_ok==1)和获取解析云端轨迹文件筛选任务
"""
try:
- local_times = parse_time_config()
- if not local_times:
- return {}
+
+
# 调用你的 API 接口获取账号信息
accounts = apis.get_accounts_from_server("68c0dbfdb7cbcd616e7c5ab5")
@@ -127,7 +127,7 @@ def get_combined_tasks():
return {}
task_list = {}
- # today = datetime.now().strftime("%Y-%m-%d")
+ today = datetime.now().strftime("%Y%m%d")
for account in accounts:
if account.get('is_ok') == 1:
@@ -135,22 +135,40 @@ def get_combined_tasks():
ip = account.get('device_ip')
port = account.get('device_port')
project_name = account.get('project_name')
-
- # 只有在 time.txt 中是 true 的账号才会被加入
- if user in local_times and ip and port:
- address = f"{ip}:{port}"
- # full_time = f"{today} {local_times[user]}"
- # 确保时间是两位数格式
- raw_time = local_times[user]
- # # 将时间格式化为两位数：9:52:20 -> 09:52:20
- # if ':' in raw_time:
- # parts = raw_time.split(':')
- # if len(parts[0]) == 1:
- # raw_time = f"0{raw_time}" # 补齐前导零
+
+ # 获取轨迹文件
+ save_path = apis.fetch_and_save_track_file(f"https://database.yuxindazhineng.com/team-bucket/69378c5b4f42d83d9504560d/track/{today}/{today}_1_{user}.txt")
+ if save_path:
+
+ # 1. 解析原始文件
+ raw_records = apis.parse_track_file(save_path)
- # full_time = f"{today} {raw_time}"
- full_time = normalize_datetime(raw_time)
- task_list[address] = {"time": full_time, "user": user, "project_name": project_name}
+ # 2. 按线路ID去重（重复则保留后面的记录）
+ deduplicated_records = apis.deduplicate_by_line_id(raw_records)
+
+ # 3. 从去重后的记录中找最晚结束时间
+ latest_time = apis.get_latest_end_time(deduplicated_records)
+
+ # 4. 写入end.txt
+ # write_success = apis.write_to_file(latest_time)
+ write_success = apis.writer_file_status(user, latest_time, "true")
+ time.sleep(2)
+
+
+ # 获取状态为true的账号
+ local_times = parse_time_config()
+ if not local_times:
+ return {}
+
+ # 只有在写入成功且 time.txt 中是 true 的账号才会被加入
+ if write_success and user in local_times and ip and port:
+ address = f"{ip}:{port}"
+ # 确保时间是两位数格式
+ raw_time = local_times[user]
+ full_time = normalize_datetime(raw_time)
+ task_list[address] = {"time": full_time, "user": user, "project_name": project_name}
+ elif not write_success:
+ print(f"❌ 写入end.txt失败，跳过任务: {user}")
return task_list
except Exception as e:
@@ -223,4 +241,5 @@ if __name__ == "__main__":
try:
monitor_center()
except KeyboardInterrupt:
- print("\n👋 用户手动停止程序。")
\ No newline at end of file
+ print("\n👋 用户手动停止程序。")
+