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

[8.2.8_il8n]och/common/bridge模块国际化

Browse Source
This commit is contained in:
xuxinchao
2025-12-09 19:52:10 +08:00
parent fcb0c4f67d
commit e8bd8d921f
6 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt
View File

@@ -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)
}
}

5
OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt
View File

@@ -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 {

2
OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml
View File

@@ -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" />

8
OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml
View File

@@ -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" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_error_body"
@@ -37,7 +37,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_error_head"
android:text="请暂停运营并上报问题，待问题解决后用车" />
android:text="@string/common_check_vin_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_error_body_red"
@@ -51,7 +51,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_error_body"
android:text="【仍继续用车有安全风险！！！】" />
android:text="@string/common_check_vin_tip" />
<androidx.appcompat.widget.AppCompatTextView
@@ -62,7 +62,7 @@
android:layout_marginBottom="@dimen/dp_80"
android:background="@drawable/common_error_vin_submit"
android:gravity="center"
android:text="我知道了"
android:text="@string/common_check_vin_ensure"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_46"
app:layout_constraintTop_toBottomOf="@+id/actv_error_body_red"

2
OCH/common/bridge/src/main/res/layout/common_line_view.xml
View File

@@ -26,7 +26,7 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:text="车道指引"
android:text="@string/common_line_lane_guidance"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/sp_38"
app:layout_constraintLeft_toLeftOf="parent"

26
core/mogo-core-res/src/main/res/values/string.xml
View File

@@ -1281,19 +1281,21 @@
<string name="module_core_trajectory_not_ready">轨迹未就绪，请稍后重试</string>
<string name="module_core_autonomous_driving_startup_failed">自动驾驶启动失败</string>
<string name="module_core_loading_in_progress">正在加载中…</string>
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<!-- <string name="module_core_"></string>-->
<string name="common_check_vin_title">VIN码不匹配！！！</string>
<string name="common_check_vin_content">请暂停运营并上报问题，待问题解决后用车</string>
<string name="common_check_vin_tip">【仍继续用车有安全风险！！！】</string>
<string name="common_check_vin_ensure">我知道了</string>
<string name="common_autopilot_parallel_driving_cloud_control">平行驾驶</string>
<string name="common_line_lane_guidance">车道指引</string>
<string name="common_bridge_distance_exception">起始站点值异常，请重新选择此任务执行并上报问题</string>
<string name="common_bridge_distance_exceeds_15_meters_from_start_station">距离起始站点超过15米</string>
<string name="common_bridge_distance_trajectory_line_distance_over_15m">距离轨迹线超过15米</string>
<string name="common_bridge_distance_please_confirm_route_id">请确认线路ID</string>
<string name="common_bridge_distance_autonomous_driving_status">自动驾驶状态:%sline信息：%s定位信息:%s%s%s当前速度:%s</string>
<!-- <string name="_content"></string>-->
<!-- <string name="_tts"></string>-->
@@ -1306,4 +1308,6 @@
<!-- <string name="_tts"></string>-->
</resources>