From 0e785a67a5ebb39ef8ab2e31222368472cfce43c Mon Sep 17 00:00:00 2001 From: "shenyi.deng" Date: Mon, 22 Jul 2024 17:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=94=E7=94=A8=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E6=95=B0=E6=8D=AE=E7=BA=BF=E7=A8=8B=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../northking/cctp/se/device/bean/MobileDeviceConnection.java | 1 + .../cctp/upperComputer/service/AndroidDebuggerServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/device/bean/MobileDeviceConnection.java b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/device/bean/MobileDeviceConnection.java index 2766424..d6e3d07 100644 --- a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/device/bean/MobileDeviceConnection.java +++ b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/device/bean/MobileDeviceConnection.java @@ -886,6 +886,7 @@ public class MobileDeviceConnection extends AbstractDeviceConnection { HashMap params = new HashMap(); params.put("caseId", devicePerInfo.getCaseId()); params.put("platform", deviceInfo.getPlatform()); + params.put("deviceId", deviceInfo.getDeviceId()); HttpEntity> entity = new HttpEntity<>(params); try { ResponseEntity responseEntity = restTemplate.exchange(String.format(STOP_RECORD_DEVICE_PER, deviceInfo.getConnectAddress() + ":" + (null == deviceInfo.getPort() ? defaultUpperPort : deviceInfo.getPort())), HttpMethod.POST, entity, String[].class); diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java index 16d0e0e..b55eeee 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java @@ -152,7 +152,7 @@ public class AndroidDebuggerServiceImpl extends AbstractDebuggerService { public String[] stopRecordDevicePer(DebuggerDeviceInfo info) { String[] result = new String[2]; logger.debug("结束任务：{}的设备和应用的参数。。。。。。。。。。",info.getCaseId()); - AndroidDeviceInfoByPackageThread thread = queryDeviceInfoByPackageMap.remove(info.getCaseId()); + AndroidDeviceInfoByPackageThread thread = queryDeviceInfoByPackageMap.remove(info.getDeviceId()); if (null != thread && !thread.isInterrupted() && thread.isAlive()) { String appInfoAddress = thread.stopThread(); result[1] = appInfoAddress;