[2.13.0-arch-opt] merg

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

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
@@ -13,6 +14,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
+import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框
@@ -76,7 +78,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
         tag: String?
     ) {
         if (EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType == v2xType.toString()) {
-            CallerHmiManager.showLimitingVelocity(1, 1)
+            CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(1,DataSourceType.MAP)
         }
         if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
             Log.d("MsgBox-V2XWarningBR", "alertContent或ttsContent为空!")

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

@@ -10,9 +10,9 @@ class ToolsImageView(context: Context, attrs: AttributeSet?) :
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
+        scaleType = ScaleType.CENTER
         setBackgroundResource(R.drawable.module_ext_check)
         setImageResource(R.drawable.icon_tools_nor)
-        scaleType = ScaleType.CENTER
         setOnClickListener{
             toolsView.showToolsFloat(context)
         }

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

@@ -38,18 +38,13 @@ class AutoPilotStatusView constructor(
 
     private var mAutopilotStatus: Int = 0
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
+    init{
         initView(context)
     }
 
     private fun initView(context: Context) {
         setBackgroundResource(R.drawable.module_hmi_autopilot_status_bg)
         LayoutInflater.from(context).inflate(R.layout.view_autopilot_status, this, true)
-
-        val lp = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
-        layoutParams = lp
-
         // 设置点击监听
         setOnClickListener(this)
         // 自动驾驶状态监听

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -149,10 +149,14 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
                         .build("/driver/api")
                         .navigation(getContext());
-            } else {
+            } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
                 ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
                         .build("/passenger/api")
                         .navigation(getContext());
+            } else {
+                ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
+                        .build("/noop/api")
+                        .navigation(getContext());
             }
         }
         // 处理一个机器多个屏幕方案

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

@@ -14,9 +14,7 @@
         android:gravity="center"
         android:text="60"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_60"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon" />
+        android:textSize="@dimen/dp_60"/>
 
     <!--限速来源-->
     <TextView
@@ -29,8 +27,6 @@
         android:textColor="@color/color_FFFFFF"
         android:textSize="@dimen/dp_30"
         android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvLimitingVelocity" />
+        android:visibility="gone" />
 
 </LinearLayout>