Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt

@@ -113,8 +113,8 @@ class AiRoadMarker {
                 .rotate(marker.poi_angle.toFloat())
                 .longitude(marker.poi_lon)
                 .latitude(marker.poi_lat)
-            if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType || marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType) {
-                builder.anchorColor("#D65D5AFF")
+            if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType) {
+                builder.anchorColor("#FFBF10")
             }
             CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p ->
                 if (!markerIds.contains(markerId)) {

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

@@ -224,4 +224,15 @@ class OfflineMapDialog(context: Context) : BaseFloatDialog(context, TAG) {
             }
         }, UiThreadHandler.MODE.QUEUE)
     }
+
+    override fun dismiss() {
+        super.dismiss()
+        if (isLoading) {
+            hmiAction(
+                "$M_HMI$TAG",
+                mapOf("dismiss-loading" to "cancel download")
+            )
+            mogoMapData.get()?.cancelDownloadCacheData()
+        }
+    }
 }

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

@@ -1,15 +1,39 @@
 package com.mogo.eagle.core.function.hmi.ui.widget
 
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.content.Context
+import android.os.Build
+import android.os.CountDownTimer
+import android.text.Html
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
+import android.view.animation.LinearInterpolator
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoColdStartStateListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerColdStartStateListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ResourceUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.mogo.adas.data.AdasConstants
+import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartStatus
+import kotlinx.android.synthetic.main.view_cold_start.view.ivIpcConnectStatus
+import kotlinx.android.synthetic.main.view_cold_start.view.ivSsmConnectStatus
+import kotlinx.android.synthetic.main.view_cold_start.view.tvColdStartContent
+import kotlinx.android.synthetic.main.view_cold_start.view.tvColdStartNodeState
+import kotlinx.android.synthetic.main.view_cold_start.view.tvIpcConnectContent
+import kotlinx.android.synthetic.main.view_cold_start.view.tvSsmConnectContent
+import kotlinx.android.synthetic.main.view_cold_start.view.tvSystemStartupTitle
+import kotlinx.android.synthetic.main.view_cold_start.view.viewColdStartDivider
+import kotlinx.android.synthetic.main.view_cold_start.view.viewSsmConnectDivider
 import system_master.SsmInfo
 import system_master.SystemStatusInfo
