From cab4c5075275790380e0fbfec7a1746ef00d907c Mon Sep 17 00:00:00 2001 From: "yineng.huang" Date: Tue, 8 Oct 2024 15:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8NkAgent=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/ios/MacIosHandleHelper.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 b87f133..5dd32fd 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 @@ -80,12 +80,20 @@ public class MacIosHandleHelper extends IosDeviceHandleHelper { @Override public boolean activateApp(String deviceId, String appPackage) { - PyMobileDevice.SpecificAppleDeviceInfo specificAppleDeviceInfo = IOSDeviceManager.getInstance().getSpecificAppleDeviceInfo(deviceId); - boolean success = PyMobileDevice.getInstance().launchApp(specificAppleDeviceInfo, appPackage); - logger.debug("设备【{}】启动app【{}】的结果：{}", deviceId, appPackage, success); + NKAgent nkAgent = getNkAgent(deviceId); + String bundleId = nkAgent.activeAppBundleId(); + logger.info("设备【{}】的当前启动的应用为【{}】,传过来要启动的应用为【{}】", deviceId, bundleId,appPackage); + if (bundleId.equals(appPackage)) { + logger.info("设备【{}】的应用【{}】已经启动并展示在前台", deviceId, appPackage); + return true; + } + logger.info("设备【{}】的应用【{}】未展示在前台,开始启动", deviceId, appPackage); + boolean success = nkAgent.launchApp(appPackage); + logger.debug("设备【{}】启动app【{}】的结果：{}",deviceId,appPackage,success); return success; } + @Override public File getScreenShotFile(String deviceId, Integer startX, Integer startY, Integer cutWidth, Integer cutHeight, Integer screenWidth, Integer screenHeight) { if (cutWidth <= 0 || cutHeight <= 0) {