Merge remote-tracking branch 'origin/dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_architecture_upgrade

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

@@ -78,14 +78,17 @@ class AutoPilotStatusView @JvmOverloads constructor(
             0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常
                 clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_disabled_bg)
                 tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_disable))
+                ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status_disabled)
             }
             1 -> {// 可自动驾驶，目前处于人工干预状态
                 clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_enable_bg)
                 tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable))
+                ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status)
             }
             2 -> {// 自动驾驶中
                 clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_checked_bg)
                 tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable))
+                ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status)
             }
         }
     }

modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt

@@ -202,7 +202,7 @@ enum class EventTypeEnum(
         "限速预警",
         poiTypeSrcVr=R.drawable.icon_warning_v2x_over_speed,
         content="已超速",
-        tts=""
+        tts="已超速"
     ),
     TYPE_USECASE_ID_LTA(
         ObuConstants.USE_CASE_ID.LTA.toString(),
@@ -223,7 +223,7 @@ enum class EventTypeEnum(
         "车内标牌",
         poiTypeSrcVr=R.drawable.icon_warning_v2x_road_construction,
         content="前方施工",
-        tts=""
+        tts="前方施工"
     ),
     TYPE_USECASE_ID_TJW(
         ObuConstants.USE_CASE_ID.TJW.toString(),

tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java

@@ -110,10 +110,10 @@ class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
         Logger.d(TAG, "initTtsConfig");
         // 产品认证需设置 apiKey, productId, productKey, productSecret
         DUILiteConfig config = new DUILiteConfig(
-                "1009e96c95da655dcad8d6eb6145bbdd",
-                "278586132",
-                "1fe5930844b488a8d32d9ef7717be7dc",
-                "f601ecc407986b548ac8ab2a9144162e");
+                "d65ec9d65082d65ec9d65082614c36cc",
+                "279605401",
+                "cdb83d210ad55d7e9e388754eb890e7c",
+                "5bd044ac68dc193df2e0fc4be3a120dd");
         config.setAuthTimeout(5000); //设置授权连接超时时长，默认5000ms
         config.setExtraParameter("DEVICE_NAME", "fea815f374af8");
         config.setExtraParameter("DEVICE_ID", "fea815f374af8");