+import java.lang.StringBuilder
 
 /**
  * 冷启动呈现二期
@@ -19,12 +43,31 @@ class ColdStartView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener {
+) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener,
+    IMoGoColdStartStateListener {
 
     companion object {
         const val TAG = "ColdStartView"
+        const val LOAD_SSM_WAITING_TIME = 60000L //SSM加载超时等待时间
+        const val COLD_START_WAITING_TIME = 300000L //冷启动超时等待时间
     }
 
+    private var ipcConnectStatus = false //连接域控状态，默认是未连接
+    private var ssmConnectStatus = false //SSM连接状态，默认是未连接
+    private var coldStartStatus = false //冷启动状态，默认是未冷启动成功
+
+    private var ipcRotationAnim: ObjectAnimator?= null //域控连接状态动画
+
+    private var ssmRotationAnim: ObjectAnimator?= null //SSM连接状态动画
+    private var connectSSMTimer: CountDownTimer?= null //连接SSM等待倒计时
+
+    private var coldStartRotationAnim: ObjectAnimator?= null //冷启动连接状态动画
+    private var connectColdStartTimer: CountDownTimer?= null //连接冷启动等待倒计时
+
+    private val nodeStatusSb = StringBuilder() //冷启动关键节点启动详情
+
+    private var coldStartResultListener: ColdStartResultListener ?= null
+
     init {
         LayoutInflater.from(context).inflate(R.layout.view_cold_start, this, true)
         initView()
@@ -37,33 +80,101 @@ class ColdStartView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        CallerColdStartStateListenerManager.addListener(TAG,this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        CallerColdStartStateListenerManager.removeListener(TAG)
     }
 
     override fun onAutopilotIpcConnectStatusChanged(
         status: AdasConstants.IpcConnectionStatus,
         reason: String?
     ){
-        if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
-            //域控连接成功
-
-        }else{
-            //域控连接失败
-
+        ThreadUtils.runOnUiThread {
+            ipcConnectStatus = if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
+                //域控连接成功
+                if(!ipcConnectStatus){
+                    showIPCConnectSuccessView()
+                }
+                true
+            }else{
+                //域控连接失败
+                when(status){
+                    //主动断开连接
+                    AdasConstants.IpcConnectionStatus.DISCONNECTED ->{
+                        showIPCConnectFailView("域控未连接或主动断开连接，建议重启车辆并上报问题")
+                    }
+                    //连接中
+                    AdasConstants.IpcConnectionStatus.CONNECTING ->{
+                        showIPCConnecting()
+                    }
+                    //重连中（定时器）
+                    AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER ->{
+                        showIPCConnecting()
+                    }
+                    //重连中（网络监听）
+                    AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK ->{
+                        showIPCConnecting()
+                    }
+                    //连接异常（鹰眼与域控连接失败、无法连接、非正常断开等）
+                    AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION ->{
+                        showIPCConnectFailView("域控连接异常，建议检查WiFi连接情况及域控是否开机")
+                    }
+                    //非法地址（连接模式为指定地址时：表示当前鹰眼调用连接时传入的域控地址错误或不符合规则【不修改默认配置不会出现此问题】；
+                    // 连接模式为PING模式时：表示传入的PING地址列表存在问题）
+                    AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS ->{
+                        showIPCConnectFailView("非法域控地址，建议重启车辆并上报问题")
+                    }
+                    //正在搜索域控地址
+                    AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS ->{
+                        showIPCConnecting()
+                    }
+                    //找不到可用地址（域控地址列表中的全部地址均无法连通
+                    // 【不修改默认配置的情况下需要排查PAD是否连接车载路由器、工控机是否连接车载路由器、
+                    // 工控机是否开机等】）
+                    AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS ->{
+                        showIPCConnectFailView("找不到域控可用地址，建议检查车载路由器及域控是否开机")
+                    }
+                    //域控证书认证异常
+                    AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED ->{
+                        showIPCConnectFailView("域控证书认证异常")
+                    }
+                    //心跳超时（连接域控成功后在一段时间内未收到域控任何数据），超时时间：
+                    AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT ->{
+                        showIPCConnectFailView("心跳超时（连接域控成功后在一段时间内未收到域控任何数据）")
+                    }
+                    //協議不匹配（被连接的域控端非WebSocket协议【可能性非常低】）
+                    AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH ->{
+                        showIPCConnectFailView("协议不匹配")
+                    }
+                    //域控主动断开连接（域控主动发起断开WebSocket连接
+                    AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED ->{
+                        showIPCConnectFailView("域控主动断开连接，建议重启车辆并上报问题")
+                    }
+                }
+                false
+            }
         }
     }
 
+
+
+
+
+
     /**
      * 状态查询应答
      * @param status 数据
      * HQ、M1 MAP350开始弃用，其他车型MAP360开始弃用
      */
     override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
-
+        ThreadUtils.runOnUiThread {
+            //SSM连接成功
+            connectSSMSuccess()
+        }
     }
 
 
