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); - } }