diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt index 21a7ed53b3..6bb7c536ba 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/TaxiUnmannedPassengerProvider.kt @@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.mgintelligent.speech.MGSpeech import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics @@ -30,6 +31,7 @@ class TaxiUnmannedPassengerProvider : CommonServiceImpl() { override fun init(context: Context) { d(SceneConstant.M_TAXI_P + tag, "init") statusBarView = StatusBarView(context) + MGSpeech.init(context) } override fun getStatusBarView(context: Context): View { diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml index 321c4e74a1..346611b025 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml @@ -11,9 +11,7 @@ android:id="@+id/leftContainer" android:layout_width="0dp" android:layout_height="match_parent" - app:cardElevation="8dp" android:background="@drawable/taxi_p_home_map_bg_1" - app:cardCornerRadius="20.0dp" android:layout_marginBottom="@dimen/dp_10" app:layout_constraintEnd_toEndOf="@id/leftEndGuideline" app:layout_constraintStart_toStartOf="parent" @@ -69,23 +67,21 @@ android:orientation="vertical" app:layout_constraintGuide_percent="0.666" /> - - - + + = 90 - ) { - V2XBizTrace.onAck(data, "green-wave-event" to "事件在车的后面,不触发", true) - return@Callback true - } - val id = "${destX}_${destY}" - AiRoadMarker.aiMakers.getOrPut(id) { - AiRoadMarker().apply { - try { - val current = abs(location.gnssSpeed).toInt() - val min = abs(data.speedStraightMin).toInt() - val max = abs(data.speedStraightMax).toInt() - marker( - Marker( - id, - EventTypeEnumNew.TYPE_SOCKET_ROAD_GREE_WAVE.poiType, - destX, - destY, - 0.0, - null, - null, - null - ), drawMarker = false, false - ) - var alertTts = "" - var alertContent = "" - if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - AppStateManager.currentActivity()?.let { - val speakText = StringBuilder("保持当前车速即可通过路口,好丝滑!") - if (current < min) { - speakText.setLength(0) - speakText.append( - "${ - SkinResources.getInstance() - .getString(R.string.operation_platform_name) - }推荐您提升车速至${min}千米每小时, 当前车速${current}千米每小时" - ) - } - if (current > max) { - speakText.setLength(0) - speakText.append( - "${ - SkinResources.getInstance() - .getString(R.string.operation_platform_name) - }推荐您降低车速至${max}千米每小时, 当前车速${current}千米每小时" - ) - } - val tts = speakText.toString() - alertTts = tts - alertContent = tts - AIAssist.getInstance(it).speakTTSVoice(tts) - } - } - //消息埋点 - V2XEventAnalyticsManager.triggerV2XEvent( - EventTypeEnumNew.TYPE_SOCKET_ROAD_GREE_WAVE.poiType, - alertContent, - alertTts, - DataSourceType.AICLOUD, - CommunicationType.V2N - ) - CallerHmiManager.showGreenWave( - min, - max, - computeCrossCountBetween( - Triple( - location.longitude, - location.latitude, - location.heading - ), kotlin.Pair(destX, destY) - ) - ) - } finally { - receive() - } - } - } + //下架V2N绿波通行 +// val data = msg.obj as? V2nCrossSpeed ?: return@Callback true +// val destX = data.lng +// val destY = data.lat +// val location = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() +// if (DrivingDirectionUtils.getDegreeOfCar2Poi( +// location.longitude, +// location.latitude, +// destX, +// destY, +// location.heading.toInt() +// ) >= 90 +// ) { +// V2XBizTrace.onAck(data, "green-wave-event" to "事件在车的后面,不触发", true) +// return@Callback true +// } +// val id = "${destX}_${destY}" +// AiRoadMarker.aiMakers.getOrPut(id) { +// AiRoadMarker().apply { +// try { +// val current = abs(location.gnssSpeed).toInt() +// val min = abs(data.speedStraightMin).toInt() +// val max = abs(data.speedStraightMax).toInt() +// marker( +// Marker( +// id, +// EventTypeEnumNew.TYPE_SOCKET_ROAD_GREE_WAVE.poiType, +// destX, +// destY, +// 0.0, +// null, +// null, +// null +// ), drawMarker = false, false +// ) +// var alertTts = "" +// var alertContent = "" +// if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { +// AppStateManager.currentActivity()?.let { +// val speakText = StringBuilder("保持当前车速即可通过路口,好丝滑!") +// if (current < min) { +// speakText.setLength(0) +// speakText.append( +// "${ +// SkinResources.getInstance() +// .getString(R.string.operation_platform_name) +// }推荐您提升车速至${min}千米每小时, 当前车速${current}千米每小时" +// ) +// } +// if (current > max) { +// speakText.setLength(0) +// speakText.append( +// "${ +// SkinResources.getInstance() +// .getString(R.string.operation_platform_name) +// }推荐您降低车速至${max}千米每小时, 当前车速${current}千米每小时" +// ) +// } +// val tts = speakText.toString() +// alertTts = tts +// alertContent = tts +// AIAssist.getInstance(it).speakTTSVoice(tts) +// } +// } +// //消息埋点 +// V2XEventAnalyticsManager.triggerV2XEvent( +// EventTypeEnumNew.TYPE_SOCKET_ROAD_GREE_WAVE.poiType, +// alertContent, +// alertTts, +// DataSourceType.AICLOUD, +// CommunicationType.V2N +// ) +// CallerHmiManager.showGreenWave( +// min, +// max, +// computeCrossCountBetween( +// Triple( +// location.longitude, +// location.latitude, +// location.heading +// ), kotlin.Pair(destX, destY) +// ) +// ) +// } finally { +// receive() +// } +// } +// } } else if (msg.what == MSG_WHAT_DRAW_PEOPLE_CROSS) { Logger.i(TAG, "people cross -- 1 --") val data = msg.obj as? MessagePad.Event ?: return@Callback true @@ -689,7 +690,7 @@ internal object V2NIdentifyDrawer : IEventDismissListener { } private fun drawGreenWave(crossSpeed: V2nCrossSpeed) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nGreenWave) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_GREEN_WAVE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_GREEN_WAVE, crossSpeed)) } @@ -818,7 +819,7 @@ internal object V2NIdentifyDrawer : IEventDismissListener { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { ThreadUtils.runOnUiThread { AIAssist.getInstance(Utils.getApp()) - .speakTTSVoiceWithLevel("蘑菇发现前方路口有车龙", AIAssist.NEW_LEVEL_2) + .speakTTSVoiceWithLevel("前方路口有车龙", AIAssist.NEW_LEVEL_2) } } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index 1824a5bb98..439d5e5ccb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -631,9 +631,9 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持当前车速通过路口" + "建议保持当前车速通过路口" } else { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "推荐保持车速10-30KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } 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 daed0329ee..bda0b7989c 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 @@ -1113,9 +1113,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持当前车速通过路口" + "建议保持当前车速通过路口" } else { - "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "推荐保持车速10-30KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index 0522e443c3..e63f893d62 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -14,7 +14,6 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.voice.AIAssist -import com.mogo.eagle.core.data.autopilot.AutopilotSummaryInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType @@ -27,7 +26,6 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.skin.utils.SkinResources /** @@ -162,8 +160,7 @@ open class AutomaticExplorationView @JvmOverloads constructor( rotationAnim?.cancel() //语音播放,只在司机端播放 if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常${SkinResources.getInstance().getString( - R.string.operation_platform_name)}型车助手将持续守候您的出行") + AIAssist.getInstance(context).speakTTSVoice("正为您探查道路情况") } //5秒后关闭弹窗 val hideViewTimer =object: CountDownTimer(EXPLORATION_HIDE_TIME,EXPLORATION_HIDE_TIME){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index 1a4326f280..6e0e3cfb1f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -327,7 +327,6 @@ class OperatePanelLayout : LinearLayout { private const val KEY_V2X_TOTAL_SWITCH = "v2x_total_switch" private const val KEY_V2N_TOTAL_SWITCH = "v2n_total_switch" private const val KEY_V2N_NEW_LINKED_TO_PNC = "v2n_new_linked_to_pnc" - private const val KEY_V2N_NEW_LINKED_GREEN_WAVE = "v2n_new_linked_green_wave" private const val KEY_V2I_TOTAL_SWITCH = "v2i_total_switch" private const val KEY_V2I_TO_PNC = "v2i_to_pnc" private const val KEY_V2I_RED_LIGHT_WARNING = "v2i_red_light_warning" @@ -351,9 +350,6 @@ class OperatePanelLayout : LinearLayout { KEY_V2N_NEW_LINKED_TO_PNC -> { return FunctionBuildConfig.v2nNewLinkedToPNC } - KEY_V2N_NEW_LINKED_GREEN_WAVE -> { - return FunctionBuildConfig.v2nGreenWave - } KEY_V2I_TOTAL_SWITCH -> { return HmiBuildConfig.v2iTotalSwitch } @@ -404,7 +400,6 @@ class OperatePanelLayout : LinearLayout { clickEventAnalytics("V2N总开关", isChecked) if (!isChecked) { // preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED)?.also { changeValue(it, false) } preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED_TO_PNC)?.also { changeValue(it, false) } - preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED_GREEN_WAVE)?.also { changeValue(it, false) } } val map = HashMap().also { it["f1"] = isChecked @@ -420,14 +415,6 @@ class OperatePanelLayout : LinearLayout { CallerAutoPilotControlManager.sendV2nToPncCmd(isChecked) return true } - KEY_V2N_NEW_LINKED_GREEN_WAVE -> { - val isChecked = newValue as? Boolean ?: false - FunctionBuildConfig.v2nGreenWave = isChecked - hmiAction("绿波通行", isChecked) - clickEventAnalytics("绿波通行", isChecked) - CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_GREENWAVE_WARNING, (if (isChecked) "1" else "0").toByteArray()) - return true - } KEY_V2I_TOTAL_SWITCH -> { val isChecked = newValue as? Boolean ?: false HmiBuildConfig.v2iTotalSwitch = isChecked diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml index 8f365bb6fe..db426edc48 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml @@ -34,14 +34,6 @@ android:defaultValue="@bool/v2n_new_linked_to_pnc" android:layout="@layout/layout_operate_panel_preference_switch_compat_dependee" android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/> - = 80) { - disStr = "前方${dis}米将通过路口,${ - SkinResources.getInstance().getString(R.string.operation_platform_name) - }为您提供路口全息影像,助力出行" - } +// var disStr = "前方即将通过路口,${ +// SkinResources.getInstance().getString(R.string.operation_platform_name) +// }为您提供路口全息影像,助力出行" +// if (dis >= 80) { +// disStr = "前方${dis}米将通过路口,${ +// SkinResources.getInstance().getString(R.string.operation_platform_name) +// }为您提供路口全息影像,助力出行" +// } + val disStr = "为您提供路口全息影像,助力出行" AIAssist.getInstance(context).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) } CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 716d84c249..8bbe712d63 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -297,19 +297,12 @@ object FunctionBuildConfig { var v2xTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2x_total_switch) /** - * V2N总开关,其子开关包括V2N新链路、V2N场景进PNC、绿波通行 + * V2N总开关,其子开关包括V2N新链路、V2N场景进PNC */ @Volatile @JvmField var v2nTotalSwitch = Utils.getApp().resources.getBoolean(R.bool.v2n_total_switch) - /** - * V2N事件-绿波通行开关 - */ - @Volatile - @JvmField - var v2nGreenWave = Utils.getApp().resources.getBoolean(R.bool.v2n_green_wave) - /** * 是否开启PNC障碍物颜色提醒 */ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index e189dc8e58..2f99019fa9 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -254,7 +254,7 @@ enum class EventTypeEnumNew( "闯红灯预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, content = "前方路口有闯红灯风险", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方路口有闯红灯风险,建议降低车速" + tts = "有路口闯红灯风险,建议降低车速" ), TYPE_USECASE_ID_IVP_GREEN( @@ -314,7 +314,7 @@ enum class EventTypeEnumNew( "超速", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, content = "当前路段限速 %s KM/H,已超速", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,当前路段限速 %s 千米每小时,已超速" + tts = "当前路段限速 %s 千米每小时,已超速" ), //------------道路危险情况预警 obu end -----------> @@ -324,161 +324,161 @@ enum class EventTypeEnumNew( "急转弯", poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, content = "前方%s米急转弯", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米急转弯" + tts = "前方%s米急转弯" ), TYPE_ID_BRIDGE( 8.toString(), "桥梁", poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge, content = "前方%s米桥梁", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米桥梁" + tts = "前方%s米桥梁" ), TYPE_ID_PEDESTRIAN( 10.toString(), "路人", poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, content = "前方%s米路人", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路人" + tts = "前方%s米路人" ), TYPE_ID_SLIPPERY_ROAD( 17.toString(), "路滑", poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr, content = "前方%s米路滑", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路滑" + tts = "前方%s米路滑" ), TYPE_ID_TUNNEL( 21.toString(), "隧道", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米隧道", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米隧道" + tts = "前方%s米隧道" ), TYPE_ID_FERRY( 22.toString(), "渡轮", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米渡轮", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米渡轮" + tts = "前方%s米渡轮" ), TYPE_ID_UNEVEN_ROAD( 24.toString(), "路面不平", poiTypeSrcVr = R.drawable.icon_warning_road_hollow, content = "前方%s米路面不平", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路面不平" + tts = "前方%s米路面不平" ), TYPE_ID_NON_MOTOR_VEHICLE( 32.toString(), "非机动车", poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, content = "前方%s米有非机动车", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米有非机动车" + tts = "前方%s米有非机动车" ), TYPE_ID_OBSTACLE( 36.toString(), "障碍", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米障碍", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米障碍" + tts = "前方%s米障碍" ), TYPE_FOURS_ROAD_WORK( 38.toString(), "施工", poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, content = "前方%s米施工", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米施工" + tts = "前方%s米施工" ), TYPE_VEHICLE_QUEUE( 47.toString(), "车队", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米车队", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米车队" + tts = "前方%s米车队" ), TYPE_NO_PASSING( 51.toString(), "道路不通", poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, content = "前方%s米不通", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米不通" + tts = "前方%s米不通" ), TYPE_NO_TURNING_AROUND( 75.toString(), "禁止掉头", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米禁止掉头", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米禁止掉头" + tts = "前方%s米禁止掉头" ), TYPE_USECASE_ID_ROAD_NO_PARKING( 78.toString(), "禁止停车", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, content = "前方%s米有禁停路段", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米有禁停路段" + tts = "前方%s米有禁停路段" ), TYPE_USECASE_ID_ROAD_NO_TOOTING( 80.toString(), "禁止鸣笛", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting, content = "前方%s米禁止鸣笛", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米禁止鸣笛" + tts = "前方%s米禁止鸣笛" ), TYPE_USECASE_ID_BUS_WARNING( 123.toString(), "公交提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, content = "前方%s米公交提醒", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米公交提醒" + tts = "前方%s米公交提醒" ), TYPE_USECASE_ID_NARROW_RIGHT( 163.toString(), "右侧变窄/车道数减少", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米右侧变窄/车道数减少", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米右侧变窄/车道数减少" + tts = "前方%s米右侧变窄/车道数减少" ), TYPE_USECASE_ID_GAS_STATION( 201.toString(), "加油站", poiTypeSrcVr = R.drawable.icon_warning_gas_station, content = "前方%s米加油站", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米加油站" + tts = "前方%s米加油站" ), TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL( 242.toString(), "学校", poiTypeSrcVr = R.drawable.icon_warning_v2x_school, content = "前方%s米学校", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米学校" + tts = "前方%s米学校" ), TYPE_USECASE_ID_ACCIDENT( 244.toString(), "交通事故", poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr, content = "前方%s米交通事故", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米交通事故" + tts = "前方%s米交通事故" ), TYPE_USECASE_ROAD_BUS_STATION( 245.toString(), "通过公交站", poiTypeSrcVr = R.drawable.icon_v2x_bus_station_driver, content = "前方%s米有公交站", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}发现前方公交站,提醒您注意右侧行人及来车" + tts = "前方%s米有公交站" ), TYPE_ATTENTION_CONFLUENCE( 44.toString(), "前方车辆汇流", poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence, - content = "前方%s米注意车辆汇流", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米注意车辆汇流" + content = "前方%s米注意车辆汇入", + tts = "前方%s米注意车辆汇入" ), TYPE_PEDESTRIAN_CROSSING( 114.toString(), "人行横道", poiTypeSrcVr = R.drawable.icon_warning_v2x_person, content = "前方%s米人行横道", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米人行横道" + tts = "前方%s米人行横道" ), //------------车内标牌 obu end --------------> @@ -518,7 +518,7 @@ enum class EventTypeEnumNew( "他车倒车/逆行", poiTypeSrcVr = R.drawable.icon_v2x_other_retrograde_vehicle_driver, content = "前方%s米有他车倒车或逆行", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}发现前方有异常车辆,提醒您注意观察 小心通过" + tts = "前方有异常车辆" ), TYPE_SOCKET_ROAD_GREE_WAVE( "100063", @@ -532,7 +532,7 @@ enum class EventTypeEnumNew( "行人横穿", poiTypeSrcVr = View.NO_ID, content = "前方%s米有行人/非机动车横穿", - tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}发现前方有行人或非机动车横穿,提醒您注意观察,小心通过" + tts = "前方有行人或非机动车横穿" ), TYPE_ERROR( 0.toString(), diff --git a/libraries/mogo-speech/src/main/java/com/mogo/mgintelligent/speech/MGSpeech.kt b/libraries/mogo-speech/src/main/java/com/mogo/mgintelligent/speech/MGSpeech.kt index 88c9829bea..fd494d28e6 100644 --- a/libraries/mogo-speech/src/main/java/com/mogo/mgintelligent/speech/MGSpeech.kt +++ b/libraries/mogo-speech/src/main/java/com/mogo/mgintelligent/speech/MGSpeech.kt @@ -8,6 +8,7 @@ import com.baidu.speech.EventListener import com.baidu.speech.EventManager import com.baidu.speech.EventManagerFactory import com.baidu.speech.asr.SpeechConstant +import com.baidu.tts.chainofresponsibility.logger.LoggerProxy import com.baidu.tts.client.SpeechError import com.baidu.tts.client.SpeechSynthesizeBag import com.baidu.tts.client.SpeechSynthesizer @@ -66,6 +67,8 @@ object MGSpeech { private const val TAG = "MGSpeech" fun init(context: Context) { + LoggerProxy.printable(true) + initTts(context) initAsr(context)