From ea80d84f84c3c5099585e3e2a80945583b5a0375 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 1 Dec 2023 11:23:57 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0][=E6=8A=80=E6=9C=AF=E4=BC=98=E5=8C=96]?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E6=A3=80=E6=B5=8B=E6=A0=87=E8=AE=B0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                          | 3 +++
 .../main/java/com/mogo/launcher/startup/ConfigStartUp.kt  | 3 +++
 .../function/main/threadopt/ThreadOptInitializer.java     | 6 +++---
 .../mogo/eagle/core/data/config/FunctionBuildConfig.kt    | 8 ++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0d7cf0b44c..afc42ed4a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,6 +136,9 @@ android {
 
             // ⑤构建的是否是演示（美化）模式
             buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
+
+            // 是否支持卡顿检测
+            buildConfigField 'boolean', 'IS_SUPPORT_JUNK_DETECT', "${rootProject.isJunkDetectEnable()}"
         }
 
         mogo {
diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index 6e2e9741a7..ad1856531d 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -70,6 +70,9 @@ object ConfigStartUp {
         FunctionBuildConfig.adasConnectIP = BuildConfig.ADAS_CONNECT_IP
         // 是否开启secure校验
         FunctionBuildConfig.isSecure = BuildConfig.secure
+
+        // 是否开启卡顿检测
+        FunctionBuildConfig.isSupportJunkDetect = BuildConfig.IS_SUPPORT_JUNK_DETECT
     }
 
     private fun initDebugConfig() {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/threadopt/ThreadOptInitializer.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/threadopt/ThreadOptInitializer.java
index 9e6b9470ab..ee4902eaef 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/threadopt/ThreadOptInitializer.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/threadopt/ThreadOptInitializer.java
@@ -5,6 +5,8 @@ import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.os.HandlerCompat;
+
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.devatools.perf.IMoGoCpuUsageProvider;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.main.ARouterUtils;
@@ -24,12 +26,10 @@ public class ThreadOptInitializer {
 
         private volatile boolean recorded = false;
 
-        private final ThreadLocal<Long> start = new ThreadLocal<>();
-
 
         @Override
         public boolean isEnabled() {
-            return true;
+            return FunctionBuildConfig.isSupportJunkDetect;
         }
 
 
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 7b8dda948d..641597b4df 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -329,4 +329,12 @@ object FunctionBuildConfig {
     @JvmField
     var isFaultSlowDown = true
 
+
+    /**
+     * 是否支持卡顿检测
+     */
+    @Volatile
+    @JvmField
+    var isSupportJunkDetect = false
+
 }
\ No newline at end of file