From a5cd812519ed4c6c808dfa376186399c8c2a8959 Mon Sep 17 00:00:00 2001
From: "jieying.li" <jieying.li@northking.net>
Date: Wed, 27 Nov 2024 19:24:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=89=A7=E8=A1=8C=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E=201.=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0=E5=81=9C=E6=AD=A2=E5=BD=95?=
 =?UTF-8?q?=E5=B1=8F=E8=AF=B7=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cctp/se/exec/DefaultExecThread.java       | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java
index 8c54465..ebceb4b 100644
--- a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java
+++ b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java
@@ -123,6 +123,24 @@ public class DefaultExecThread implements AtuExecThread{
         }
     }
 
+    private String stopRecord() {
+        String filePath = null;
+        //停止录屏
+        boolean isSave = Integer.parseInt(task.getScreenRecordSet()) != 0;
+        if (this.startRecordFlag && this.deviceConnection != null) {
+            Map<String, Object> stopRequest = new HashMap<>();
+            stopRequest.put("save",isSave);
+            stopRequest.put("tenantId",task.getTenantId());
+            stopRequest.put("taskId",task.getTaskId());
+            try {
+                filePath = this.deviceConnection.stopRecord(stopRequest);
+            } catch (Exception e) {
+                log.error("关闭录屏失败", e);
+            }
+        }
+        return filePath;
+    }
+
 
     @Override
     public void destroy(String taskId) {
@@ -175,7 +193,7 @@ public class DefaultExecThread implements AtuExecThread{
     private boolean sendCancelResult(String taskId) {
         try {
             log.debug("任务取消更新步骤结果。。。");
-            ScriptStep step = (ScriptStep)this.scriptExecutor.getCurrentStep(); // // todo: 没有开始执行，导致取消任务时候空指针
+            ScriptStep step = (ScriptStep)this.scriptExecutor.getCurrentStep(); // // 没有开始执行，导致取消任务时候空指针
             if (step == null) {
                 try{
                     Thread.sleep(500);
@@ -184,6 +202,8 @@ public class DefaultExecThread implements AtuExecThread{
                 }
                 step = (ScriptStep)this.scriptExecutor.getCurrentStep();
             }
+            // 停止录屏请求
+            stopRecord();
             StepExecuteResult stepResult = createStepResult(step, taskId);
             updateTaskResult(stepResult);