diff --git 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 index df46e43726..1e7c13bd14 100644 --- 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 { 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 ) } diff --git 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 index 1b62ed6c2b..003ae9573f 100644 --- 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 } diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt index 38a7776c8c..b5129f776b 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt @@ -1,6 +1,7 @@ package com.magic.mogo.och.charter.view.autopilot import androidx.lifecycle.ViewModel +import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.constant.CharterConst @@ -54,7 +55,8 @@ class AutopilotStatusViewModel: ViewModel(), IDriverM1ControllerStatusCallback, fun restartAutopilot() { // todo 启动自驾必须有订单路线 if(isAnimateRunning.get()){ - ToastUtils.showShort("启动自驾中") +// ToastUtils.showShort("启动自驾中") + ToastUtils.showShort(R.string.module_och_autopilot_starting) }else { if (DriverM1Model.get().isHaveOrder()) { DriverM1Model.get().restartAutopilot() diff --git a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml index d9064ebce3..b146055dff 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml @@ -16,6 +16,7 @@ android:layout_centerVertical="true" android:src="@drawable/charter_ic_autopilot" /> + diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index 1507c11086..8de8a2df7a 100644 --- 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" /> +