Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

# Conflicts:
#	gradle.properties

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -77,6 +78,9 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
         if (EventTypeEnum.TYPE_USECASE_ID_IVP.poiType == v2xType.toString()) {
             CallerHmiManager.showLimitingVelocity(1)
         }
+        if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
+            Log.d("MsgBox-V2XWarningBR", "alertContent或ttsContent为空!")
+        }
         CallerMsgBoxManager.saveMsgBox(
             MsgBoxBean(
                 MsgBoxType.V2X,

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -9,6 +9,7 @@ import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.text.TextUtils
 import android.transition.*
+import android.util.*
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -60,8 +61,8 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.call.check.CallerCheckManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
@@ -98,6 +99,7 @@ import com.mogo.eagle.core.utilcode.reminder.api.*
 import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IStateChangeListener
 import com.mogo.eagle.core.utilcode.reminder.api.impl.*
 import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
 import com.mogo.map.MogoMap
 import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.*
@@ -1372,12 +1374,26 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     private var isRightLight: Boolean = false
     private var isDisappare: Boolean = false
 
+    @Volatile
+    private var isVisualAngleChanged = false
+
     /**
      * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) {
      */
     override fun showTurnLight(light: Int) {
         if (HmiBuildConfig.isShowTurnLightView) {
             ThreadUtils.runOnUiThread {
+                if (light == 1 || light == 2) {
+                    if (!isVisualAngleChanged) {
+                        isVisualAngleChanged = true
+                        CallerVisualAngleManager.changeVisualAngle(Turning(true))
+                    }
+                } else {
+                    if (isVisualAngleChanged) {
+                        isVisualAngleChanged = false
+                        CallerVisualAngleManager.changeVisualAngle(Turning(false))
+                    }
+                }
                 if (light == 1) {
                     if (!isLeftLight) {
                         isLeftLight = true

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -73,13 +73,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.*
-import com.mogo.map.MogoMap
 import com.mogo.map.MogoMapUIController
 import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.map.uicontroller.VisualAngleMode.*
 import com.mogo.eagle.core.function.business.routeoverlay.*
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
-import com.mogo.eagle.core.function.v2x.vip.VipCarManager
 import com.zhidao.easysocket.utils.L
 import com.zhidao.support.adas.high.other.permission.BackgrounderPermission
 import com.zhjt.mogo_core_function_devatools.env.*
@@ -1145,7 +1143,7 @@ class DebugSettingView @JvmOverloads constructor(
          * 限速数据，优先使用obu，默认打开
          */
         tbRoadLimitSpeed.setOnCheckedChangeListener { _, isChecked ->
-            HmiBuildConfig.isShowObuLimitSpeedView = !isChecked
+            HmiBuildConfig.isShowObuLimitSpeedView = isChecked
         }
 
         /**
@@ -1691,8 +1689,8 @@ class DebugSettingView @JvmOverloads constructor(
         }
         tvIpcVersionInfo.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}"
         tvIpcVersionInfoKey.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}"
-        tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
-        tvMoGoMapVersionKey.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
+        tvMoGoMapVersion.text = "HD-Map版本：${DebugConfig.getMapVersion()}"
+        tvMoGoMapVersionKey.text = "HD-Map版本：${DebugConfig.getMapVersion()}"
         tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}"
         tvAppBuildTimeInfo.text = "版本构建时间：${AppConfigInfo.appBuildTime}"
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -94,6 +95,11 @@ class SOPSettingView @JvmOverloads constructor(
             }
         }
 
+        tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
+            //默认关闭
+            HmiBuildConfig.isShowObuLimitSpeedView = isChecked
+        }
+
         //红绿灯标识
         tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
         tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1082,8 +1082,8 @@
                             android:layout_columnWeight="1"
                             android:layout_margin="2dp"
                             android:gravity="center"
-                            android:textOff="关闭路侧限速"
-                            android:textOn="获取路侧限速"
+                            android:textOff="获取路侧限速提醒"
+                            android:textOn="关闭路侧限速提醒"
                             android:textSize="@dimen/dp_24" />
 
                     </GridLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml

@@ -167,12 +167,24 @@
                 app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
                 />
 
+            <ToggleButton
+                android:id="@+id/tbRoadLimitSpeedSop"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="获取路侧限速提醒"
+                android:textOn="关闭路侧限速提醒"
+                app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
+                android:textSize="@dimen/dp_24" />
+
             <TextView
                 android:id="@+id/tvSpeedThresholdTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
+                app:layout_constraintTop_toBottomOf="@id/tbRoadLimitSpeedSop"
                 android:text="变道速度阈值："
                 android:textSize="@dimen/dp_36"
                 android:textColor="#1A1A1A"