From e87632e1271fc52a7defc7e3ceb5306e7e30a928 Mon Sep 17 00:00:00 2001 From: "jieying.li" Date: Mon, 5 Aug 2024 16:58:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=B8=8A=E4=BD=8D=E6=9C=BA=201.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9mac=E7=9A=84=E4=B8=8A=E4=BD=8D=E6=9C=BA?= =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=96=B9=E5=BC=8F=202.=E4=BF=AE=E6=94=B9mac?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E4=BD=8D=E6=9C=BA=E7=9A=84=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automation/handler/IosAutomationHandler.java | 9 ++++++++- .../cctp/upperComputer/utils/ios/MacIosHandleHelper.java | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/automation/handler/IosAutomationHandler.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/automation/handler/IosAutomationHandler.java index 39e9a60..7b46e8d 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/automation/handler/IosAutomationHandler.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/automation/handler/IosAutomationHandler.java @@ -462,7 +462,14 @@ public class IosAutomationHandler extends AbstractAutomationHandler { Map data = request.getData(); String ocrText = (String) data.get(UpperParamKey.OCR_TEXT); logger.debug("拿到的截图参数----->>>>>查找的文本:{}", ocrText); - File file = ScreenShotUtils.getIOSMobileScreenShot(serial); +// File file = ScreenShotUtils.getIOSMobileScreenShot(serial); + Integer x = data.containsKey(UpperParamKey.X) ? (Integer) data.get(UpperParamKey.X) : null; + Integer y = data.containsKey(UpperParamKey.Y) ? (Integer) data.get(UpperParamKey.Y) : null; + Integer screenWidth = data.containsKey(UpperParamKey.SCREEN_WIDTH) ? (Integer) data.get(UpperParamKey.SCREEN_WIDTH) : null; + Integer screenHeight = data.containsKey(UpperParamKey.SCREEN_HEIGHT) ? (Integer) data.get(UpperParamKey.SCREEN_HEIGHT) : null; + Integer cutWidth = data.containsKey(UpperParamKey.WIDTH) ? (Integer) data.get(UpperParamKey.WIDTH) : null; + Integer cutHeight = data.containsKey(UpperParamKey.HEIGHT) ? (Integer) data.get(UpperParamKey.HEIGHT) : null; + File file = deviceHandleHelper.getScreenShotFile(serial, x, y, cutWidth, cutHeight, screenWidth, screenHeight); logger.debug("执行步骤token：{}，ocr截图：{}", request.getStepToken(), file.getAbsolutePath()); return getFileBase64(file); } diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/MacIosHandleHelper.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/MacIosHandleHelper.java index be598ce..2a00f8e 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/MacIosHandleHelper.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/MacIosHandleHelper.java @@ -95,8 +95,12 @@ public class MacIosHandleHelper extends IosDeviceHandleHelper { } else { logger.debug("设备【{}】截图的结果：{}",deviceId,screenShotFile.getAbsolutePath()); } - file = cutImageFile(screenShotFile, deviceId, startX, startY, cutWidth, cutHeight, screenWidth, screenHeight); - logger.debug("截取出来的图像为：{}",file.getAbsolutePath()); + if (null != startX || null != startY) { + file = cutImageFile(screenShotFile, deviceId, startX, startY, cutWidth, cutHeight, screenWidth, screenHeight); + logger.debug("截取出来的图像为：{}", file.getAbsolutePath()); + } else { + file = screenShotFile; + } } finally { if (null != screenShotFile) { //删除