From b56418e3b9567ba97d222975c0b753ee4fdc7478 Mon Sep 17 00:00:00 2001 From: "jieying.li" Date: Tue, 6 Aug 2024 10:34:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=B8=8A=E4=BD=8D=E6=9C=BA=201.?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=94=B1=E7=88=B6=E7=B1=BB=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=88=AA=E5=8F=96=E5=85=A8=E5=B1=8F=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/ios/IosDeviceHandleHelper.java | 23 ++++++++++++++++++- .../ios/LinuxAndWindowsIosHandleHelper.java | 5 ---- .../utils/ios/MacIosHandleHelper.java | 11 --------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/IosDeviceHandleHelper.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/IosDeviceHandleHelper.java index d14d009..23b1dad 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/IosDeviceHandleHelper.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/IosDeviceHandleHelper.java @@ -79,7 +79,28 @@ public abstract class IosDeviceHandleHelper { public abstract boolean activateApp(String deviceId, String appPackage); + /** + * 截取指定区域图片 + * 如果x y为空，则截取全屏 + * + * @param deviceId + * @param startX + * @param startY + * @param cutWidth + * @param cutHeight + * @param screenWidth + * @param screenHeight + * @return + */ public abstract File getScreenShotFile(String deviceId, Integer startX, Integer startY, Integer cutWidth, Integer cutHeight, Integer screenWidth, Integer screenHeight); - public abstract File getScreenShotFile(String deviceId); + /** + * 截取全屏 + * + * @param deviceId 设备id + * @return + */ + public File getScreenShotFile(String deviceId){ + return getScreenShotFile(deviceId, null, null, null, null, null, null); + }; } diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/LinuxAndWindowsIosHandleHelper.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/LinuxAndWindowsIosHandleHelper.java index 7c0e46e..6ff58d3 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/LinuxAndWindowsIosHandleHelper.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/utils/ios/LinuxAndWindowsIosHandleHelper.java @@ -239,9 +239,4 @@ public class LinuxAndWindowsIosHandleHelper extends IosDeviceHandleHelper { } } } - - @Override - public File getScreenShotFile(String deviceId) { - return getScreenShotFile(deviceId, null, null, null, null, null, null); - } } 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 8e2d9cd..b755738 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 @@ -111,15 +111,4 @@ public class MacIosHandleHelper extends IosDeviceHandleHelper { } return file; } - - /** - * 全屏截图 - * - * @param deviceId - * @return - */ - @Override - public File getScreenShotFile(String deviceId) { - return getScreenShotFile(deviceId, null, null, null, null, null, null); - } }