@@ -74,7 +185,328 @@ class ColdStartView @JvmOverloads constructor(
      * @param statusInf 数据
      */
     override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
+        ThreadUtils.runOnUiThread {
+            //SSM连接成功
+            connectSSMSuccess()
+        }
+    }
+
+    /**
+     * 冷启动状态变更上报以及查询状态
+     *
+     * @param token          唯一消息ID
+     * @param timestamp      消息发送时间 单位：毫秒
+     * @param isQuery        是否是查询 ture：查询相应的结果   false：表示状态变动域控主动推送
+     * @param coldStartState 数据 null表示 PadSsmMsg中的消息体为null
+     */
+    override fun onColdStartState(
+        token: Long,
+        timestamp: Long,
+        isQuery: Boolean,
+        coldStartState: SsmInfo.ColdStartState?
+    ) {
+        coldStartState?.let {
+            ThreadUtils.runOnUiThread {
+                if(it.eventStatus == SsmInfo.CSState.COLD_START_READY){
+                    //冷启动就绪
+                    showColdStartSuccessView()
+                }
+                tvColdStartContent.text = getColdStartEventStatus(it.eventStatus)
+                nodeStatusSb.clear()
+                it.nodeList.forEach {node->
+                    val nodeDetail = node.nodeName+ " " + getColdStartNodeStatus(node.status)
+                    if(node.status == SsmInfo.NodeStatus.NODE_FAILED || node.status ==SsmInfo.NodeStatus.NODE_TIMEOUT){
+                        nodeStatusSb.append("<font color=\"#FFCD3D\">${nodeDetail}</font>")
+                    }else{
+                        nodeStatusSb.append("<font color=\"#B2FFFFFF\">${nodeDetail}</font>")
+                    }
+                    nodeStatusSb.append("<br>")
+                }
+                tvColdStartNodeState.text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                     Html.fromHtml(nodeStatusSb.toString(), Html.FROM_HTML_MODE_LEGACY)
+                } else {
+                     Html.fromHtml(nodeStatusSb.toString())
+                }
+            }
+        }
+    }
+
+    /**
+     * 冷启动状态
+     */
+    private fun getColdStartEventStatus(state: SsmInfo.CSState): String{
+        return when(state){
+            // 未开始
+            SsmInfo.CSState.COLD_START_DEFAULT->{
+                "启动中…"
+            }
+            // 启动中
+            SsmInfo.CSState.COLD_START_STARTING->{
+                "启动中…"
+            }
+            // 就绪
+            SsmInfo.CSState.COLD_START_READY->{
+                "系统启动成功，即将进入主页"
+            }
+            // 有异常未就绪
+            SsmInfo.CSState.COLD_START_UNREADY->{
+                "系统启动异常，建议重启车辆并上报问题"
+            }
+            // 超时
+            SsmInfo.CSState.COLD_START_TIMEOUT->{
+                "系统启动异常，建议重启车辆并上报问题"
+            }
+        }
+    }
+
+    /**
+     * 获取节点启动状态
+     */
+    private fun getColdStartNodeStatus(nodeStatus: SsmInfo.NodeStatus): String{
+        return when(nodeStatus){
+            // 启动中
+            SsmInfo.NodeStatus.NODE_STARTING->{
+                "启动中…"
+            }
+            // 启动成功
+            SsmInfo.NodeStatus.NODE_FINISH->{
+                "启动成功"
+            }
+            // 启动失败
+            SsmInfo.NodeStatus.NODE_FAILED->{
+                "启动失败"
+            }
+            // 启动超时
+            SsmInfo.NodeStatus.NODE_TIMEOUT->{
+                "启动超时"
+            }
+
+        }
+    }
+
+
+    /**
+     * 展示域控连接成功视图
+     */
+    private fun showIPCConnectSuccessView(){
+        ipcRotationAnim?.cancel()
+        ivIpcConnectStatus.rotation = 0f
+        tvSystemStartupTitle.text = resources.getString(R.string.cold_start_in_progress_title)
+        ivIpcConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_success))
+        tvIpcConnectContent.text = resources.getString(R.string.ipc_connect_success)
+        //开启连接SSM倒计时
+        connectSSMProcess()
+        //域控连接成功后开始展示SSM连接状态
+        viewSsmConnectDivider.visibility = View.VISIBLE
+        ivSsmConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process))
+        //旋转动画
+        ssmRotationAnim = ObjectAnimator.ofFloat(ivSsmConnectStatus, "rotation", 0f, 360f)
+        ssmRotationAnim?.repeatCount = ValueAnimator.INFINITE
+        ssmRotationAnim?.repeatMode = ValueAnimator.RESTART
+        ssmRotationAnim?.duration = 1500
+        ssmRotationAnim?.interpolator = LinearInterpolator()
+        ssmRotationAnim?.start()
+        //设置SSM连接文案为连接中
+        tvSsmConnectContent.text = resources.getString(R.string.ssm_connect_loading)
+        tvSsmConnectContent.setTextColor(ContextCompat.getColor(context, android.R.color.white))
+        viewSsmConnectDivider.visibility = View.VISIBLE
+        ivSsmConnectStatus.visibility = View.VISIBLE
+        tvSsmConnectContent.visibility = View.VISIBLE
+        //隐藏冷启动相关视图
+        viewColdStartDivider.visibility = View.GONE
+        ivColdStartStatus.visibility = View.GONE
+        tvColdStartContent.visibility = View.GONE
+    }
+
+    /**
+     * 展示域控连接失败视图
+     */
+    private fun showIPCConnectFailView(reason: String?){
+        if(tvIpcConnectContent.text.isNotEmpty() && tvIpcConnectContent.text.equals(reason)){
+            return
+        }
+        ipcRotationAnim?.cancel()
+        ivIpcConnectStatus.rotation = 0f
+        ivIpcConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_fail))
+        reason?.let {
+            tvIpcConnectContent.text = it
+        }
+        //隐藏SSM相关视图
+        viewSsmConnectDivider.visibility = View.GONE
+        ivSsmConnectStatus.visibility = View.GONE
+        tvSsmConnectContent.visibility = View.GONE
+        //隐藏冷启动相关视图
+        viewColdStartDivider.visibility = View.GONE
+        ivColdStartStatus.visibility = View.GONE
+        tvColdStartContent.visibility = View.GONE
 
     }
 
