[8.2.8][i18n] OCH\charter\driver 中文抽取

2025-11-28 15:09:33 +08:00
parent 07c9bfeaaa
commit efa2b3ece8
7 changed files with 35 additions and 10 deletions
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -19,6 +19,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ImageUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.createQRCodeWithPicture
 import com.mogo.och.common.module.wigets.BindQRCodeDialog
@@ -84,7 +85,8 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
                        +"—"+DateTimeUtil.formatLongToString(orderStatus.endTime,DateTimeUtil.HH_mm))

            if (orderStatus.lineName.isEmpty()){
-                driverm1_line_name.text = "暂无"
+//                driverm1_line_name.text = "暂无"
+                driverm1_line_name.text = StringUtils.getString(R.string.module_core_no_available)
                group_stations_panel2.visibility = GONE
                no_line_data_view.visibility = VISIBLE
                no_order_data_tv.text = resources.getString(R.string.charter_bus_task_wait_tip)
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
@@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.och.bridge.trajectory.ITrajectoryListListener
 import com.mogo.och.bridge.trajectory.TrajectoryManager
 import com.mogo.och.common.module.biz.login.LoginStatusManager
@@ -85,7 +86,8 @@ object CharterTrajectoryManager : ITrajectoryListListener {
            MsgBoxBean(
                MsgBoxType.OPERATION,
                OperationMsg(
-                    System.currentTimeMillis(), "请尽快操作车辆至适当位置掉头！", -1
+//                    System.currentTimeMillis(), "请尽快操作车辆至适当位置掉头！", -1
+                    System.currentTimeMillis(), StringUtils.getString(R.string.module_och_please_turn), -1
                )
            )
        )
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -283,7 +283,8 @@ class DriverM1Model {
            override fun onMsgReceived(passenger: WriteOffPassenger?) {
                //进行播报
                i(SceneConstant.M_BUS + TAG, "passenger = " + GsonUtil.jsonFromObject(passenger))
-                val appMsg = AppConnectMsg(false,true,"核销成功")
+//                val appMsg = AppConnectMsg(false,true,"核销成功")
+                val appMsg = AppConnectMsg(false,true,StringUtils.getString(R.string.module_och_verification_success))
                sendMsgToClient(appMsg)
            }
        }
@@ -823,7 +824,12 @@ class DriverM1Model {
                               MsgBoxType.OPERATION,
                               OperationMsg(
                                   System.currentTimeMillis(),
-                                   "即将前往路线${currentChangeDestMsg!!.lineName}、站点${currentChangeDestMsg!!.destSiteName}；如需掉头请尽快操作车辆至适当位置！",
+//                                   "即将前往路线${currentChangeDestMsg!!.lineName}、站点${currentChangeDestMsg!!.destSiteName}；如需掉头请尽快操作车辆至适当位置！",
+                                   StringUtils.getString(
+                                       R.string.module_och_route_need_turn,
+                                       currentChangeDestMsg!!.lineName,
+                                       currentChangeDestMsg!!.destSiteName
+                                   ),
                                   -1
                               )
                           )
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.och.common.module.biz.login.ILoginCallback
 import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import com.mogo.och.common.module.biz.login.LoginStatusManager
@@ -154,14 +155,16 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
            StopSideStatus.NOSTART -> {
                DriverM1Model.get().pushOperationalToMsgBox(
                    DateTimeUtil.getCurrentTimeStamp(),
-                    "靠边停车无响应，注意随时接管",
+//                    "靠边停车无响应，注意随时接管",
+                    StringUtils.getString(R.string.module_och_pull_over_no_response),
                    OPERATION_ROAD_SIDE_TYPE
                )
            }
            StopSideStatus.START -> { // 靠边停车 to 消息盒子
                DriverM1Model.get().pushOperationalToMsgBox(
                    DateTimeUtil.getCurrentTimeStamp(),
-                    "开始靠边停车",
+//                    "开始靠边停车",
+                    StringUtils.getString(R.string.module_och_start_pull_over),
                    OPERATION_ROAD_SIDE_TYPE
                )
            }
@@ -175,7 +178,8 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
                    StopSideStatus.NOSTART-> {
                DriverM1Model.get().pushOperationalToMsgBox(
                    DateTimeUtil.getCurrentTimeStamp(),
-                    "靠边停车失败，注意随时接管",
+//                    "靠边停车失败，注意随时接管",
+                    StringUtils.getString(R.string.module_och_pull_over_failed),
                    OPERATION_ROAD_SIDE_TYPE
                )
            }
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt
@@ -20,6 +20,7 @@ import android.view.animation.DecelerateInterpolator
 import com.magic.mogo.och.charter.R
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.utilcode.util.ConvertUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -53,7 +54,8 @@ class SlidePanelView @JvmOverloads constructor(
    private val textRect = Rect()
    private var textGradient: LinearGradient? = null
    private var matrixAnim: ObjectAnimator? = null
-    private var blockText = STRING_SLIDE_TO_RIGHT
+//    private var blockText = STRING_SLIDE_TO_RIGHT
+    private var blockText = StringUtils.getString(R.string.module_och_swipe_right)
    private val blockTextMetrics = Paint.FontMetrics()
    fun setOnSlidePanelMoveToEndListener(moveToEndListener: OnSlidePanelMoveToEndListener?) {
        this.moveToEndListener = moveToEndListener
@@ -269,7 +271,7 @@ class SlidePanelView @JvmOverloads constructor(
        private var NORMAL_TEXT_MARGIN_RIGHT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 60f)
        private var SHORT_TEXT_MARGIN_LEFT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 60f)
        private var SHORT_TEXT_MARGIN_RIGHT = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 70f)
-        private const val STRING_SLIDE_TO_RIGHT = "向右滑动"
+//        private const val STRING_SLIDE_TO_RIGHT = "向右滑动"
        private const val GRADIENT_OFFSET = 200f
    }

--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -258,12 +258,13 @@
        app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
        app:layout_constraintTop_toBottomOf="@id/btnAutopilotPingxing" />

+<!--    android:text="上传全路径"-->
    <Button
        android:id="@+id/btnAutopilotRoute"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="#023D35"
-        android:text="上传全路径"
+        android:text="@string/module_och_upload_all_Route"
        android:textSize="@dimen/dp_60"
        app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
        app:layout_constraintTop_toBottomOf="@id/btnAutopilotArrive"
--- a/core/mogo-core-res/src/main/res/values/string.xml
+++ b/core/mogo-core-res/src/main/res/values/string.xml
@@ -334,6 +334,14 @@
    <string name="module_och_time">时间</string>
    <string name="module_och_empty_line">暂无线路</string>
    <string name="module_och_empty_task">暂无班次</string>
+    <string name="module_och_please_turn">请尽快操作车辆至适当位置掉头！</string>
+    <string name="module_och_verification_success">核销成功</string>
+    <string name="module_och_route_need_turn">即将前往路线%s、站点%s；如需掉头请尽快操作车辆至适当位置！</string>
+    <string name="module_och_pull_over_no_response">靠边停车无响应，注意随时接管</string>
+    <string name="module_och_pull_over_failed">靠边停车失败，注意随时接管</string>
+    <string name="module_och_start_pull_over">开始靠边停车</string>
+    <string name="module_och_swipe_right">向右滑动</string>
+    <string name="module_och_upload_all_Route">上传全路径</string>


    <string name="module_tts_init_fail">PadTTS 模块初始化异常</string>