From 84d1de40793b867bcbcbf6466021ea4319f32afe Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 14 Feb 2023 20:48:42 +0800
Subject: [PATCH] [2.13.0-arch-opt] local code opt

---
 .../main/res/layout/och_noop_fragment_hmi.xml | 22 +++++++++----------
 .../obu/MogoPrivateObuNewManager.kt           |  1 +
 .../hmi/ui/vehicle/TurnLightViewStatus.kt     |  4 ++--
 .../startup/stageone/HttpDnsStartUp.kt        |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
index 183611a077..447299cd97 100644
--- a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
+++ b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
@@ -17,7 +17,7 @@
     <com.mogo.eagle.core.function.view.MapBizView
         android:id="@+id/mapBizView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <!--刹车、转向-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
@@ -79,7 +79,7 @@
             android:layout_marginTop="@dimen/module_mogo_autopilot_status_margin_top"
             android:elevation="@dimen/dp_10"
             app:layout_constraintLeft_toLeftOf="@+id/viewSpeedChart"
-            app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart"/>
+            app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart" />
 
         <!--超视距-->
         <com.mogo.eagle.core.function.hmi.ui.widget.CameraView
@@ -107,16 +107,16 @@
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <!--红绿灯-->
         <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
             android:id="@+id/viewTrafficLightVr"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
             android:layout_marginEnd="@dimen/hmi_traffic_light_layout_margin_right"
+            android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -148,11 +148,11 @@
             android:layout_height="@dimen/module_hmi_check_size"
             android:layout_marginStart="25dp"
             android:layout_marginBottom="40dp"
+            android:contentDescription="工具箱"
             android:elevation="@dimen/dp_10"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch"
-            app:layout_goneMarginStart="50dp"
-            android:contentDescription="工具箱"/>
+            app:layout_goneMarginStart="50dp" />
 
         <!--问题反馈-->
         <ImageView
@@ -161,10 +161,10 @@
             android:layout_height="120dp"
             android:layout_marginStart="50dp"
             android:layout_marginBottom="40dp"
+            android:contentDescription="BadCase"
             android:src="@drawable/bad_case_selector"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivToolsView"
-            android:contentDescription="BadCase"/>
+            app:layout_constraintStart_toEndOf="@id/ivToolsView" />
 
         <ImageView
             android:id="@+id/ivAiCollectTools"
@@ -172,10 +172,10 @@
             android:layout_height="120dp"
             android:layout_marginStart="50dp"
             android:layout_marginBottom="40dp"
+            android:contentDescription="数据采集"
             android:src="@drawable/ai_collect_selector"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivBadCaseTools"
-            android:contentDescription="数据采集" />
+            app:layout_constraintStart_toEndOf="@id/ivBadCaseTools" />
 
         <View
             android:id="@+id/viewUpgradeTips"
@@ -223,7 +223,7 @@
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbMsgBoxDriver"
-            tools:visibility="gone"/>
+            tools:visibility="gone" />
 
         <com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView
             android:id="@+id/viewDriverMsgBoxBubble"
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
index 2be59c4d4f..6fe7f68168 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -734,6 +734,7 @@ class MogoPrivateObuNewManager private constructor() {
                         }, direction
                     )
                 }
+//                ObuManager.getInstance().obuRvToTrackedObject(info)
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
                 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
                     CallerMapUIServiceManager.getMarkerService()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
index 44650a105d..c2683e8c6c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt
@@ -28,7 +28,7 @@ import kotlinx.coroutines.launch
  * @author lixiaopeng
  * @since  2022/1/10
  */
-class TurnLightViewStatus @JvmOverloads constructor(
+open class TurnLightViewStatus @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
@@ -49,7 +49,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
         } else {
             LayoutInflater.from(context).inflate(R.layout.view_turn_light_status, this, true)
         }
-        visible = typedArray.getBoolean(R.styleable.TurnLightView_visible, true)
+        visible = typedArray.getBoolean(R.styleable.TurnLightView_visible, false)
         if (visible) {
             turn_light_layout.visibility = View.VISIBLE
         } else {
diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
index 72048fa8c4..3164260e4d 100644
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -93,7 +93,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         // 使用中台长链接
         clientConfig.isUseOriginSocket = true
         // 设置是否输出网络日志
-        clientConfig.isShowNetDebugLog = true
+        clientConfig.isShowNetDebugLog = false
 //        clientConfig.passportUrl //todo yakun
 //        clientConfig.socketBaseUrl
 //        clientConfig.socketTechUrl