+    private fun showIPCConnecting(){
+        ivIpcConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process))
+        tvIpcConnectContent.text = "正在连接域控..."
+        ipcRotationAnim = ObjectAnimator.ofFloat(ivIpcConnectStatus, "rotation", 0f, 360f)
+        ipcRotationAnim?.repeatCount = ValueAnimator.INFINITE
+        ipcRotationAnim?.repeatMode = ValueAnimator.RESTART
+        ipcRotationAnim?.duration = 1500
+        ipcRotationAnim?.interpolator = LinearInterpolator()
+        ipcRotationAnim?.start()
+        //隐藏SSM相关视图
+        viewSsmConnectDivider.visibility = View.GONE
+        ivSsmConnectStatus.visibility = View.GONE
+        tvSsmConnectContent.visibility = View.GONE
+        //隐藏冷启动相关视图
+        viewColdStartDivider.visibility = View.GONE
+        ivColdStartStatus.visibility = View.GONE
+        tvColdStartContent.visibility = View.GONE
+    }
+
+    /**
+     * SSM连接成功
+     */
+    private fun connectSSMSuccess(){
+        if(!ssmConnectStatus){
+            showSSMConnectSuccessView()
+            //取消连接SSM超时等待倒计时
+            connectSSMTimer?.cancel()
+            //开始启动冷启动等待倒计时
+            coldStartProcess()
+        }
+        ssmConnectStatus = true
+        coldStartStatus = false
+    }
+
+    /**
+     * 展示SSM连接成功视图
+     */
+    private fun showSSMConnectSuccessView(){
+        tvSystemStartupTitle.text = resources.getString(R.string.cold_start_in_progress_title)
+        //取消旋转动画
+        ssmRotationAnim?.cancel()
+        //取消连接SSM超时等待倒计时
+        connectSSMTimer?.cancel()
+        //展示SSM连接成功视图
+        ivSsmConnectStatus.rotation = 0f
+        ivSsmConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_success))
+        tvSsmConnectContent.text = resources.getString(R.string.ssm_connect_success)
+        tvSsmConnectContent.setTextColor(ContextCompat.getColor(context, R.color.white))
+        //展示冷启动连接过程视图
+        viewColdStartDivider.visibility = View.VISIBLE
+        ivColdStartStatus.visibility = View.VISIBLE
+        tvColdStartContent.visibility = View.VISIBLE
+        tvColdStartContent.text = "启动中…"
+        ivColdStartStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process))
+        //开启冷启动连接状态动画
+        coldStartRotationAnim = ObjectAnimator.ofFloat(ivColdStartStatus, "rotation", 0f, 360f)
+        coldStartRotationAnim?.repeatCount = ValueAnimator.INFINITE
+        coldStartRotationAnim?.repeatMode = ValueAnimator.RESTART
+        coldStartRotationAnim?.duration = 1500
+        coldStartRotationAnim?.interpolator = LinearInterpolator()
+        coldStartRotationAnim?.start()
+    }
+
+    /**
+     * 展示SSM连接失败视图
+     */
+    private fun showSSMConnectFailView(){
+        tvSystemStartupTitle.text = resources.getString(R.string.cold_start_fail_title)
+        //取消旋转动画
+        ssmRotationAnim?.cancel()
+        ivSsmConnectStatus.rotation = 0f
+        ivSsmConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_fail))
+        tvSsmConnectContent.text = resources.getString(R.string.ssm_connect_fail)
+        tvSsmConnectContent.setTextColor(ContextCompat.getColor(context, R.color.cold_start_fail))
+    }
+
+    /**
+     * 连接SSM过程
+     */
+    private fun connectSSMProcess(){
+        ThreadUtils.runOnUiThread {
+            connectSSMTimer = object: CountDownTimer(LOAD_SSM_WAITING_TIME,LOAD_SSM_WAITING_TIME){
+                override fun onTick(millisUntilFinished: Long) {
+
+                }
+
+                override fun onFinish() {
+                    //将SSM连接状态置为false
+                    ssmConnectStatus = false
+                    coldStartStatus = false
+                    //取消连接SSM超时等待倒计时
+                    connectSSMTimer?.cancel()
+                    //展示连接SSM失败视图
+                    showSSMConnectFailView()
+                }
+            }
+            connectSSMTimer?.start()
+        }
+    }
+
+    /**
+     * 冷启动过程
+     */
+    private fun coldStartProcess(){
+        ThreadUtils.runOnUiThread {
+            connectColdStartTimer = object: CountDownTimer(COLD_START_WAITING_TIME,COLD_START_WAITING_TIME){
+                override fun onTick(millisUntilFinished: Long) {
+                }
+
+                override fun onFinish() {
+                    //将冷启动状态置为false
+                    coldStartStatus = false
+                    //展示冷启动失败视图
+                    showColdStartFailView()
+                }
+            }
+            connectColdStartTimer?.start()
+        }
+    }
+
+    /**
+     * 冷启动失败视图
+     */
+    private fun showColdStartFailView(){
+        tvSystemStartupTitle.text = resources.getString(R.string.cold_start_fail_title)
+        coldStartRotationAnim?.cancel()
+        ivColdStartStatus.rotation = 0f
+        ivColdStartStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_fail))
+        tvColdStartContent.text = resources.getString(R.string.cold_start_fail_content)
+        coldStartResultListener?.coldStartFail()
+    }
+
+    /**
+     * 冷启动成功视图
+     */
+    private fun showColdStartSuccessView(){
+        tvSystemStartupTitle.text = resources.getString(R.string.cold_start_success_title)
+        coldStartRotationAnim?.cancel()
+        ivColdStartStatus.rotation = 0f
+        ivColdStartStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_success))
+        tvColdStartContent.text = resources.getString(R.string.cold_start_success_content)
+        connectColdStartTimer?.cancel()
+        hideColdStartView()
+    }
+
+    /**
+     * 隐藏冷启动视图
+     */
+    private fun hideColdStartView(){
+        UiThreadHandler.postDelayed({
+            this@ColdStartView.visibility = View.GONE
+            coldStartResultListener?.coldStartSuccess()
+        }, 2000)
+    }
+
+    /**
+     * 冷启动接管监听接口
+     */
+    interface ColdStartResultListener{
+        fun coldStartSuccess()
+        fun coldStartFail()
+    }
+
+    fun setColdStartResultListener(listener: ColdStartResultListener){
+        coldStartResultListener = listener
+    }
+
 }

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

