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

Compare commits

base: yineng.huang:1d160ef98dc0026e8bd30a36587fe3b0d7c9b028
Branches Tags
yineng.huang:hz_1122
yineng.huang:hz_1122_temp
yineng.huang:master
yineng.huang:main
..
compare: yineng.huang:37be8c68eae437e9dc9b702eefb08a9368c55835
Branches Tags
yineng.huang:hz_1122
yineng.huang:hz_1122_temp
yineng.huang:master
yineng.huang:main

No commits in common. "1d160ef98dc0026e8bd30a36587fe3b0d7c9b028" and "37be8c68eae437e9dc9b702eefb08a9368c55835" have entirely different histories.
1d160ef98d ... 37be8c68ea

2 changed files with 5 additions and 15 deletions
Show Stats Expand all files Collapse all files

6
cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/screen/AndroidScreenResponseThread.java
View File

@ -23,6 +23,8 @@ public class AndroidScreenResponseThread extends ImageScreenResponse {
private AdbDevice adbDevice;
private byte[] lastData;
private final Logger logger = LoggerFactory.getLogger(AndroidScreenResponseThread.class);
public AndroidScreenResponseThread(AdbDevice adbDevice) {
@ -105,7 +107,7 @@ public class AndroidScreenResponseThread extends ImageScreenResponse {
}
//录屏
if (null != screenRecorder) {
screenRecorder.addImgToVideo(this.lastData);
screenRecorder.addImgToVideo(screenPicContent);
}
//有后端会话则给后端推送屏幕图片
if (!CollectionUtils.isEmpty(webSessions)) {
@ -118,7 +120,7 @@ public class AndroidScreenResponseThread extends ImageScreenResponse {
sendDeviceStatus = false;
}
logger.info("设备【{}】发送图片到微服务：{}张",adbDevice.getSerial(),send++);
SessionUtils.sendBinary(webSession, this.lastData);
SessionUtils.sendBinary(webSession, screenPicContent);
logger.info("设备【{}】发送图片到微服务完成：{}张",adbDevice.getSerial(),send);
} else {
logger.warn("推送到web端的session已经断开，sessionId:{}",webSession.getId());

14
cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/deviceManager/screen/ImageScreenResponse.java
View File

@ -32,8 +32,6 @@ public abstract class ImageScreenResponse extends Thread{
protected CatchParam catchParam;
protected byte[] lastData;
public void setCatchParam(CatchParam catchParam) {
this.catchParam = catchParam;
}
@ -85,17 +83,7 @@ public abstract class ImageScreenResponse extends Thread{
Map<String, Object> messageMap = new HashMap<>();
messageMap.put(ResponseCmd.DeviceStatus.STATUS, ResponseCmd.DeviceStatus.CONNECTING);
SessionUtils.sendMessageInitiative(session, ResponseCmd.DEVICE_STATUS, deviceId, messageMap, "设备掉线了");
logger.info("发送设备【{}】最后一张图片到前端..............",deviceId);
if (null != this.lastData) {
Map<String, Object> result = new HashMap<>();
result.put(ResponseCmd.DeviceStatus.STATUS, ResponseCmd.DeviceStatus.CONNECTED);
SessionUtils.sendMessageInitiative(session, ResponseCmd.DEVICE_STATUS, deviceId, result, "设备已连接");
SessionUtils.sendBinary(session, this.lastData);
} else {
logger.info("发送设备【{}】最后一张图片是空，获取到了再发..............",deviceId);
this.sendDeviceStatus = true;
}
this.sendDeviceStatus = true;
}
public void setSendDeviceStatus(boolean sendDeviceStatus) {