获取一次node节点

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";//打开相机

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() {
         //通知前端设备现在处于掉线的状态,前端开始转圈

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);

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) {

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的连接
 

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";
         //打开相机

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;

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;