From b9bcbf49c7ca8c5b42dd00597fd7cd855d4ddfaf Mon Sep 17 00:00:00 2001 From: "yineng.huang" Date: Mon, 8 Jul 2024 15:03:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=80=E6=AC=A1node?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cctp/upperComputer/constants/RequestCmd.java | 2 ++ .../thread/AbstractIosMessageHandlerThread.java | 15 +++++++++++++++ .../webSocket/thread/AbstractMessageHandler.java | 4 +++- .../thread/AndroidMessageHandlerThread.java | 6 ++++++ .../webSocket/thread/MessageHandler.java | 2 ++ .../constants/MobileConnectionConstants.java | 2 ++ .../cctp/mobile/socket/UpperWebSocketClient.java | 3 +++ .../cctp/mobile/thread/ProcessMsgThread.java | 3 +++ 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/constants/RequestCmd.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/constants/RequestCmd.java index 4035f71..a9a15be 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/constants/RequestCmd.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/constants/RequestCmd.java @@ -44,6 +44,8 @@ public interface RequestCmd { String DEVICE_STOP_NODE = "device_stop_node";//停止获取node节点 + String DEVICE_NODE = "device_node"; //获取一次节点 + String DEVICE_OPEN_SETTING = "device_openSetting";//打开设置 String DEVICE_OPEN_CAMERA= "device_openCamera";//打开相机 diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractIosMessageHandlerThread.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractIosMessageHandlerThread.java index 850b066..a5802d4 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractIosMessageHandlerThread.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractIosMessageHandlerThread.java @@ -4,6 +4,7 @@ import net.northking.cctp.upperComputer.constants.KeyBoardCodeEnum; import net.northking.cctp.upperComputer.deviceManager.IOSDeviceManager; import net.northking.cctp.upperComputer.deviceManager.thread.IosDeviceInitThread; import net.northking.cctp.upperComputer.driver.ios.NKAgent; +import net.northking.cctp.upperComputer.driver.ios.command.data.UiNodeData; import net.northking.cctp.upperComputer.entity.PhoneEntity; import net.northking.cctp.upperComputer.exception.ExecuteException; import net.northking.cctp.upperComputer.exception.ParamMistakeException; @@ -146,6 +147,20 @@ public abstract class AbstractIosMessageHandlerThread extends AbstractMessageHan SessionUtils.sendSuccessData(session, request, null,"该设备尚未开启获取节点树"); } + @Override + public void getNodeTreeOnce(CmdRequest request) { + IosDeviceInitThread iosInitThread = IOSDeviceManager.getInstance().getIosInitThread(phoneEntity.getUdid()); + if (null == iosInitThread || iosInitThread.isInterrupted() || !iosInitThread.isAlive()) { + logger.debug("设备【{}】掉线了........................", phoneEntity.getUdid()); + SessionUtils.sendFailureMessage(session,request,"设备已经掉线"); + } + logger.debug("开始获取设备【{}】一次的uiNode......",phoneEntity.getUdid()); + UiNodeData uiNodeData = iosInitThread.getNkAgent().uiTreeNode(); + logger.debug("获取结束，nodeData空：{}", uiNodeData == null); + SessionUtils.sendSuccessData(session, request, uiNodeData, "获取节点树成功"); + } + + @Override public void clearAndCloseDeviceAgentConnection() { //通知前端设备现在处于掉线的状态,前端开始转圈 diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractMessageHandler.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractMessageHandler.java index b39aef8..1e51bf5 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractMessageHandler.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AbstractMessageHandler.java @@ -96,7 +96,9 @@ public abstract class AbstractMessageHandler extends Thread implements MessageHa startUiNode(request); } else if (RequestCmd.DEVICE_STOP_NODE.equals(request.getCmd())) { //停止获取node节点数据 stopUiNode(request); - } else if (RequestCmd.DEVICE_OPEN_SETTING.equals(request.getCmd())) { //打开设置 + } else if (RequestCmd.DEVICE_NODE.equals(request.getCmd())){ //获取一次节点 + getNodeTreeOnce(request); + }else if (RequestCmd.DEVICE_OPEN_SETTING.equals(request.getCmd())) { //打开设置 openSetting(request); } else if (RequestCmd.DEVICE_OPEN_CAMERA.equals(request.getCmd())) { //打开相机 deviceOpenCamera(request); diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AndroidMessageHandlerThread.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AndroidMessageHandlerThread.java index 3381e8e..a70b07c 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AndroidMessageHandlerThread.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/AndroidMessageHandlerThread.java @@ -324,6 +324,12 @@ public class AndroidMessageHandlerThread extends AbstractMessageHandler { } + + @Override + public void getNodeTreeOnce(CmdRequest request) { + + } + @Override public void clearAndCloseDeviceAgentConnection() { if (null != asyncAgentSession) { diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/MessageHandler.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/MessageHandler.java index 14ece4a..c166110 100644 --- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/MessageHandler.java +++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/webSocket/thread/MessageHandler.java @@ -93,6 +93,8 @@ public interface MessageHandler { public void stopUiNode(CmdRequest request); + public void getNodeTreeOnce(CmdRequest request); + //掉线相关 public void clearAndCloseDeviceAgentConnection(); //断开原有的设备agent的连接 diff --git a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/constants/MobileConnectionConstants.java b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/constants/MobileConnectionConstants.java index 33efc36..1d4eb05 100644 --- a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/constants/MobileConnectionConstants.java +++ b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/constants/MobileConnectionConstants.java @@ -48,6 +48,8 @@ public interface MobileConnectionConstants { String CMD_DEVICE_START_NODE = "device_start_node"; //关闭xml String CMD_DEVICE_STOP_NODE = "device_stop_node"; + //获取一次node + String CMD_DEVICE_NODE = "device_node"; //打开设置 String CMD_DEVICE_OPENSETTING = "device_openSetting"; //打开相机 diff --git a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/socket/UpperWebSocketClient.java b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/socket/UpperWebSocketClient.java index e68d8a9..0548ff1 100644 --- a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/socket/UpperWebSocketClient.java +++ b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/socket/UpperWebSocketClient.java @@ -135,6 +135,9 @@ public class UpperWebSocketClient extends WebSocketClient { case MobileConnectionConstants.CommandConstants.CMD_DEVICE_STOP_NODE: handleUpperMsgForward(msgResponse); break; + case MobileConnectionConstants.CommandConstants.CMD_DEVICE_NODE: + handleUpperMsgForward(msgResponse); + break; default: logger.warn("指令不符合要求"); break; diff --git a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/thread/ProcessMsgThread.java b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/thread/ProcessMsgThread.java index 6b9d3b0..ab0f63d 100644 --- a/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/thread/ProcessMsgThread.java +++ b/cctp-production/cctp-mobile/src/main/java/net/northking/cctp/mobile/thread/ProcessMsgThread.java @@ -118,6 +118,9 @@ public class ProcessMsgThread extends Thread{ case MobileConnectionConstants.CommandConstants.CMD_DEVICE_STOP_NODE: handleMessageForward(msgRequest); break; + case MobileConnectionConstants.CommandConstants.CMD_DEVICE_NODE: + handleMessageForward(msgRequest); + break; case MobileConnectionConstants.CommandConstants.CMD_DEVICE_EXIT: exitMobile(); break;