From 91547ae8732ad498ee0f7e12c2cc7d257b7f64aa Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 6 Mar 2023 18:09:50 +0800
Subject: [PATCH] [2.13.0-arch-opt] func build change

---
 .../eagle/function/biz/v2x/v2n/V2XEventManager.kt | 15 ++++++++-------
 .../aicloud/AiCloudSocketBizProvider.kt           |  1 +
 .../function/hmi/ui/setting/DebugSettingView.kt   | 10 ++++------
 .../src/main/res/layout/view_debug_setting.xml    | 12 ------------
 .../eagle/core/data/config/FunctionBuildConfig.kt |  8 --------
 .../locationinfo/MogoLocationInfoServices.java    |  2 +-
 6 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
index 32fd455865..8ac9e08005 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
@@ -159,9 +159,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
                 handleWarningTargetEvent(event.data)
             }
             is V2XEvent.RoadAI -> {
-                if (FunctionBuildConfig.isV2NFromCar) {
-                    return
-                }
                 handleRoadMarkerEvent(event.data.toRoadMarker())
             }
             is V2XEvent.RoadEventX -> {
@@ -173,12 +170,16 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
         }
     }
 
-    @SuppressLint("NewApi")
+    @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N,
+        linkCode = CHAIN_LINK_CLOUD,
+        endpoint = TracingConstants.Endpoint.PAD,
+        nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N,
+        paramIndexes = [0],
+        clientPkFileName = "sn"
+    )
     override fun onAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
         super.onAutopilotIdentifyPlanningObj(planningObjects)
-        if (!FunctionBuildConfig.isV2NFromCar) {
-            return
-        }
         planningObjects?.let {
             if (it.isNotEmpty()) {
                 val first = it.stream()
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
index 971e7b2af2..624477723d 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
@@ -12,6 +12,7 @@ class AiCloudSocketBizProvider : IMoGoFunctionServerProvider {
         get() = "AiCloudSocketBizProvider"
 
     override fun init(context: Context?) {
+        //todo bus加载
         context?.let {
             SocketManager.getInstance().init(it, 0.0, 0.0)
             SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012())
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 08ac910477..d855300e60 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -126,15 +126,19 @@ internal class DebugSettingView @JvmOverloads constructor(
     private var accelerationThresholdNum: Double = 0.0
 
     // 感知识别「已知类型」数据个数
+    @Volatile
     private var mIdentifyDataSize = 0
 
     // 感知识别「未知类型」数据个数
+    @Volatile
     private var mUnknownIdentifyDataSize = 0
 
     // 引导线点个数
+    @Volatile
     private var mTrajectoryInfoSize = 0
 
     // 全局路径规划点个数
+    @Volatile
     private var mRouteInfoSize = 0
 
     //日志过滤标签集合
@@ -628,12 +632,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isBeautyMode = isChecked
         }
 
-        tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
-        //v2n车端预警
-        tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isV2NFromCar = isChecked
-        }
-
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 971434f8bc..c38a1baeb9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -242,18 +242,6 @@
                 android:textOn="关闭感知优化模式"
                 android:textSize="@dimen/dp_24" />
 
-            <ToggleButton
-                android:id="@+id/tbV2NFromCar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="开启车端V2N预警"
-                android:textOn="关闭车端V2N预警"
-                android:textSize="@dimen/dp_24" />
-
             <ToggleButton
                 android:id="@+id/tbDrawAiCloudFusion"
                 android:layout_width="match_parent"
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 c92de25581..c02056061b 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
@@ -49,14 +49,6 @@ object FunctionBuildConfig {
     @JvmField
     var detouringSpeed = 3
 
-    /**
-     * 是否从车端融合过来的v2n事件
-     * 默认关闭，开启后接收车端融合预警，关闭云端长链V2N
-     */
-    @Volatile
-    @JvmField
-    var isV2NFromCar = false
-
     /**
      * 是否是感知优化模式
      * 默认开启
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
index c41290ce40..1a377a0b79 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java
@@ -14,7 +14,7 @@ public class MogoLocationInfoServices {
     private static final String TAG = "MogoLocationInfoServices-sdk";
 
     private static volatile MogoLocationInfoServices sInstance;
-    private MogoLocation mLocation;
+    private volatile MogoLocation mLocation;
 
     private MogoLocationInfoServices() {
     }