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

ios和android录屏视频文件无法播放、线程阻塞，无法GC

master
yineng.huang 2024-07-24 16:07:49 +08:00
parent 509a7278fc
commit 8e8b116492
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/driver/agent/AndroidAgentSession.java
View File

@ -138,15 +138,10 @@ public class AndroidAgentSession {
* 安静地关闭流 * 安静地关闭流
*/ */
public void closeSilence() { public void closeSilence() {
try { if (null != this.sendThread) {
state = false; this.sendThread.interrupt();
logger.debug("关闭设备【{}】的agentSession连接",serial);
if (transport != null) {
transport.close();
}
} catch (IOException ignore) {
} }
state = false;
} }
private class CommandSendThread extends Thread { private class CommandSendThread extends Thread {
@ -168,7 +163,14 @@ public class AndroidAgentSession {
break; break;
} }
} }
closeSilence(); try {
logger.debug("关闭设备【{}】的agentSession连接",serial);
if (transport != null) {
transport.close();
}
} catch (IOException ignore) {
}
} }
} }
} }

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

@ -3,6 +3,7 @@ package net.northking.cctp.upperComputer.service;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.img.ImgUtil; import cn.hutool.core.img.ImgUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.appium.java_client.AppiumDriver; import io.appium.java_client.AppiumDriver;
import io.appium.java_client.android.AndroidDriver; import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver; import io.appium.java_client.ios.IOSDriver;
@ -864,17 +865,20 @@ public class AndroidDebuggerServiceImpl extends AbstractDebuggerService {
@Override @Override
public String endRecord(DebuggerDeviceInfo info) { public String endRecord(DebuggerDeviceInfo info) {
String result = null; String videoUrl = null;
logger.info("收到设备【{}】在任务【{}】关闭录屏的请求............",info.getDeviceId(),info.getTaskId()); logger.info("收到设备【{}】在任务【{}】关闭录屏的请求............",info.getDeviceId(),info.getTaskId());
AndroidScreenResponseThread screenThread = AndroidDeviceManager.getInstance().getScreenThread(info.getDeviceId()); AndroidScreenResponseThread screenThread = AndroidDeviceManager.getInstance().getScreenThread(info.getDeviceId());
if (null != screenThread && screenThread.isAlive() && !screenThread.isInterrupted()) { if (null != screenThread && screenThread.isAlive() && !screenThread.isInterrupted()) {
result = screenThread.stopRecord(); String result = screenThread.stopRecord();
return result; JSONObject jsonObject = JSON.parseObject(result, JSONObject.class);
videoUrl = jsonObject.getString("videoUrl");
logger.info("设备【{}】在任务【{}】录屏关闭，得到的视频地址为：{}",info.getDeviceId(),info.getTaskId(),videoUrl);
return videoUrl;
} else { } else {
logger.info("设备【{}】在任务【{}】录屏不存在............",info.getDeviceId(),info.getTaskId()); logger.info("设备【{}】在任务【{}】录屏不存在............",info.getDeviceId(),info.getTaskId());
} }
logger.info("设备【{}】在任务【{}】录屏保存的地址：{}............",info.getDeviceId(),info.getTaskId(),result); logger.info("设备【{}】在任务【{}】录屏保存的地址：{}............",info.getDeviceId(),info.getTaskId(),videoUrl);
return result; return videoUrl;
} }
@Override @Override

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

@ -248,17 +248,20 @@ public class IosDebuggerServiceImpl extends AbstractDebuggerService {
@Override @Override
public String endRecord(DebuggerDeviceInfo info) { public String endRecord(DebuggerDeviceInfo info) {
String result = null; String videoUrl = null;
logger.info("收到设备【{}】在任务【{}】关闭录屏的请求............",info.getDeviceId(),info.getTaskId()); logger.info("收到设备【{}】在任务【{}】关闭录屏的请求............",info.getDeviceId(),info.getTaskId());
IosScreenResponseThread screenThread = IOSDeviceManager.getInstance().getScreenThread(info.getDeviceId()); IosScreenResponseThread screenThread = IOSDeviceManager.getInstance().getScreenThread(info.getDeviceId());
if (null != screenThread && screenThread.isAlive() && !screenThread.isInterrupted()) { if (null != screenThread && screenThread.isAlive() && !screenThread.isInterrupted()) {
result = screenThread.stopRecord(); String result = screenThread.stopRecord();
return result; JSONObject jsonObject = JSON.parseObject(result, JSONObject.class);
videoUrl = jsonObject.getString("videoUrl");
logger.info("设备【{}】在任务【{}】录屏关闭，得到的视频地址为：{}",info.getDeviceId(),info.getTaskId(),videoUrl);
return videoUrl;
} else { } else {
logger.info("设备【{}】在任务【{}】录屏不存在............",info.getDeviceId(),info.getTaskId()); logger.info("设备【{}】在任务【{}】录屏不存在............",info.getDeviceId(),info.getTaskId());
} }
logger.info("设备【{}】在任务【{}】录屏保存的地址：{}............",info.getDeviceId(),info.getTaskId(),result); logger.info("设备【{}】在任务【{}】录屏保存的地址：{}............",info.getDeviceId(),info.getTaskId(),videoUrl);
return result; return videoUrl;
} }
@Override @Override