From 391d172633729a17c718eb8336380f5e32b96ea6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 11 Mar 2026 11:04:23 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"[8.4.0]=E4=B8=B4=E6=97=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=B3=A8=E9=87=8A=E5=90=90=E5=8F=B8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit eb3ebba1cf920069b9f80ce4fb0e29114f9f406d. --- .../mogo/och/bridge/autopilot/line/LineManager.kt | 14 +++++++------- .../java/com/mogo/och/unmanned/model/LineModel.kt | 6 +++--- .../java/com/mogo/och/unmanned/model/OrderModel.kt | 4 ++-- .../com/mogo/och/unmanned/model/SynchDataModel.kt | 8 ++++---- .../repository/line/impl/WeaknetRepository.kt | 2 +- .../autopilot/MoGoAutopilotControlProvider.kt | 4 ++-- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 2 +- .../autopilot/telematic/TeleMsgHandler.kt | 8 ++++---- .../rviz/dialog/SelectAutopilotLineDialog.kt | 4 ++-- .../rviz/ui/activity/FmdAct.kt | 6 +++--- .../ui/fragments/resource/SystemResourceFrag.kt | 12 ++++++------ .../rviz/ui/views/CheckAutopilotView.kt | 2 +- .../status/flow/gps/GpsImpl.kt | 2 +- .../autopilot/CallerAutoPilotControlManager.kt | 2 +- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt index 380074d83d..af177bb16c 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt @@ -465,7 +465,7 @@ object LineManager : CallerBase() { 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 } @@ -543,14 +543,14 @@ object LineManager : CallerBase() { 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 } } @@ -567,7 +567,7 @@ object LineManager : CallerBase() { //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 @@ -575,7 +575,7 @@ object LineManager : CallerBase() { && 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 @@ -593,7 +593,7 @@ object LineManager : CallerBase() { // 3、距离轨迹15m计算 val resion = OchAutoPilotManager.canStartAutoPilotByDistance(_contraiInfo!!.lineId) if (!StringUtils.isEmpty(resion)) { -// ToastUtils.showShort(resion) + ToastUtils.showShort(resion) VoiceNotice.showNotice(resion) return } @@ -913,7 +913,7 @@ object LineManager : CallerBase() { // 地盘有但是和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不同请排查" diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt index f97ca277f2..c4a47de91c 100644 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt +++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt @@ -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() } @@ -287,7 +287,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() } diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt index 111770a8bd..01dab14900 100644 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt +++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt @@ -554,11 +554,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) { diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/SynchDataModel.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/SynchDataModel.kt index 90e9d29730..5a1287d743 100644 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/SynchDataModel.kt +++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/SynchDataModel.kt @@ -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) } } diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt index d57a5b0fbf..72d4f54e76 100644 --- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt @@ -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") } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 8a29eb7c60..5e03a7d18b 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -182,7 +182,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("司机端服务停止!") @@ -268,7 +268,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() } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index ded5c20a68..2c3dd90ee8 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -78,7 +78,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : private fun connectToast(reason: Int) { if (CallerIpcConnectStateToastManager.isToast) { -// ToastUtils.showShort(reason) + ToastUtils.showShort(reason) } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index 085171fda5..bd2b0fc04c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -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() } diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt index af256ea8a1..6407cbcabd 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt @@ -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 站点列表异常，请开启定位权限") } diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt index 7147761150..8e7edc4e91 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt @@ -215,7 +215,7 @@ class FmdAct : BaseActivity() { fun getRosHostArguments(): ArrayList? { 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?) { diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt index 0f0d46d651..5e87b122b1 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt @@ -121,7 +121,7 @@ class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener, FlowBus.with(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(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(EventKey.QUERY_STARTUP_CONFIG) .register(this) { if (it.configs == null || it.configs.isEmpty()) { -// ToastUtils.showLong("启动配置查询失败") + ToastUtils.showLong("启动配置查询失败") } else { StartupConfigDialog( fmdAct, diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt index 681b1ac6e7..cbee28f7a8 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt @@ -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 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt index 3576a3d9a8..0d002d05ab 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt @@ -73,7 +73,7 @@ internal class GpsImpl(ctx: Context): IFlow(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) } }) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index 49eb1fbd92..210ffe227f 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -196,7 +196,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)