From c2b8a98a2c8046875df32199e746dbefa969ea48 Mon Sep 17 00:00:00 2001
From: "yineng.huang" <huangyineng_zxl@163.com>
Date: Fri, 12 Jul 2024 11:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8C=E6=97=B6=E5=AD=98=E5=9C=A8=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E8=8E=B7=E5=8F=96=E6=80=A7=E8=83=BD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AndroidDebuggerServiceImpl.java   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java
index 97e4250..9418373 100644
--- a/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java
+++ b/cctp-atu/atu-upper-computer/src/main/java/net/northking/cctp/upperComputer/service/AndroidDebuggerServiceImpl.java
@@ -118,25 +118,27 @@ public class AndroidDebuggerServiceImpl extends AbstractDebuggerService {
 
     @Override
     public boolean recordDevicePer(DebuggerDeviceInfo info) {
-        AndroidDeviceInfoByPackageThread androidDeviceInfoByPackageThread = queryDeviceInfoByPackageMap.get(info.getCaseId());
-        if (androidDeviceInfoByPackageThread == null || !androidDeviceInfoByPackageThread.isAlive() || androidDeviceInfoByPackageThread.isInterrupted()) {
-            logger.debug("开始记录任务【{}】的应用的参数。。。。。。。。。。", info.getCaseId());
-            androidDeviceInfoByPackageThread = new AndroidDeviceInfoByPackageThread(info);
-            androidDeviceInfoByPackageThread.start();
-            queryDeviceInfoByPackageMap.put(info.getCaseId(), androidDeviceInfoByPackageThread);
+        AndroidDeviceInfoByPackageThread androidDeviceInfoByPackageThread = queryDeviceInfoByPackageMap.get(info.getDeviceId());
+        if (androidDeviceInfoByPackageThread != null) {
+            logger.debug("记录设备【{}】的应用的性能在任务【{}】中已经存在，干掉上一个。。。。。。。。。。", info.getDeviceId(),info.getCaseId());
+            androidDeviceInfoByPackageThread.stopThread();
         } else {
-            logger.debug("记录任务【{}】的应用的参数线程已经存在，无需创建新的。。。。。。。。。。", info.getCaseId());
+            logger.debug("记录设备【{}】的应用的性能线程不存在。。。。。。。。。。", info.getDeviceId());
         }
+        logger.debug("开始记录设备【{}】任务【{}】的应用的参数。。。。。。。。。。", info.getDeviceId(),info.getCaseId());
+        androidDeviceInfoByPackageThread = new AndroidDeviceInfoByPackageThread(info);
+        androidDeviceInfoByPackageThread.start();
+        queryDeviceInfoByPackageMap.put(info.getDeviceId(), androidDeviceInfoByPackageThread);
         AndroidDeviceAllInfoThread androidDeviceAllInfoThread = queryDeviceInfoMap.get(info.getCaseId());
-        if (androidDeviceAllInfoThread == null || !androidDeviceAllInfoThread.isAlive() || androidDeviceAllInfoThread.isInterrupted()) {
-            logger.debug("开始记录任务【{}】的设备的参数。。。。。。。。。。", info.getCaseId());
-            androidDeviceAllInfoThread = new AndroidDeviceAllInfoThread(info);
-            androidDeviceAllInfoThread.start();
-            queryDeviceInfoMap.put(info.getCaseId(), androidDeviceAllInfoThread);
+        if (androidDeviceAllInfoThread != null ) {
+            logger.debug("记录设备【{}】的性能数据，任务【{}】已经存在。。。。。。。。。。", info.getDeviceId(),info.getCaseId());
+            androidDeviceAllInfoThread.stopThread();
         } else {
-            logger.debug("记录任务【{}】的设备的参数线程已经存在，无需创建新的。。。。。。。。。。", info.getCaseId());
+            logger.debug("记录设备【{}】性能线程不存在。。。。。。。。。。", info.getDeviceId());
         }
-
+        androidDeviceAllInfoThread = new AndroidDeviceAllInfoThread(info);
+        androidDeviceAllInfoThread.start();
+        queryDeviceInfoMap.put(info.getCaseId(), androidDeviceAllInfoThread);
         return true;
     }