yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_251110_8.2.8_i18n' into dev_robotaxi-d_251204_8.3.0_xfk_temp

Browse Source 
# Conflicts:
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
This commit is contained in:
xinfengkun
2025-12-17 11:29:10 +08:00
parent 32ce35fb4e 51a38410ae
commit 1e8b9dafd7
471 changed files with 10137 additions and 2778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -6,6 +6,7 @@ import androidx.annotation.RequiresPermission
import bag_manager.BagManagerOuterClass
import chassis.SpecialVehicleTaskCmdOuterClass
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
@@ -39,6 +40,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicStatusListenerManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl
import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl
import com.mogo.eagle.core.function.datacenter.autopilot.server.AsyncDataToAutopilotServer
@@ -51,6 +53,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.ParseVersionUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -144,7 +147,7 @@ class MoGoAutopilotControlProvider :
// .setSubscribeInterfaceOptions(subscribeInterfaceOptions)//
.build()
AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl())
//////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听/////////////////////////////////////////////
// 监听ADAS-SDK获取到的工控机数据
AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
@@ -155,7 +158,8 @@ class MoGoAutopilotControlProvider :
}
override fun onStartServer() {
ToastUtils.showShort("司机端服务启动成功!")
// ToastUtils.showShort("司机端服务启动成功!")
ToastUtils.showShort(R.string.module_mogo_core_function_datacenter_driver_service_started_successfully)
if (timer == null) {
timer = Timer()
}
@@ -169,15 +173,18 @@ class MoGoAutopilotControlProvider :
msgHandler.synMsgToAllClients()
}
}, 1000, 10000)
invokeNettyConnResult("司机端服务启动成功!")
// invokeNettyConnResult("司机端服务启动成功!")
invokeNettyConnResult(StringUtils.getString(R.string.module_mogo_core_function_datacenter_driver_service_started_successfully))
CallerTelematicStatusListenerManager.invokeServerStatusChanged(true)
}
override fun onStopServer() {
ToastUtils.showLong("司机端服务停止!")
// ToastUtils.showLong("司机端服务停止!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_driver_service_stop)
timer?.cancel()
timer = null
invokeNettyConnResult("司机端服务停止!")
// invokeNettyConnResult("司机端服务停止!")
invokeNettyConnResult(StringUtils.getString(R.string.module_mogo_core_function_datacenter_driver_service_stop))
CallerTelematicStatusListenerManager.invokeServerStatusChanged(false)
}
@@ -191,7 +198,8 @@ class MoGoAutopilotControlProvider :
override fun onReceiveClientSign(channel: Channel?, sn: String?) {
sn?.let {
invokeNettyConnResult("连接成功的乘客屏sn为:$it")
// invokeNettyConnResult("连接成功的乘客屏sn为:$it")
invokeNettyConnResult("${StringUtils.getString(R.string.module_core_connected_passenger_sn)}$it")
}
}
}, SharedPrefsMgr.getInstance().sn)
@@ -240,7 +248,7 @@ class MoGoAutopilotControlProvider :
// .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
.build()
AdasManager.getInstance()
.create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
.create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl())
// 监听ADAS-SDK获取到的工控机数据
AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
// 接收司机屏发过来的感知、定位等数据
@@ -257,7 +265,8 @@ class MoGoAutopilotControlProvider :
AsyncDataToAutopilotServer.INSTANCE.initServer()
}.onFailure { throwable ->
if (DebugConfig.isDebug()) {
ToastUtils.showLong("AutoPilot出现异常，请立即处理!")
// ToastUtils.showLong("AutoPilot出现异常，请立即处理!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_autopilot_exception)
}
throwable.printStackTrace()
}
@@ -274,7 +283,7 @@ class MoGoAutopilotControlProvider :
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
// .setLaunchAutopilotGear(FunctionBuildConfig.launchAutopilotGear)
.build()
AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl())
//////////////////////////////////注意先后顺序，AdasManager.getInstance().create后才可以设置监听/////////////////////////////////////////////
// 监听ADAS-SDK获取到的工控机数据
AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
@@ -336,7 +345,7 @@ class MoGoAutopilotControlProvider :
.setConnectionMode(AdasOptions.IPC_CONNECTION_MODE.SPECIFIED)
.setSpecifiedAddress(autoPilotIp)
.build()
AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
AdasManager.getInstance().create(AbsMogoApplication.getApp(), options, MoGoAdasMsgConnectStatusListenerImpl())
AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
// AdasManager.getInstance().adasOptions.isClient = false
// AdasManager.getInstance().adasOptions.ipcConnectionMode =
@@ -1167,7 +1176,7 @@ class MoGoAutopilotControlProvider :
* @param resultCode 上报字段code
*/
override fun getReportResultDesc(resultCode: String): String {
return MogoReport.ResultDesc.getDesc(resultCode)
return MogoReport.ResultDesc.getDesc(AbsMogoApplication.getApp(), resultCode)
}
/**
@@ -1175,7 +1184,7 @@ class MoGoAutopilotControlProvider :
* @param actionCode 上报字段code
*/
override fun getReportActionDesc(actionCode: String): String {
return MogoReport.ActionDesc.getDesc(actionCode)
return MogoReport.ActionDesc.getDesc(AbsMogoApplication.getApp(), actionCode)
}
override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
@@ -1193,7 +1202,8 @@ class MoGoAutopilotControlProvider :
carConfigResp.macAddress,
SharedPrefsMgr.getInstance().sn
)
invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")
// invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")
invokeNettyConnResult("${StringUtils.getString(R.string.module_core_passenger_plate)}${carConfigResp.plateNumber},${StringUtils.getString(R.string.module_core_mac_address)}${carConfigResp.macAddress}")
}
if (carConfigResp.dockVersion.isNotEmpty() && !isRainModeInit) {

46
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -25,10 +25,12 @@ import com.mogo.eagle.core.function.call.autopilot.CallerIpcConnectStateToastMan
import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager
import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.zhidao.support.adas.high.AdasManager
import com.zhidao.support.adas.high.OnAdasConnectStatusListener
@@ -74,7 +76,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
CallerAutopilotCarConfigListenerManager.invokeAutopilotCertFileResult(certificationResult)
}
private fun connectToast(reason: String) {
private fun connectToast(reason: Int) {
if (CallerIpcConnectStateToastManager.isToast) {
ToastUtils.showShort(reason)
}
@@ -124,7 +126,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
AdasConstants.IpcConnectionStatus.CONNECTED -> {
connectStatusDescribe = "已连接"
CallerLogger.d("$M_D_C$TAG", connectStatusDescribe)
connectToast("域控已连接")
// connectToast("域控已连接")
connectToast(R.string.module_core_ipc_connection_status_connected)
CallerIpcConnectStateToastManager.ipcConnected()
// 初始化自动驾驶状态信息
CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
@@ -182,19 +185,22 @@ class MoGoAdasMsgConnectStatusListenerImpl :
AdasConstants.IpcConnectionStatus.CONNECTING -> {
connectStatusDescribe = "连接中"
CallerLogger.d("$M_D_C$TAG", connectStatusDescribe)
connectToast("域控连接中")
// connectToast("域控连接中")
connectToast(R.string.module_core_ipc_connection_status_connecting)
}
AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER -> {
connectStatusDescribe = "重连中（定时器）"
CallerLogger.d("$M_D_C$TAG", connectStatusDescribe)
connectToast("域控重连中")
// connectToast("域控重连中")
connectToast(R.string.module_core_ipc_connection_status_reconnecting)
}
AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK -> {
connectStatusDescribe = "重连中（网络监听）"
CallerLogger.d("$M_D_C$TAG", connectStatusDescribe)
connectToast("域控重连中")
// connectToast("域控重连中")
connectToast(R.string.module_core_ipc_connection_status_reconnecting)
}
AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> {
@@ -215,7 +221,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
connectStatusDescribe
)
resetArgs()
connectToast("非法域控地址")
// connectToast("非法域控地址")
connectToast(R.string.module_core_ipc_connection_status_illegal_address)
}
AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS -> {
@@ -224,7 +231,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
"$M_D_C$TAG",
connectStatusDescribe
)
connectToast("正在搜索域控地址")
// connectToast("正在搜索域控地址")
connectToast(R.string.module_core_ipc_connection_status_search_address)
}
AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> {
@@ -358,27 +366,35 @@ class MoGoAdasMsgConnectStatusListenerImpl :
AdasConstants.IpcConnectionStatus.DISCONNECTED -> {
if (isFirstDisconnected) {
title = "连接异常"
content = "域控未连接或主动断开连接"
// title = "连接异常"
title = StringUtils.getString(R.string.module_core_msg_box_connection_error)
// content = "域控未连接或主动断开连接"
content = StringUtils.getString(R.string.module_core_msg_box_connection_error_desc)
isFirstDisconnected = false
}
}
AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> {
title = "域控连接异常"
content = "建议检查WiFi连接情况及域控是否开机"
// title = "域控连接异常"
title = StringUtils.getString(R.string.module_core_msg_box_ipc_connection_error)
// content = "建议检查WiFi连接情况及域控是否开机"
content = StringUtils.getString(R.string.module_core_msg_box_ipc_connection_error_desc)
}
AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> {
if (isFirstException) {
title = "找不到域控可用地址"
content = "建议检查车载路由器及域控是否开机"
// title = "找不到域控可用地址"
title = StringUtils.getString(R.string.module_core_msg_box_not_find_address)
// content = "建议检查车载路由器及域控是否开机"
content = StringUtils.getString(R.string.module_core_msg_box_not_find_address_desc)
isFirstException = false
}
}
AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT -> {
title = "域控心跳超时"
content = "建议检查车载路由器连接是否正常"
// title = "域控心跳超时"
title = StringUtils.getString(R.string.module_core_msg_box_ipc_heartbeat_timeout)
// content = "建议检查车载路由器连接是否正常"
content = StringUtils.getString(R.string.module_core_msg_box_ipc_heartbeat_timeout_desc)
}
else -> {}

13
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
View File

@@ -32,6 +32,7 @@ import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManag
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope
import com.mogo.eagle.core.utilcode.kotlin.scope
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -518,7 +519,8 @@ class TeleMsgHandler : IMsgHandler {
CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_RSP, it.body)
}
TelematicConstant.PASSENGER_APP_REBOOT -> {
ToastUtils.showLong("乘客屏已收到重启命令")
// ToastUtils.showLong("乘客屏已收到重启命令")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_received_restart_command)
}
else -> {
}
@@ -550,7 +552,8 @@ class TeleMsgHandler : IMsgHandler {
isReceiveSN = false
}
// AdasManager.getInstance().startDispatchHandler()
ToastUtils.showShort("连接司机屏成功!")
// ToastUtils.showShort("连接司机屏成功!")
ToastUtils.showShort(R.string.module_mogo_core_function_datacenter_passenger_link_driver_success)
invokeReqStatusLog(mapOf("dpConnectStatus" to true))
val byteArray = byteArrayOf(0)
NSDNettyManager.getInstance().sendMogoProtocolMsgToServer(
@@ -567,7 +570,8 @@ class TeleMsgHandler : IMsgHandler {
isFirstDisc = false
AppConfigInfo.plateNumber = ""
AppConfigInfo.iPCMacAddress = ""
ToastUtils.showLong("断开和司机屏的连接!")
// ToastUtils.showLong("断开和司机屏的连接!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_disconnect_driver)
invokeReqStatusLog(mapOf("dpConnectStatus" to false))
AdasManager.getInstance().stopDispatchHandler()
}
@@ -575,7 +579,8 @@ class TeleMsgHandler : IMsgHandler {
ConnectState.STATUS_CONNECT_ERROR -> {
AppConfigInfo.plateNumber = ""
ToastUtils.showLong("和司机端连接异常!")
// ToastUtils.showLong("和司机端连接异常!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_connect_driver_error)
invokeReqStatusLog(mapOf("dpConnectErrorMsg" to "$content"))
AdasManager.getInstance().stopDispatchHandler()
}

7
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt
View File

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.support.device.DevicesManager
import com.mogo.support.device.IWriteChainLogListener
import com.mogo.support.device.led.LedSourceManager
@@ -68,7 +69,7 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
paramIndexes = [0, 1, 2]
)
override fun onWriteChainLog(tag: String, title: String, info: String) {
if(DebugConfig.isDebug()) {
if (DebugConfig.isDebug()) {
try {
i("${tag}_${EVENT_KEY_HARDWARE_DEVICES}", "${title}_${info}")
val params = HashMap<String, Any>()
@@ -82,4 +83,8 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
}
}
}
override fun onGetString(id: Int): String {
return StringUtils.getString(id)
}
}

11
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
View File

@@ -21,11 +21,13 @@ import com.mogo.eagle.core.function.call.map.*
import com.mogo.eagle.core.function.call.obu.*
import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.function.datacenter.obu.drawer.*
import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
import com.mogo.eagle.core.utilcode.util.ConvertUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.support.obu.ObuScene
import com.zhidao.support.obu.constants.MogoObuShowConstants
import kotlin.math.roundToInt
@@ -629,11 +631,14 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
if (currentSpeed > 0) {
ttsContentNew =
if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) {
"建议保持当前车速通过路口"
// "建议保持当前车速通过路口"
StringUtils.getString(R.string.module_core_suggest_keep_current_speed_pass_intersection)
} else {
"推荐保持车速10-30KM/H通过路口"
// "推荐保持车速10-30KM/H通过路口"
StringUtils.getString(R.string.module_core_suggest_keep_speed_10_30kmh_pass_intersection)
}
alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
// alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
alertContentNew = "${StringUtils.getString(R.string.module_core_suggest_speed)}$minSpeedTemp - $maxSpeedTemp KM/H"
}
saveObuToDcData(
EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,

47
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
View File

@@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
import com.mogo.eagle.core.function.call.obu.*
import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.function.datacenter.obu.drawer.*
import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
import com.mogo.eagle.core.utilcode.download.Config
@@ -24,6 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
import com.mogo.eagle.core.utilcode.util.ConvertUtils
import com.mogo.eagle.core.utilcode.util.FileUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.support.obu.ObuBase
import com.mogo.support.obu.ObuScene
@@ -817,8 +819,10 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
//前向碰撞预警
MogoObuShowConstants.V2X_WARNING_TYPE.FCW.toString() -> {
if (FunctionBuildConfig.isObuWarningFusionUnion && level == 3) {
alertContent = "前车距离过近"
ttsContent = "前车距离过近"
// alertContent = "前车距离过近"
alertContent = StringUtils.getString(R.string.module_core_warning_vehicle_ahead_distance_too_close)
// ttsContent = "前车距离过近"
ttsContent = alertContent
} else {
alertContent =
EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
@@ -858,18 +862,24 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) { //左后
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
// ttsContent = String.format(ttsContent, "左")
ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_left))
// alertContent = String.format(alertContent, "左")
alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_left))
} else if (
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) { //右后
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
// ttsContent = String.format(ttsContent, "右")
ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_right))
// alertContent = String.format(alertContent, "右")
alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_right))
} else{
ttsContent = "注意周围车辆"
alertContent = "盲区预警"
// ttsContent = "注意周围车辆"
ttsContent = StringUtils.getString(R.string.module_core_warning_pay_attention_to_surrounding_vehicles)
// alertContent = "盲区预警"
alertContent = StringUtils.getString(R.string.module_core_warning_blind_spot)
}
}
@@ -885,15 +895,19 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) {
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
// ttsContent = String.format(ttsContent, "左")
ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_left))
// alertContent = String.format(alertContent, "左")
alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_left))
} else if (
direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) {
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
// ttsContent = String.format(ttsContent, "右")
ttsContent = String.format(ttsContent, StringUtils.getString(R.string.module_core_right))
// alertContent = String.format(alertContent, "右")
alertContent = String.format(alertContent, StringUtils.getString(R.string.module_core_right))
}
}
@@ -1111,11 +1125,14 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
if (currentSpeed > 0) {
ttsContentNew =
if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) {
"建议保持当前车速通过路口"
// "建议保持当前车速通过路口"
StringUtils.getString(R.string.module_core_suggest_keep_current_speed_pass_intersection)
} else {
"推荐保持车速10-30KM/H通过路口"
// "推荐保持车速10-30KM/H通过路口"
StringUtils.getString(R.string.module_core_suggest_keep_speed_10_30kmh_pass_intersection)
}
alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
// alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
alertContentNew = "${StringUtils.getString(R.string.module_core_suggest_speed)}$minSpeedTemp - $maxSpeedTemp KM/H"
}
saveObuData(
EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
View File

@@ -36,6 +36,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.skin.utils.SkinResources
import com.zhjt.mogo.adas.common.cloud.AstFuncTlmPhaseStateLightState
@@ -246,7 +247,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
if((light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_YELLOW_FUSION || light.state ==FusionTrafficLightOuterClass.FusionLightState.STATE_RED_FUSION)
&& light.duration < 5 && light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION){
//语音播放:红灯即将变绿
AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("红灯即将变绿", NEW_LEVEL_2)
// AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("红灯即将变绿", NEW_LEVEL_2)
AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(StringUtils.getString(R.string.module_core_hint_red_light_about_to_turn_green), NEW_LEVEL_2)
isTurnGreen = true
}
}