@@ -2,7 +2,9 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#7F000000"
+    >
 
     <TextView
         android:id="@+id/tvSystemStartupTitle"
@@ -12,6 +14,9 @@
         android:textSize="@dimen/sp_70"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
+        android:text="@string/cold_start_in_progress_title"
+        android:layout_marginTop="@dimen/dp_432"
+        android:layout_marginStart="@dimen/dp_261"
         />
 
     <ImageView
@@ -21,6 +26,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvSystemStartupTitle"
         app:layout_constraintLeft_toLeftOf="@id/tvSystemStartupTitle"
         android:contentDescription="@string/ipc_connect_icon"
+        android:layout_marginTop="@dimen/dp_89"
         />
 
     <TextView
@@ -44,6 +50,7 @@
         app:layout_constraintTop_toBottomOf="@id/ivIpcConnectStatus"
         android:layout_marginTop="@dimen/dp_5"
         android:background="@drawable/bg_cold_start_divider"
+        android:visibility="invisible"
         />
 
     <ImageView
@@ -54,6 +61,7 @@
         app:layout_constraintLeft_toLeftOf="@id/viewSsmConnectDivider"
         app:layout_constraintRight_toRightOf="@id/viewSsmConnectDivider"
         android:contentDescription="@string/ssm_connect_icon"
