yineng.huang
/
hz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
yineng.huang 2024-07-24 16:07:59 +08:00
parent 8e8b116492 0e785a67a5
commit 47b6c0d728
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/device/bean/MobileDeviceConnection.java
View File

@ -886,6 +886,7 @@ public class MobileDeviceConnection extends AbstractDeviceConnection {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("caseId", devicePerInfo.getCaseId()); params.put("caseId", devicePerInfo.getCaseId());
params.put("platform", deviceInfo.getPlatform()); params.put("platform", deviceInfo.getPlatform());
params.put("deviceId", deviceInfo.getDeviceId());
HttpEntity<Map<String, Object>> entity = new HttpEntity<>(params); HttpEntity<Map<String, Object>> entity = new HttpEntity<>(params);
try { try {
ResponseEntity<String[]> responseEntity = restTemplate.exchange(String.format(STOP_RECORD_DEVICE_PER, deviceInfo.getConnectAddress() + ":" + (null == deviceInfo.getPort() ? defaultUpperPort : deviceInfo.getPort())), HttpMethod.POST, entity, String[].class); ResponseEntity<String[]> responseEntity = restTemplate.exchange(String.format(STOP_RECORD_DEVICE_PER, deviceInfo.getConnectAddress() + ":" + (null == deviceInfo.getPort() ? defaultUpperPort : deviceInfo.getPort())), HttpMethod.POST, entity, String[].class);

2
cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java
View File

@ -153,7 +153,7 @@ public class AndroidDebuggerServiceImpl extends AbstractDebuggerService {
public String[] stopRecordDevicePer(DebuggerDeviceInfo info) { public String[] stopRecordDevicePer(DebuggerDeviceInfo info) {
String[] result = new String[2]; String[] result = new String[2];
logger.debug("结束任务：{}的设备和应用的参数。。。。。。。。。。",info.getCaseId()); logger.debug("结束任务：{}的设备和应用的参数。。。。。。。。。。",info.getCaseId());
AndroidDeviceInfoByPackageThread thread = queryDeviceInfoByPackageMap.remove(info.getCaseId()); AndroidDeviceInfoByPackageThread thread = queryDeviceInfoByPackageMap.remove(info.getDeviceId());
if (null != thread && !thread.isInterrupted() && thread.isAlive()) { if (null != thread && !thread.isInterrupted() && thread.isAlive()) {
String appInfoAddress = thread.stopThread(); String appInfoAddress = thread.stopThread();
result[1] = appInfoAddress; result[1] = appInfoAddress;