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

Merge remote-tracking branch 'origin/dev_robotaxi-d_260105_8.4.0_temp' into dev_robotaxi-d_260105_8.4.0_temp

Browse Source
This commit is contained in:
xinfengkun
2026-02-27 18:21:06 +08:00
parent a9ab8e7171 baa0aba9a9
commit fc298397ef
16 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
View File

@@ -459,7 +459,7 @@ object LineManager : CallerBase<ILineCallback>() {
CallerLogger.d(TAG, "${parameters?.wayLatLons}\n${parameters?.blackLatLons}")
if (parameters == null) {
// ToastUtils.showShort("未设置起始或终点站点")
ToastUtils.showShort(R.string.module_och_not_stat_and_end_point)
// ToastUtils.showShort(R.string.module_och_not_stat_and_end_point)
}
return parameters
}
@@ -537,14 +537,14 @@ object LineManager : CallerBase<ILineCallback>() {
if (startStation == null || endStation == null) {
// ToastUtils.showShort("未设置起始或终点站点")
ToastUtils.showShort(R.string.module_och_not_stat_and_end_point)
// ToastUtils.showShort(R.string.module_och_not_stat_and_end_point)
return
}
startStation?.let {
if (!it.isLeaving) {
// ToastUtils.showShort("请滑动出发后再启动自驾")
ToastUtils.showShort(R.string.module_och_please_slide_hint)
// ToastUtils.showShort(R.string.module_och_please_slide_hint)
return
}
}
@@ -561,7 +561,7 @@ object LineManager : CallerBase<ILineCallback>() {
//1、判断轨迹url是否可用
if (_contraiInfo == null) {
// ToastUtils.showLong("无发布轨迹, 请发布后重试")
ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory)
// ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory)
return
} else {
if (FunctionBuildConfig.isPassStartAutopilotCommand
@@ -569,7 +569,7 @@ object LineManager : CallerBase<ILineCallback>() {
&& TextUtils.isEmpty(_contraiInfo!!.csvFileMd5)
) {
// ToastUtils.showLong("无发布轨迹, 请发布后重试")
ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory)
// ToastUtils.showLong(R.string.module_taxi_no_publication_trajectory)
e(
TAG, "isPassStartAutopilotCommand = " +
FunctionBuildConfig.isPassStartAutopilotCommand
@@ -587,7 +587,7 @@ object LineManager : CallerBase<ILineCallback>() {
// 3、距离轨迹15m计算
val resion = OchAutoPilotManager.canStartAutoPilotByDistance(_contraiInfo!!.lineId)
if (!StringUtils.isEmpty(resion)) {
ToastUtils.showShort(resion)
// ToastUtils.showShort(resion)
VoiceNotice.showNotice(resion)
return
}
@@ -699,7 +699,7 @@ object LineManager : CallerBase<ILineCallback>() {
// 地盘有但是和och出不一样
// todo 需要och 重新出发轨迹下载操作
// ToastUtils.showShort("${autopilotIdFromFsm}_${teleOrderId}_自动驾驶id不同请排查")
ToastUtils.showShort(R.string.module_och_autopilot_id_diff, autopilotIdFromFsm, teleOrderId)
// ToastUtils.showShort(R.string.module_och_autopilot_id_diff, autopilotIdFromFsm, teleOrderId)
OchChainLogManager.writeChainLogAutopilot(
"自驾Id",
"${autopilotIdFromFsm}_${teleOrderId}_自动驾驶id不同请排查"

6
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt
View File

@@ -128,7 +128,7 @@ object LineModel {
if (e is DataException) {
OchChainLogManager.writeChainLog("开始任务", "${e.message}")
// ToastUtils.showShort("选择任务失败:${e.message}")
ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message)
// ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message)
mBusLinesCallbackMap.forEach {
it.value.onChangeLineIdFail()
}
@@ -136,7 +136,7 @@ object LineModel {
} else {
OchChainLogManager.writeChainLog("开始任务", "${e.message}")
// ToastUtils.showShort("选择任务失败:${e.message}")
ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message)
// ToastUtils.showShort(R.string.module_och_choose_task_fail, e.message)
mBusLinesCallbackMap.forEach {
it.value.onChangeLineIdFail()
}
@@ -278,7 +278,7 @@ object LineModel {
OchChainLogManager.writeChainLog("结束任务", changeInfo)
} else {
// ToastUtils.showShort("结束任务失败请稍后再试")
ToastUtils.showShort(R.string.module_och_task_finish_fail)
// ToastUtils.showShort(R.string.module_och_task_finish_fail)
mBusLinesCallbackMap.forEach {
it.value.onCompleteTaskFail()
}

4
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt
View File

@@ -548,11 +548,11 @@ object OrderModel {
ThreadUtils.getIoPool().execute {
try {
if (RepositoryManager.haveDataWaitSyn()) {
ToastUtils.showShort(ResourcesUtils.getString(R.string.unmanned_shuttle_logout_error))
// ToastUtils.showShort(ResourcesUtils.getString(R.string.unmanned_shuttle_logout_error))
return@execute
}
if (RepositoryManager.haveRunningTask()) {
ToastUtils.showShort(ResourcesUtils.getString(R.string.unmanned_shuttle_logout_error_running))
// ToastUtils.showShort(ResourcesUtils.getString(R.string.unmanned_shuttle_logout_error_running))
return@execute
}
} catch (e: Exception) {

8
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/SynchDataModel.kt
View File

@@ -101,9 +101,9 @@ object SynchDataModel {
}
if (!isBackground) {
if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) {
ToastUtils.showShort(ResourcesUtils.getString(R.string.network_error_tip))
// ToastUtils.showShort(ResourcesUtils.getString(R.string.network_error_tip))
} else {
ToastUtils.showShort(ResourcesUtils.getString(R.string.request_error_tip))
// ToastUtils.showShort(ResourcesUtils.getString(R.string.request_error_tip))
}
}
}
@@ -118,9 +118,9 @@ object SynchDataModel {
if (!isBackground) {
if (!NetworkUtils.isConnected(AbsMogoApplication.getApp())) {
// ToastUtils.showShort("网络异常，请稍后重试")
ToastUtils.showShort(R.string.module_och_network_error)
// ToastUtils.showShort(R.string.module_och_network_error)
} else {
ToastUtils.showShort(failMsg)
// ToastUtils.showShort(failMsg)
}
}

2
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt
View File

@@ -137,7 +137,7 @@ class WeaknetRepository : ILineRepository {
ContraiDb.queryAutopilotInfoByLineid(it)?.apply {
if (lineId == null || lineId!! < 0L || csvFileUrl.isNullOrEmpty() || csvFileMd5.isNullOrEmpty() || txtFileUrl.isNullOrEmpty() || txtFileMd5.isNullOrEmpty()) {
// ToastUtils.showLong("请设置轨迹信息")
ToastUtils.showLong(R.string.module_och_set_line_info)
// ToastUtils.showLong(R.string.module_och_set_line_info)
OchChainLogManager.writeChainLogAutopilot("轨迹错误", this.toString())
CallerLogger.d(TAG, "轨迹错误,$this")
}

11
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt
View File

@@ -62,9 +62,9 @@ class UnmannedMsgBoxView @JvmOverloads constructor(
getDrawable(R.drawable.rv_divider_line_tab)?.let { divider.setDrawable(it) }
rvUnmannedMsgBoxList.addItemDecoration(divider)
//获取通知消息列表
CallerMsgBoxManager.getCachedNotifyData()?.let {
noticeList.addAll(it)
}
// CallerMsgBoxManager.getCachedNotifyData()?.let {
// noticeList.addAll(it)
// }
// 获取车辆系统信息
CallerMsgBoxManager.getCachedSysInfoData()?.let {
noticeList.addAll(it)
@@ -132,7 +132,10 @@ class UnmannedMsgBoxView @JvmOverloads constructor(
// msgBoxTabAdapter?.notifyItemInserted(0)
}
}
//FM和FSM Event消息暂时不展示
MsgCategory.FM_INFO ->{
return@post
}
else -> {
noticeList.add(0, msgBoxList)
// msgBoxTabAdapter?.notifyItemInserted(0)

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

@@ -180,7 +180,7 @@ class MoGoAutopilotControlProvider :
override fun onStopServer() {
// ToastUtils.showLong("司机端服务停止!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_driver_service_stop)
// ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_driver_service_stop)
timer?.cancel()
timer = null
// invokeNettyConnResult("司机端服务停止!")
@@ -266,7 +266,7 @@ class MoGoAutopilotControlProvider :
}.onFailure { throwable ->
if (DebugConfig.isDebug()) {
// ToastUtils.showLong("AutoPilot出现异常，请立即处理!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_autopilot_exception)
// ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_autopilot_exception)
}
throwable.printStackTrace()
}

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

@@ -78,7 +78,7 @@ class MoGoAdasMsgConnectStatusListenerImpl :
private fun connectToast(reason: Int) {
if (CallerIpcConnectStateToastManager.isToast) {
ToastUtils.showShort(reason)
// ToastUtils.showShort(reason)
}
}

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

@@ -520,7 +520,7 @@ class TeleMsgHandler : IMsgHandler {
}
TelematicConstant.PASSENGER_APP_REBOOT -> {
// ToastUtils.showLong("乘客屏已收到重启命令")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_received_restart_command)
// ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_received_restart_command)
}
else -> {
}
@@ -553,7 +553,7 @@ class TeleMsgHandler : IMsgHandler {
}
// AdasManager.getInstance().startDispatchHandler()
// ToastUtils.showShort("连接司机屏成功!")
ToastUtils.showShort(R.string.module_mogo_core_function_datacenter_passenger_link_driver_success)
// 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(
@@ -571,7 +571,7 @@ class TeleMsgHandler : IMsgHandler {
AppConfigInfo.plateNumber = ""
AppConfigInfo.iPCMacAddress = ""
// ToastUtils.showLong("断开和司机屏的连接!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_disconnect_driver)
// ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_disconnect_driver)
invokeReqStatusLog(mapOf("dpConnectStatus" to false))
AdasManager.getInstance().stopDispatchHandler()
}
@@ -580,7 +580,7 @@ class TeleMsgHandler : IMsgHandler {
ConnectState.STATUS_CONNECT_ERROR -> {
AppConfigInfo.plateNumber = ""
// ToastUtils.showLong("和司机端连接异常!")
ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_connect_driver_error)
// ToastUtils.showLong(R.string.module_mogo_core_function_datacenter_passenger_connect_driver_error)
invokeReqStatusLog(mapOf("dpConnectErrorMsg" to "$content"))
AdasManager.getInstance().stopDispatchHandler()
}

4
core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt
View File

@@ -121,13 +121,13 @@ class SelectAutopilotLineDialog(context: Context) : Dialog(context), LifecycleOw
}
override fun onError(msg: String) {
ToastUtils.showLong("获取 Bus 站点列表异常，异常原因：${msg}")
// ToastUtils.showLong("获取 Bus 站点列表异常，异常原因：${msg}")
tvLoading.show("获取 Bus 站点列表异常")
}
}
)
} ?: let {
ToastUtils.showLong("获取 Bus 站点列表异常，获取当前未知失败，请开启定位权限")
// ToastUtils.showLong("获取 Bus 站点列表异常，获取当前未知失败，请开启定位权限")
tvLoading.show("获取 Bus 站点列表异常，请开启定位权限")
}

6
core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt
View File

@@ -215,7 +215,7 @@ class FmdAct : BaseActivity() {
fun getRosHostArguments(): ArrayList<RosHostArgument>? {
return if (fmdBound == null) {
ToastUtils.showLong("服务绑定失败，请退出页面重试")
// ToastUtils.showLong("服务绑定失败，请退出页面重试")
null
} else {
fmdBound!!.rosHostArguments
@@ -270,7 +270,7 @@ class FmdAct : BaseActivity() {
return bridge
}
}
ToastUtils.showLong("终端服务未绑定或绑定失败")
// ToastUtils.showLong("终端服务未绑定或绑定失败")
return null
}
@@ -279,7 +279,7 @@ class FmdAct : BaseActivity() {
fmdBound!!.openConnection(hostBean)
return
}
ToastUtils.showLong("终端服务未绑定或绑定失败")
// ToastUtils.showLong("终端服务未绑定或绑定失败")
}
public fun execCmd(hostBean: SSHHostBean, cmd: String, msg: String?) {

12
core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt
View File

@@ -121,7 +121,7 @@ class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener,
FlowBus.with<DockerBean>(EventKey.QUERY_DOCKER_PS)
.register(this) {
if (it.dockers.isEmpty()) {
ToastUtils.showLong("Docker列表查询失败")
// ToastUtils.showLong("Docker列表查询失败")
} else {
DockersDialog(fmdAct, it).show()
}
@@ -130,7 +130,7 @@ class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener,
FlowBus.with<DiskInfo>(EventKey.QUERY_DISK_STATUS)
.register(this) {
if (TextUtils.isEmpty(it.data)) {
ToastUtils.showLong("磁盘信息查询失败")
// ToastUtils.showLong("磁盘信息查询失败")
} else {
ShowConfigDialog(
fmdAct,
@@ -150,15 +150,15 @@ class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener,
} else {
when (it.status) {
DockerCommandHandler.CONNECT_STATUS.FAILED -> {
ToastUtils.showLong("无法与主机“" + it.host.hostname + "”中的Docker建立连接")
// ToastUtils.showLong("无法与主机“" + it.host.hostname + "”中的Docker建立连接")
}
DockerCommandHandler.CONNECT_STATUS.CLOSE -> {
ToastUtils.showLong("已断开主机“" + it.host.hostname + "”中的Docker连接")
// ToastUtils.showLong("已断开主机“" + it.host.hostname + "”中的Docker连接")
}
DockerCommandHandler.CONNECT_STATUS.CLOSE_DELAYED -> {
ToastUtils.showLong("已自动断开主机“" + it.host.hostname + "”中的Docker连接")
// ToastUtils.showLong("已自动断开主机“" + it.host.hostname + "”中的Docker连接")
}
}
fmdAct.dismissLoadingDialog()
@@ -167,7 +167,7 @@ class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener,
FlowBus.with<StartupConfig>(EventKey.QUERY_STARTUP_CONFIG)
.register(this) {
if (it.configs == null || it.configs.isEmpty()) {
ToastUtils.showLong("启动配置查询失败")
// ToastUtils.showLong("启动配置查询失败")
} else {
StartupConfigDialog(
fmdAct,

2
core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt
View File

@@ -436,7 +436,7 @@ class CheckAutopilotView @JvmOverloads constructor(
mTrajectorySiteInfo?.let { trajectorySiteInfo ->
if (trajectorySiteInfo.isEmpty()) {
if (btnControlAutoPilot.isChecked) {
ToastUtils.showShort("该路线缺少站点信息")
// ToastUtils.showShort("该路线缺少站点信息")
}
btnControlAutoPilot.isChecked = false
return@setOnClickListener

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt
View File

@@ -73,7 +73,7 @@ internal class GpsImpl(ctx: Context): IFlow<GpsStatus>(ctx) {
override fun onDenied() {
// ToastUtils.showShort("定位权限被拒绝, 可能导致RTK定位不准确，请开启~")
ToastUtils.showShort(R.string.module_mogo_core_function_devatools_not_location_permission)
// ToastUtils.showShort(R.string.module_mogo_core_function_devatools_not_location_permission)
send(enabled = isLocationEnabled(), isGranted = false)
}
})

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
View File

@@ -399,15 +399,15 @@ class MsgBoxTabAdapter(private val activity: Activity) :
|| reportEntity.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
) {
//Error
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_error))
holder.tvReportLevel.text = "Error"
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
holder.tvReportLevel.text = "Info"
} else if(reportEntity.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
|| reportEntity.resultList.contains(RESULT_SHOW_WARNING)
|| reportEntity.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)
){
//Warning
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_warning))
holder.tvReportLevel.text = "Warning"
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
holder.tvReportLevel.text = "Info"
}else {
//INFO
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
@@ -423,7 +423,7 @@ class MsgBoxTabAdapter(private val activity: Activity) :
resultStr =
"${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}"
}
holder.tvReportType.text = resultStr
holder.tvReportType.text = "system information"
// holder.tvReportReason.text = "原因：${reportEntity.msg}"
holder.tvReportReason.text = "${StringUtils.getString(R.string.module_core_cause1)}${reportEntity.msg}"
// holder.tvReportSrc.text = "消息来源：${reportEntity.src}"

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
View File

@@ -165,7 +165,7 @@ object CallerAutoPilotControlManager {
Logger.d(TAG, "voiceText: $voiceText")
AppStateManager.currentActivity()?.also {
it.lifeCycleScope.launch {
ToastUtils.showShort(voiceText)
// ToastUtils.showShort(voiceText)
if (isPlayTTS) {
runCatching {
AIAssist.getInstance(it).speakTTSVoice(voiceText)