From e8bd8d921f62507ce24e1e5349d3f31791f64ea0 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 9 Dec 2025 19:52:10 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.8=5Fil8n]och/common/bridge=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distance/TrajectoryAndDistanceManager.kt | 22 +++++++++------- .../ui/autopilot/AutopilotStateModel.kt | 5 ---- .../main/res/layout/common_autopilot_view.xml | 2 +- .../main/res/layout/common_checkvin_view.xml | 8 +++--- .../src/main/res/layout/common_line_view.xml | 2 +- .../src/main/res/values/string.xml | 26 +++++++++++-------- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt index 8773ba1c89..e01cb6e473 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt @@ -5,11 +5,14 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.LocationUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.bridge.R import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics import com.mogo.och.bridge.autopilot.location.OchLocationManager @@ -38,7 +41,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { private const val TAG = "DistanceManager" private const val DISTANCE = "BusPassengerModelDistance" - const val errorTypeNoneLineId = "起始站点值异常，请重新选择此任务执行并上报问题" +// const val errorTypeNoneLineId = "起始站点值异常，请重新选择此任务执行并上报问题" fun addDistanceListener(tag: String, listener: IDistanceListener) { @@ -190,9 +193,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { endStationInfo: MogoLocation?, lineId: Long? ) { - d( - M_OCHCOMMON + TAG, - "线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}" + CallerLogger.d(M_OCHCOMMON + TAG, "线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}" ) OchChainLogManager.writeChainLogTrajectory("轨迹监控","设置站点:线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}") if (startStationInfo == null || endStationInfo == null || lineId == -1L) { @@ -328,8 +329,10 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { location: MogoLocation, ) { val autoPilotState = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state +// val locationInfo = +// "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}" val locationInfo = - "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}" + StringUtils.getString(R.string.common_bridge_distance_autonomous_driving_status,autoPilotState,lineId,location.latitude,location.longitude,location.heading,location.gnssSpeed) if (mRoutePoints.isNullOrEmpty()) return // 计算起始站点在轨迹中的信息 这个是一个常量 if (startStationInfo.stationPoint != null @@ -666,7 +669,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { fun canStartAutopilot(lineId: Number?): String { if (lineId == null) { OchAutopilotAnalytics.triggerDistance2LineorStation("未传轨迹ID") - return "请确认线路ID" + return StringUtils.getString(R.string.common_bridge_distance_please_confirm_route_id) } OchAutopilotAnalytics.triggerDistance2LineorStation("条件记录:lineId:${lineId}----this.lineId:${this.lineId}、mRoutePoints情况:${mRoutePoints?.size}") @@ -710,7 +713,8 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { */ private fun distanceWithStartStation(): String { if (startStationInfo.stationPoint == null) { - return errorTypeNoneLineId +// return errorTypeNoneLineId + return StringUtils.getString(R.string.common_bridge_distance_exception) } val currentPoint = OchLocationManager.getGCJ02Location() val distance = CoordinateUtils.calculateLineDistance( @@ -723,7 +727,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { return if (distance <= OchCommonConst.AUTOMATIC_PLANNING_MAX_DISTANCE) { "" } else { - "距离起始站点超过15米" + StringUtils.getString(R.string.common_bridge_distance_exceeds_15_meters_from_start_station) } } @@ -749,7 +753,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { } } OchAutopilotAnalytics.triggerDistance2LineorStation("距离轨迹线超过15m,无法启动自驾") - return "距离轨迹线超过15米" + return StringUtils.getString(R.string.common_bridge_distance_trajectory_line_distance_over_15m) } } \ No newline at end of file diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt index 0c8225b7a9..e8cab03885 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt @@ -18,11 +18,6 @@ import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.RxUtils import java.util.concurrent.atomic.AtomicBoolean -/** - * @author XuXinChao - * @description BadCase录包管理页面 - * @since: 2022/12/15 - */ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallback, IOchDebugAutopilotStatusListener, IBeautifyModeCallback { diff --git a/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml b/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml index 04365d6b7d..89bf1ddbba 100644 --- a/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml +++ b/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml @@ -76,7 +76,7 @@ app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_bottom" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:text="平行驾驶" + android:text="@string/common_autopilot_parallel_driving_cloud_control" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml index b4fb235d1a..dbe88a7879 100644 --- a/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml +++ b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml @@ -20,7 +20,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:text="VIN码不匹配！！！" /> + android:text="@string/common_check_vin_title" /> + android:text="@string/common_check_vin_content" /> + android:text="@string/common_check_vin_tip" /> 轨迹未就绪，请稍后重试 自动驾驶启动失败 正在加载中… - - - - - - - - - - - + VIN码不匹配！！！ + 请暂停运营并上报问题，待问题解决后用车 + 【仍继续用车有安全风险！！！】 + 我知道了 + 平行驾驶 + 车道指引 + + 起始站点值异常，请重新选择此任务执行并上报问题 + 距离起始站点超过15米 + 距离轨迹线超过15米 + 请确认线路ID + 自动驾驶状态:%sline信息：%s定位信息:%s%s%s当前速度:%s + @@ -1306,4 +1308,6 @@ + + \ No newline at end of file