+        android:layout_marginTop="@dimen/dp_5"
         />
 
     <TextView
@@ -77,8 +85,40 @@
         app:layout_constraintTop_toBottomOf="@id/ivSsmConnectStatus"
         android:layout_marginTop="@dimen/dp_5"
         android:background="@drawable/bg_cold_start_divider"
+        android:visibility="invisible"
+        />
+
+    <ImageView
+        android:id="@+id/ivColdStartStatus"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        app:layout_constraintTop_toBottomOf="@id/viewColdStartDivider"
+        app:layout_constraintLeft_toLeftOf="@id/viewColdStartDivider"
+        app:layout_constraintRight_toRightOf="@id/viewColdStartDivider"
+        android:layout_marginTop="@dimen/dp_5"
+        android:contentDescription="@string/cold_start_icon"
+        />
+
+    <TextView
+        android:id="@+id/tvColdStartContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@id/ivColdStartStatus"
+        app:layout_constraintLeft_toRightOf="@id/ivColdStartStatus"
+        android:textSize="@dimen/sp_36"
+        android:textColor="@color/white"
+        android:layout_marginStart="@dimen/dp_15"
+        />
+
+    <TextView
+        android:id="@+id/tvColdStartNodeState"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tvColdStartContent"
+        app:layout_constraintLeft_toLeftOf="@id/tvColdStartContent"
+        android:textSize="@dimen/sp_32"
+        android:textColor="#B2FFFFFF"
         />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml

@@ -92,4 +92,6 @@
 
     <color name="auto_exploration_content_p">#131415</color>
 
+    <color name="cold_start_fail">#FFCD3D</color>
+
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -215,5 +215,15 @@
 
     <string name="ipc_connect_icon">域控连接状态图标</string>
     <string name="ssm_connect_icon">SSM连接状态图标</string>
+    <string name="cold_start_icon">冷启动状态图标</string>
+    <string name="ipc_connect_success">已连接域控</string>
+    <string name="cold_start_in_progress_title">系统启动中…</string>
+    <string name="cold_start_success_title">系统启动成功</string>
+    <string name="cold_start_fail_title">系统启动失败</string>
+    <string name="ssm_connect_loading">正在连接SSM…</string>
+    <string name="ssm_connect_success">已连接SSM</string>
+    <string name="ssm_connect_fail">SSM连接异常，建议重启车辆并上报问题</string>
+    <string name="cold_start_success_content">系统启动成功，即将进入主页</string>
+    <string name="cold_start_fail_content">系统启动异常，建议重启车辆并上报问题</string>
 
 </resources>

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

@@ -2,7 +2,7 @@
 <!--android:keyHeight="122dp"
     android:keyWidth="237dp"-->
 <Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:keyboard="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:keyHeight="122dp"
     android:keyWidth="239dp"
     android:horizontalGap="1dp"
@@ -36,7 +36,7 @@
 
         <Key
             android:codes="-4"
-            keyboard:keyBackground="@drawable/keyboard_blue"
+            app:keyBackground="@drawable/keyboard_blue"
             android:keyHeight="368dp"
             android:keyLabel="确定"/>
     </Row>

core/function-impl/mogo-core-function-map/build.gradle

@@ -61,8 +61,7 @@ dependencies {
         exclude group: 'com.zhidaoauto.machine', module: 'map'
     }
 
-//    implementation rootProject.ext.dependencies.mogocustommap
-    implementation project(':libraries:mapmodule')
+    implementation rootProject.ext.dependencies.mogocustommap
     implementation rootProject.ext.dependencies.amapnavi3dmap
 
     implementation rootProject.ext.dependencies.androidxroomruntime