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

[8.2.8][i18n] 接驳乘客屏 中文抽取

Browse Source
This commit is contained in:
xinfengkun
2025-11-13 17:36:00 +08:00
parent 8f6e8de77e
commit 45f9af9e3d
18 changed files with 162 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/QrParse.kt
View File

@@ -5,6 +5,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.RegexUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.biz.R
import com.mogo.och.common.module.biz.scanner.QrBean
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
@@ -221,7 +223,8 @@ object QrParse {
e.printStackTrace()
CallerLogger.d(M_OCHCOMMON + TAG, "")
// 通知司机屏二维码错误
val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码")
// val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = "出示错误二维码")
val writeOffDetail = WriteOffDetialMsg(code = 3001, msg = StringUtils.getString(R.string.module_och_qr_code_error))
OchChainLogManager.writeChainLogWriteOff("核销失败", "二维码错误+参数错误")
CallerLogger.d(
M_OCHCOMMON + TAG,

20
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/utils/TimeDistanceUtils.kt
View File

@@ -3,6 +3,8 @@ package com.mogo.och.biz.routing.ui.utils
import android.text.Spanned
import androidx.core.text.HtmlCompat
import com.mogo.eagle.core.utilcode.util.DateTimeUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.biz.R
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.NumberFormatUtil
import java.util.Calendar
@@ -13,13 +15,16 @@ object TimeDistanceUtils {
fun getCurrentTaskDistance(meters: Long):String{
var dis = "0"
var disUnit = "公里"
// var disUnit = "公里"
var disUnit = StringUtils.getString(R.string.module_och_km)
if (meters > 0) {
if (meters / 1000 < 1) {
disUnit = "米"
// disUnit = "米"
disUnit = StringUtils.getString(R.string.module_och_m)
dis = meters.toFloat().roundToInt().toString()
} else {
disUnit = "公里"
// disUnit = "公里"
disUnit = StringUtils.getString(R.string.module_och_km)
dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000)
}
}
@@ -36,13 +41,16 @@ object TimeDistanceUtils {
*/
fun getCurrentTaskTripHtml(meters: Long, timeInSecond: Long): Spanned {
var dis = "0"
var disUnit = "公里"
// var disUnit = "公里"
var disUnit = StringUtils.getString(R.string.module_och_km)
if (meters > 0) {
if (meters / 1000 < 1) {
disUnit = "米"
// disUnit = "米"
disUnit = StringUtils.getString(R.string.module_och_m)
dis = meters.toFloat().roundToInt().toString()
} else {
disUnit = "公里"
// disUnit = "公里"
disUnit = StringUtils.getString(R.string.module_och_km)
dis = NumberFormatUtil.formatLong(meters.toDouble() / 1000)
}
}