优化后台截图功能
This commit is contained in:
1 parent
223c127e11
commit
ace3bbfa04
70 files changed
+4392
-871
No files matched your search
@@ -477,8 +477,34 @@ class underlying_operations:
|
||||
os.makedirs(category_dir, exist_ok=True)
|
||||
return os.path.join(category_dir, f"{picname}.png")
|
||||
|
||||
def get_screenshot(self, device_id, path="pic"):
|
||||
"""截图3个adb命令需要2S左右的时间"""
|
||||
def get_screenshot(self, device_id, path="pic", use_service: bool = True):
|
||||
"""截图(支持后台服务模式)
|
||||
|
||||
参数:
|
||||
device_id: 设备ID
|
||||
path: 路径(默认"pic")
|
||||
use_service: 是否使用后台截图服务(默认True,可显著提升性能)
|
||||
|
||||
返回:
|
||||
是否成功获取截图
|
||||
"""
|
||||
# 如果启用服务模式,使用后台截图服务
|
||||
if use_service:
|
||||
try:
|
||||
from operations.screenshot_service import ScreenshotService
|
||||
service = ScreenshotService.get_instance()
|
||||
return service.get_screenshot(device_id, force=False)
|
||||
except Exception as e:
|
||||
# 服务不可用时,回退到直接截图
|
||||
from datetime import datetime
|
||||
timetag = datetime.now().strftime("%H:%M:%S")
|
||||
print(f"[{timetag}] [截图操作] ⚠️ 服务模式失败,回退到直接截图: {e}")
|
||||
|
||||
# 原有的直接截图逻辑(保持向后兼容)
|
||||
return self._get_screenshot_direct(device_id, path)
|
||||
|
||||
def _get_screenshot_direct(self, device_id, path="pic"):
|
||||
"""直接截图(不使用服务模式)"""
|
||||
if path == "pic":
|
||||
try:
|
||||
import path_config
|
||||
|
||||
Reference in new issue
Block a user