From 434d985bff788164f7b407f8c6c8c638003c8c97 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Mon, 1 Dec 2025 19:17:39 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.8][i18n]=20OCH\common\biz=20=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/login/model/LoginModel.kt | 4 +- .../biz/login/ui/LoginPassengerFragment.kt | 10 +++- .../biz/login/ui/errorview/ErrorInfoView.kt | 4 +- .../java/com/mogo/och/biz/qrcode/QrParse.kt | 24 +++++--- .../java/com/mogo/och/biz/qrcode/Radix91.kt | 6 +- .../com/mogo/och/biz/qrcode/ScannerManager.kt | 41 +++++++++---- .../ui/errorpoint/ReportErrorPointView.kt | 7 ++- .../errorpoint/ReportErrorPointViewModel.kt | 10 +++- .../ui/routingselect/RoutingItemAdapter.kt | 13 ++-- .../ui/routingselect/RoutingSelectModel.kt | 13 ++-- .../ui/runing/other/TaskRunningModel.kt | 8 ++- .../ui/runing/other/TaskRunningView.kt | 15 +++-- .../ui/runing/taxi/TaxiRunningModel.kt | 8 ++- .../routing/ui/runing/taxi/TaxiRunningView.kt | 13 ++-- .../biz/routing/ui/utils/TimeDistanceUtils.kt | 24 +++++--- .../res/layout/biz_fragment_video_player.xml | 3 +- .../res/routing/layout/biz_other_running.xml | 3 +- .../layout/biz_taxi_no_data_common_view.xml | 3 +- .../biz_taxi_report_error_point_panel.xml | 9 ++- .../res/routing/layout/biz_taxi_running.xml | 9 ++- .../res/routing/layout/biz_taxi_select.xml | 6 +- .../routing/layout/biz_taxi_select_item.xml | 7 ++- .../mogo/och/unmanned/taxi/utils/TaskUtils.kt | 24 +++++--- .../src/main/res/values/string.xml | 60 +++++++++++++++++++ 24 files changed, 242 insertions(+), 82 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt index 58d2461994..c70e22bc38 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.biz.R import com.mogo.och.biz.login.LoginServiceManager import com.mogo.och.biz.login.bean.DriverStatusQueryRespBean @@ -209,7 +210,8 @@ object LoginModel { } else { ToastCharterUtils.showToastShort(mContext!!.getString(R.string.request_error_tip)) } - LoginStatusManager.setLoginError(-10012, "网络错误") +// LoginStatusManager.setLoginError(-10012, "网络错误") + LoginStatusManager.setLoginError(-10012, StringUtils.getString(R.string.module_och_network_mistake)) // 依赖参数 subscribe = Observable.timer(5, TimeUnit.SECONDS) .subscribe { _: Long? -> queryCarStatus(readCatche) } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt index 839ca92329..e253509319 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ScreenUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.biz.BuildConfig import com.mogo.och.biz.R @@ -124,9 +125,11 @@ class LoginPassengerFragment : MvpFragment { - "单站票" +// "单站票" + StringUtils.getString(R.string.module_och_single_ticket) } "1" -> { - "多站票" +// "多站票" + StringUtils.getString(R.string.module_och_more_ticket) } "2" -> { - "全站票" +// "全站票" + StringUtils.getString(R.string.module_och_all_ticket) } "3" -> { - "通勤票" +// "通勤票" + StringUtils.getString(R.string.module_och_commuting_ticket) } else -> { URLDecoder.decode(ticketNameCode?:"","UTF-8") @@ -123,16 +127,20 @@ object QrParse { val ticketNameCode = split[13] ticketName =when (ticketNameCode) { "0" -> { - "单站票" +// "单站票" + StringUtils.getString(R.string.module_och_single_ticket) } "1" -> { - "多站票" +// "多站票" + StringUtils.getString(R.string.module_och_more_ticket) } "2" -> { - "全站票" +// "全站票" + StringUtils.getString(R.string.module_och_all_ticket) } "3" -> { - "通勤票" +// "通勤票" + StringUtils.getString(R.string.module_och_commuting_ticket) } else -> { URLDecoder.decode(ticketNameCode?:"","UTF-8") diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/Radix91.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/Radix91.kt index d811c473ef..d7b9cfd732 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/Radix91.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/Radix91.kt @@ -1,5 +1,8 @@ package com.mogo.och.biz.qrcode +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R + fun main() { val value10 = "337197925358633123".toLong() @@ -47,7 +50,8 @@ object Radix91 { for (char in base92Number.reversed()) { val index = base32Chars.indexOf(char) if (index == -1) { - throw IllegalArgumentException("无效的92进制字符: $char") +// throw IllegalArgumentException("无效的92进制字符: $char") + throw IllegalArgumentException("${StringUtils.getString(R.string.module_och_invalid_char)}$char") } base10Number += index * power power *= 91 diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/ScannerManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/ScannerManager.kt index 33db3c28ca..3e94c4f685 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/ScannerManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/ScannerManager.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R import com.mogo.och.common.module.biz.lansocket.IOchLanPassengerStatusListener import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.biz.scanner.BindStatus @@ -83,26 +84,34 @@ class ScannerManager : ScannerService { message: String? ) { super.onDeviceState(path, deviceType, isOpen, message) - var deviceTypeString = "未知" +// var deviceTypeString = "未知" + var deviceTypeString = StringUtils.getString(R.string.module_core_unknown) if (deviceType == DeviceType.VERIFICATION_SK87R) { deviceTypeString = "(SK87R)" } else if (deviceType == DeviceType.VERIFICATION_Q350) { deviceTypeString = "(Q350)" } val msg = - "地址：${path} 设备类型：${deviceTypeString} 是否打开：${isOpen} 消息：${message}" +// "地址：${path} 设备类型：${deviceTypeString} 是否打开：${isOpen} 消息：${message}" + "${StringUtils.getString(R.string.module_och_address)}${path} ${StringUtils.getString(R.string.module_och_device_type)}${deviceTypeString} ${ + StringUtils.getString( + R.string.module_och_is_open + ) + }${isOpen} ${StringUtils.getString(R.string.module_och_msg)}${message}" CallerLogger.d(M_BUS_P + TAG, msg) OchChainLogManager.writeChainLogScanner( TAG + "onSerialPortState", "扫码枪是否打开:${msg}" ) openStatus = if (isOpen) { - sendWriteOffDevicesMessage2Driver(true, "扫码枪打开成功") +// sendWriteOffDevicesMessage2Driver(true, "扫码枪打开成功") + sendWriteOffDevicesMessage2Driver(true, StringUtils.getString(R.string.module_och_device_verification_open_success)) OpenStatus.Open } else { sendWriteOffDevicesMessage2Driver( false, - "扫码枪打开错误:${msg}_${path}_${deviceTypeString}" +// "扫码枪打开错误:${msg}_${path}_${deviceTypeString}" + "${StringUtils.getString(R.string.module_och_device_verification_open_fail)}${msg}" ) OpenStatus.Unopen } @@ -121,10 +130,12 @@ class ScannerManager : ScannerService { parseParams(it.payload) } else { CallerLogger.d(M_BUS_P + TAG, "数据错误") - sendWriteOffMessage2Driver("扫码数据为空") +// sendWriteOffMessage2Driver("扫码数据为空") + sendWriteOffMessage2Driver(StringUtils.getString(R.string.module_och_device_verification_data_null)) } } else { - sendWriteOffMessage2Driver("解包失败:${data.unpackStatus}") +// sendWriteOffMessage2Driver("解包失败:${data.unpackStatus}") + sendWriteOffMessage2Driver("${StringUtils.getString(R.string.module_och_device_verification_data_error)}${data.unpackStatus}") CallerLogger.d(M_BUS_P + TAG, "解包失败:${data.unpackStatus}") } } @@ -238,7 +249,8 @@ class ScannerManager : ScannerService { } } } else { - sendWriteOffMessage2Driver("扫码参数数据为空:${payload}") +// sendWriteOffMessage2Driver("扫码参数数据为空:${payload}") + sendWriteOffMessage2Driver("${StringUtils.getString(R.string.module_och_device_verification_param_error)}${payload}") } } @@ -266,10 +278,12 @@ class ScannerManager : ScannerService { */ private fun sendScannerState() { if (bindStatus == BindStatus.BIND_SUCCEED && openStatus == OpenStatus.Open) { - sendWriteOffDevicesMessage2Driver(true, "扫码枪打开状态") +// sendWriteOffDevicesMessage2Driver(true, "扫码枪打开状态") + sendWriteOffDevicesMessage2Driver(true, StringUtils.getString(R.string.module_och_device_verification_open_state)) } else { if (bindStatus == BindStatus.BIND_SUCCEED && openStatus == OpenStatus.Unopen) { - sendWriteOffDevicesMessage2Driver(false, "绑定成功、打开失败") +// sendWriteOffDevicesMessage2Driver(false, "绑定成功、打开失败") + sendWriteOffDevicesMessage2Driver(false, StringUtils.getString(R.string.module_och_device_verification_bind_succeed_open_fail)) } else { dispatchMsg(bindStatus) } @@ -280,17 +294,20 @@ class ScannerManager : ScannerService { when (newV) { BindStatus.BIND_FAILURE_UNINSTALLED -> { // 硬件服务绑定失败：未安装“硬件服务”APP - sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：未安装“硬件服务”APP") +// sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：未安装“硬件服务”APP") + sendWriteOffDevicesMessage2Driver(false, StringUtils.getString(R.string.module_och_device_verification_bind_failure_uninstalled)) } BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> { // 硬件服务绑定失败：没有绑定权限或找不到服务（如果是此状态，基本上安装后就可以找到，主要就是权限问题） - sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：没有绑定权限或找不到服务") +// sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：没有绑定权限或找不到服务") + sendWriteOffDevicesMessage2Driver(false, StringUtils.getString(R.string.module_och_device_verification_bind_failure_no_permission_not_found)) } BindStatus.EXCEPTION -> { // 硬件服务绑定失败：服务被异常销毁 - sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：服务被异常销毁") +// sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败：服务被异常销毁") + sendWriteOffDevicesMessage2Driver(false, StringUtils.getString(R.string.module_och_device_verification_bind_failure_exception)) } BindStatus.NOTHING -> {} diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointView.kt index ada9099225..f7bdcfc5ba 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointView.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.GridLayoutManager import com.mogo.eagle.core.utilcode.kotlin.onClick 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.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R @@ -141,7 +142,8 @@ class ReportErrorPointView : WindowRelativeLayout, lvs_loding.visibility = GONE CommonFeedbackDialog .Builder() - .title("请重试") +// .title("请重试") + .title(StringUtils.getString(R.string.module_och_retry)) .status(CommonFeedbackDialog.Status.success) .build(context).show() } @@ -152,7 +154,8 @@ class ReportErrorPointView : WindowRelativeLayout, closeCallback?.close() CommonFeedbackDialog .Builder() - .title("打点成功") +// .title("打点成功") + .title(StringUtils.getString(R.string.module_och_report_point_success)) .status(CommonFeedbackDialog.Status.success) .build(context).show() } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt index 05b8ace6e7..cd669add72 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.PointError @@ -47,7 +48,8 @@ class ReportErrorPointViewModel : ViewModel() { override fun onError() { super.onError() - viewCallback?.hideLoadingWithMessage("网络错误、请稍后再试") +// viewCallback?.hideLoadingWithMessage("网络错误、请稍后再试") + viewCallback?.hideLoadingWithMessage(StringUtils.getString(R.string.module_och_network_error1)) } } ) @@ -62,7 +64,8 @@ class ReportErrorPointViewModel : ViewModel() { fun submitErrorPointReasons(checkDataList: MutableList, occurrenceTime: Long) { CallerLogger.d(TAG,checkDataList,grayId) if (grayId == null || grayId!! < 0L) { - viewCallback?.hideLoadingWithMessage("未找到规划Id") +// viewCallback?.hideLoadingWithMessage("未找到规划Id") + viewCallback?.hideLoadingWithMessage(StringUtils.getString(R.string.module_och_not_find_gray_id)) return } grayId?.let { @@ -102,7 +105,8 @@ class ReportErrorPointViewModel : ViewModel() { override fun onError() { super.onError() - viewCallback?.hideLoadingWithMessage("网络错误、请稍后再试") +// viewCallback?.hideLoadingWithMessage("网络错误、请稍后再试") + viewCallback?.hideLoadingWithMessage(StringUtils.getString(R.string.module_och_network_error1)) } } ) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingItemAdapter.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingItemAdapter.kt index ec90804f66..f58bb2367e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingItemAdapter.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingItemAdapter.kt @@ -11,6 +11,7 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil.Callback import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.GrayLineBean import com.mogo.och.biz.routing.bean.SitesInfo @@ -63,7 +64,8 @@ class RoutingItemAdapter( AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) holder.routingId.text = "${routing.lineId}" holder.routingName.text = routing.lineName - holder.todayVerifyNum.text = "今日验证：${routing.carVerificationCount}次" +// holder.todayVerifyNum.text = "今日验证：${routing.carVerificationCount}次" + holder.todayVerifyNum.text = "${StringUtils.getString(R.string.module_och_today_check)}${routing.carVerificationCount}${StringUtils.getString(R.string.module_och_times)}" val startName = routing.startSite?.siteName ?: "" val endName = routing.endSite?.siteName ?: "" if(routing.allStation.isNullOrEmpty()||routing.allStation?.size==2){ @@ -71,7 +73,8 @@ class RoutingItemAdapter( }else{ routing.allStation?.let { val middleStationSize = it.size-2 - val spannableString = SpannableString("${startName} - ${middleStationSize}站 - ${endName}") +// val spannableString = SpannableString("${startName} - ${middleStationSize}站 - ${endName}") + val spannableString = SpannableString("${startName} - ${middleStationSize}${StringUtils.getString(R.string.module_och_station1)} - ${endName}") // 设置不同颜色范围 spannableString.setSpan( ForegroundColorSpan(allCOlor), @@ -94,8 +97,10 @@ class RoutingItemAdapter( } } - holder.historyVerifyNumEnableNum.text = "${routing.lineSuccessCount}可用" - holder.historyVerifyNumDisenableNum.text = "${routing.lineFailCount}不可用" +// holder.historyVerifyNumEnableNum.text = "${routing.lineSuccessCount}可用" + holder.historyVerifyNumEnableNum.text = "${routing.lineSuccessCount}${StringUtils.getString(R.string.module_och_usable)}" +// holder.historyVerifyNumDisenableNum.text = "${routing.lineFailCount}不可用" + holder.historyVerifyNumDisenableNum.text = "${routing.lineFailCount}${StringUtils.getString(R.string.module_och_unusable)}" //设置item点击事件 holder.routingStart.setOnClickListener { mItemClickListener?.onItemClick(routing) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt index 47ffd93a34..351cd596d3 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.GrayLineBean @@ -119,9 +120,11 @@ class RoutingSelectModel : ViewModel() { super.onError() var hintStr = "" if (!NetworkUtils.isConnected(content)) { - hintStr = "网络出现异常,请稍后重试" +// hintStr = "网络出现异常,请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_network_error2) } else { - hintStr = "查询灰度线路列表异常, 请稍后重试" +// hintStr = "查询灰度线路列表异常, 请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_gray_task_find_line_error) } CallerLogger.d( TAG, @@ -171,9 +174,11 @@ class RoutingSelectModel : ViewModel() { super.onError() var hintStr = "" if (!NetworkUtils.isConnected(content)) { - hintStr = "网络出现异常,请稍后重试" +// hintStr = "网络出现异常,请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_network_error2) } else { - hintStr = "开始任务并查询轨迹详情异常, 请稍后重试" +// hintStr = "开始任务并查询轨迹详情异常, 请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_gray_task_find_track_error) } CallerLogger.d( TAG, diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningModel.kt index 384ad6b122..839dd7c338 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningModel.kt @@ -12,6 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.ContrailBean import com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq import com.mogo.och.biz.routing.bean.EndGrayTaskFeedbackType @@ -244,9 +246,11 @@ class TaskRunningModel : ViewModel() { super.onError() var hintStr = "" if (!NetworkUtils.isConnected(content)) { - hintStr = "网络出现异常,请稍后重试" +// hintStr = "网络出现异常,请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_network_error2) } else { - hintStr = "上报结束任务异常, 请稍后重试" +// hintStr = "上报结束任务异常, 请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_gray_task_upload_finish_error) } CallerLogger.d( TAG, diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt index 0249e9acc6..e3fa6fb554 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt @@ -150,12 +150,16 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac CallerLogger.d(TAG, "closeRouting is null!") closeRouting = CommonDialogStatus .Builder() - .title("路线验证结束") - .tips("请点击按钮反馈验证结果") +// .title("路线验证结束") + .title(StringUtils.getString(R.string.module_och_route_verification_completed)) +// .tips("请点击按钮反馈验证结果") + .tips(StringUtils.getString(R.string.module_och_please_click_button_to_feedback_verification_result)) .showClose(true) .cancelTextColor(R.color.biz_routing_FF4E41) - .cancelStr("线路不可用") - .confirmStr("线路可用") +// .cancelStr("线路不可用") + .cancelStr(StringUtils.getString(R.string.module_och_route_unavailable)) +// .confirmStr("线路可用") + .confirmStr(StringUtils.getString(R.string.module_och_route_available)) .status(CommonDialogStatus.Status.success) .build(context) }else{ @@ -198,7 +202,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac fun setData(data: StartGrayAndQueryContrailRsp) { viewModel?.setNewData(data) bus_task_running_line_name.setText(data.grayLineBean.lineName) - actv_running_task_last_station.text = "往${data.stationList.last().name ?: ""}" +// actv_running_task_last_station.text = "往${data.stationList.last().name ?: ""}" + actv_running_task_last_station.text = "${StringUtils.getString(R.string.module_och_go)}${data.stationList.last().name ?: ""}" mAdapter.setDataList(data.stationList) // aciv_task_leave_station_slide_bg.setTextValue("滑动出发") aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving)) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt index a39b9a672a..322cf4e748 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt @@ -9,6 +9,8 @@ import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchMana import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.biz.R import com.mogo.och.biz.routing.bean.ContrailBean import com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq import com.mogo.och.biz.routing.bean.EndGrayTaskFeedbackType @@ -144,9 +146,11 @@ class TaxiRunningModel : ViewModel(), IDistanceListener { super.onError() var hintStr = "" if (!NetworkUtils.isConnected(content)) { - hintStr = "网络出现异常,请稍后重试" +// hintStr = "网络出现异常,请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_network_error2) } else { - hintStr = "上报结束任务异常, 请稍后重试" +// hintStr = "上报结束任务异常, 请稍后重试" + hintStr = StringUtils.getString(R.string.module_och_gray_task_upload_finish_error) } CallerLogger.d( TAG, diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt index 9547bdf436..3a2ac17cd8 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt @@ -11,6 +11,7 @@ import com.amap.api.navi.model.NaviLatLng import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler @@ -94,12 +95,16 @@ class TaxiRunningView: ConstraintLayout, TaxiRunningModel.RoutingRuningCallback, CallerLogger.d(TAG, "closeRouting is null!") closeRouting = CommonDialogStatus .Builder() - .title("路线验证结束") - .tips("请点击按钮反馈验证结果") +// .title("路线验证结束") + .title(StringUtils.getString(R.string.module_och_route_verification_completed)) +// .tips("请点击按钮反馈验证结果") + .tips(StringUtils.getString(R.string.module_och_please_click_button_to_feedback_verification_result)) .showClose(true) .cancelTextColor(R.color.biz_routing_FF4E41) - .cancelStr("线路不可用") - .confirmStr("线路可用") +// .cancelStr("线路不可用") + .cancelStr(StringUtils.getString(R.string.module_och_route_unavailable)) +// .confirmStr("线路可用") + .confirmStr(StringUtils.getString(R.string.module_och_route_available)) .status(CommonDialogStatus.Status.success) .build(topActivity) }else{ diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt index 30c655b8fd..e0724b6a74 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt @@ -33,7 +33,8 @@ object TimeDistanceUtils { fun getCurrentTaskTime(timeInSecond: Long):String{ val min = ceil(timeInSecond.toDouble() / 60f).toInt() - return "${min}分钟" +// return "${min}分钟" + return "${min}${StringUtils.getString(R.string.module_och_minute)}" } /** @@ -56,15 +57,18 @@ object TimeDistanceUtils { } val min = ceil(timeInSecond.toDouble() / 60f).toInt() val strHtml = - ("里程 " +// ("里程 " + ("${StringUtils.getString(R.string.module_och_mileage)} " + "" + dis + "" + " " + disUnit + "" - + "，剩余 " +// + "，剩余 " + + "${StringUtils.getString(R.string.module_och_remaining)} " + "" + min + "" - + " 分钟") +// + " 分钟") + + " ${StringUtils.getString(R.string.module_och_minute)}") return HtmlCompat.fromHtml(strHtml, HtmlCompat.FROM_HTML_MODE_LEGACY) } @@ -78,13 +82,15 @@ object TimeDistanceUtils { DateTimeUtil.yyyy_MM_dd ) ) { - ("免费等待至 " +// ("免费等待至 " + ("${StringUtils.getString(R.string.module_och_free_wait_until)} " + "" + DateTimeUtil.formatCalendarToString( currentCale, DateTimeUtil.HH_mm ) + "") } else { - ("免费等待至" +// ("免费等待至" + ("${StringUtils.getString(R.string.module_och_free_wait_until)}" + "" + DateTimeUtil.formatCalendarToString( currentCale, DateTimeUtil.MM_dd_HH_mm @@ -104,7 +110,8 @@ object TimeDistanceUtils { return HtmlCompat.fromHtml( " " + phoneNum + "" + " | " + - "" + passengerSize + "人" + "", +// "" + passengerSize + "人" + "", + "" + passengerSize + StringUtils.getString(R.string.module_core_people) + "", HtmlCompat.FROM_HTML_MODE_LEGACY ) } @@ -113,7 +120,8 @@ object TimeDistanceUtils { return HtmlCompat.fromHtml( " " + phoneNum + "" + " | " + - "" + passengerSize + "人" + "", +// "" + passengerSize + "人" + "", + "" + passengerSize + StringUtils.getString(R.string.module_core_people) + "", HtmlCompat.FROM_HTML_MODE_LEGACY ) } diff --git a/OCH/common/biz/src/main/res/layout/biz_fragment_video_player.xml b/OCH/common/biz/src/main/res/layout/biz_fragment_video_player.xml index 65767305ae..c0596d17b4 100644 --- a/OCH/common/biz/src/main/res/layout/biz_fragment_video_player.xml +++ b/OCH/common/biz/src/main/res/layout/biz_fragment_video_player.xml @@ -8,9 +8,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> + + diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_no_data_common_view.xml b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_no_data_common_view.xml index 64a6ec9957..3a8b9d7f87 100644 --- a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_no_data_common_view.xml +++ b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_no_data_common_view.xml @@ -19,12 +19,13 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + @@ -97,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt index a5856eda1b..204984aa8d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt @@ -33,7 +33,8 @@ object TaskUtils { fun getCurrentTaskTime(timeInSecond: Long):String{ val min = ceil(timeInSecond.toDouble() / 60f).toInt() - return "${min}分钟" +// return "${min}分钟" + return "${min}${StringUtils.getString(R.string.module_och_minute)}" } /** @@ -56,15 +57,18 @@ object TaskUtils { } val min = ceil(timeInSecond.toDouble() / 60f).toInt() val strHtml = - ("里程 " +// ("里程 " + ("${StringUtils.getString(R.string.module_och_mileage)} " + "" + dis + "" + " " + disUnit + "" - + "，剩余 " +// + "，剩余 " + + "${StringUtils.getString(R.string.module_och_remaining)} " + "" + min + "" - + " 分钟") +// + " 分钟") + + " ${StringUtils.getString(R.string.module_och_minute)}") return HtmlCompat.fromHtml(strHtml, HtmlCompat.FROM_HTML_MODE_LEGACY) } @@ -78,13 +82,15 @@ object TaskUtils { DateTimeUtil.yyyy_MM_dd ) ) { - ("免费等待至 " +// ("免费等待至 " + ("${StringUtils.getString(R.string.module_och_free_wait_until)} " + "" + DateTimeUtil.formatCalendarToString( currentCale, DateTimeUtil.HH_mm ) + "") } else { - ("免费等待至" +// ("免费等待至" + ("${StringUtils.getString(R.string.module_och_free_wait_until)}" + "" + DateTimeUtil.formatCalendarToString( currentCale, DateTimeUtil.MM_dd_HH_mm @@ -104,7 +110,8 @@ object TaskUtils { return HtmlCompat.fromHtml( " " + phoneNum + "" + " | " + - "" + passengerSize + "人" + "", +// "" + passengerSize + "人" + "", + "" + passengerSize + StringUtils.getString(R.string.module_core_people) + "", HtmlCompat.FROM_HTML_MODE_LEGACY ) } @@ -113,7 +120,8 @@ object TaskUtils { return HtmlCompat.fromHtml( " " + phoneNum + "" + " | " + - "" + passengerSize + "人" + "", +// "" + passengerSize + "人" + "", + "" + passengerSize + StringUtils.getString(R.string.module_core_people) + "", HtmlCompat.FROM_HTML_MODE_LEGACY ) } diff --git a/core/mogo-core-res/src/main/res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml index b1073024b5..9e5ad66660 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -394,6 +394,65 @@ 声 音 音量 HH:mm MM月dd日 EEEE + 网络错误 + 连接成功 司机SN：%s + 连接司机屏中 + 当前状态：%s + 司机SN： + 单站票 + 多站票 + 全站票 + 通勤票 + 无效的92进制字符: + 地址： + 设备类型： + 是否打开： + 消息： + 扫码枪打开错误： + 扫码枪打开成功 + 扫码数据为空 + 解包失败： + 扫码参数数据为空： + 扫码枪打开状态 + 绑定成功、打开失败 + 硬件服务绑定失败：未安装“硬件服务”APP + 硬件服务绑定失败：没有绑定权限或找不到服务 + 硬件服务绑定失败：服务被异常销毁 + 请重试 + 打点成功 + 网络错误、请稍后再试 + 未找到规划Id + 今日验证： + 次 + 站 + 可用 + 不可用 + 网络出现异常,请稍后重试 + 开始任务并查询轨迹详情异常, 请稍后重试 + 查询灰度线路列表异常, 请稍后重试 + 上报结束任务异常, 请稍后重试 + 路线验证结束 + 请点击按钮反馈验证结果 + 线路不可用 + 线路可用 + 里程 + ，剩余 + 免费等待至 + 添加视频 + 问题打点 + 暂无任务 + 线路问题打点 + 打点 + 当前行程 + 结束服务 + 算路验证路线 + 输入ID快速检索 + 累计： + 开始 + + + + @@ -482,6 +541,7 @@ 时间： + 时间