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

[8.2.8][i18n] OCH\common\biz 中文抽取

Browse Source
This commit is contained in:
xinfengkun
2025-12-01 19:17:39 +08:00
parent 05853de545
commit 434d985bff
24 changed files with 242 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt
View File

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

10
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
View File

@@ -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<LoginPassengerFragment?, LoginPasseng
super.onResume()
CallerLogger.d(TAG, "onResume")
if (CallerTelematicManager.getClientConnStatus()) {
updateStatus("连接成功 司机SN:${LoginLanPassengerSocket.driverSn}")
// updateStatus("连接成功 司机SN:${LoginLanPassengerSocket.driverSn}")
updateStatus(StringUtils.getString(R.string.module_och_connected_driver_sn, LoginLanPassengerSocket.driverSn))
}else{
updateStatus("连接司机屏中")
// updateStatus("连接司机屏中")
updateStatus(StringUtils.getString(R.string.module_och_connecting_driver))
}
}
@@ -139,7 +142,8 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
if (statusList.isNotEmpty()) {
val removeFirst = statusList.removeFirst()
UiThreadHandler.post({
actv_connect_status?.text = "当前状态:${removeFirst}"
// actv_connect_status?.text = "当前状态:${removeFirst}"
actv_connect_status?.text = StringUtils.getString(R.string.module_och_current_state, removeFirst)
}, UiThreadHandler.MODE.QUEUE)
}

4
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt
View File

@@ -10,6 +10,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.biz.R
import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket
import com.mogo.och.common.module.utils.FlavorUtils
@@ -115,7 +116,8 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
actv_error_body?.text = FlavorUtils.getInfo()
}else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
// actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
actv_error_body?.text = "${FlavorUtils.getInfo()} ${StringUtils.getString(R.string.module_och_driver_sn)}${LoginLanPassengerSocket.driverSn}"
}
}

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

@@ -100,16 +100,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")
@@ -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")

6
OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/Radix91.kt
View File

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

41
OCH/common/biz/src/main/java/com/mogo/och/biz/qrcode/ScannerManager.kt
View File

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

7
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointView.kt
View File

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

10
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt
View File

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

13
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingItemAdapter.kt
View File

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

13
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt
View File

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

8
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningModel.kt
View File

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

15
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/other/TaskRunningView.kt
View File

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

8
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningModel.kt
View File

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

13
OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt
View File

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

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

@@ -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 =
("<font color=\"#CAD6FF\">里程 </font>"
// ("<font color=\"#CAD6FF\">里程 </font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_mileage)} </font>"
+ "<b><font color=\"#FFFFFF\">"
+ dis + "</font></b>"
+ "<font color=\"#CAD6FF\"> "
+ disUnit + "</font>"
+ "<font color=\"#CAD6FF\">，剩余 </font>"
// + "<font color=\"#CAD6FF\">，剩余 </font>"
+ "<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_remaining)} </font>"
+ "<b><font color=\"#FFFFFF\">"
+ min + "</font></b>"
+ "<font color=\"#CAD6FF\"> 分钟</font>")
// + "<font color=\"#CAD6FF\"> 分钟</font>")
+ "<font color=\"#CAD6FF\"> ${StringUtils.getString(R.string.module_och_minute)}</font>")
return HtmlCompat.fromHtml(strHtml, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
@@ -78,13 +82,15 @@ object TimeDistanceUtils {
DateTimeUtil.yyyy_MM_dd
)
) {
("<font color=\"#CAD6FF\">免费等待至 </font>"
// ("<font color=\"#CAD6FF\">免费等待至 </font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_free_wait_until)} </font>"
+ "<b><font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(
currentCale,
DateTimeUtil.HH_mm
) + "</big></b></font>")
} else {
("<font color=\"#CAD6FF\">免费等待至</font>"
// ("<font color=\"#CAD6FF\">免费等待至</font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_free_wait_until)}</font>"
+ "<font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(
currentCale,
DateTimeUtil.MM_dd_HH_mm
@@ -104,7 +110,8 @@ object TimeDistanceUtils {
return HtmlCompat.fromHtml(
"<font color=\"#FFFFFF\"> " + phoneNum + "</font>" +
"<font color=\"#6473B2\"> | </font>" +
"<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
// "<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
"<font color=\"#FFFFFF\">" + passengerSize + StringUtils.getString(R.string.module_core_people) + "</font>",
HtmlCompat.FROM_HTML_MODE_LEGACY
)
}
@@ -113,7 +120,8 @@ object TimeDistanceUtils {
return HtmlCompat.fromHtml(
"<font color=\"#FFFFFF\"> " + phoneNum + "</font>" +
"<font color=\"#6473B2\"> | </font>" +
"<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
// "<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
"<font color=\"#FFFFFF\">" + passengerSize + StringUtils.getString(R.string.module_core_people) + "</font>",
HtmlCompat.FROM_HTML_MODE_LEGACY
)
}

3
OCH/common/biz/src/main/res/layout/biz_fragment_video_player.xml
View File

@@ -8,9 +8,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<!-- android:text="添加视频"-->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/acb_add_site_video"
android:text="添加视频"
android:text="@string/module_och_add_video"
android:gravity="center"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"

3
OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml
View File

@@ -43,13 +43,14 @@
android:layout_marginTop="@dimen/dp_2"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_100">
<!-- android:text="问题打点"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_submit_task"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_80"
app:pressed_enabled="false"
android:gravity="center"
android:text="问题打点"
android:text="@string/module_och_submit_task"
android:background="@drawable/biz_button_selector"
android:textColor="@color/white"
android:textSize="@dimen/dp_40" />

3
OCH/common/biz/src/main/res/routing/layout/biz_taxi_no_data_common_view.xml
View File

@@ -19,12 +19,13 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- android:text="暂无任务"-->
<TextView
android:id="@+id/noRoutingTaskDataTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
android:text="暂无任务"
android:text="@string/module_och_not_task"
android:textColor="#91A1EA"
android:textSize="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"

9
OCH/common/biz/src/main/res/routing/layout/biz_taxi_report_error_point_panel.xml
View File

@@ -8,12 +8,13 @@
android:background="@drawable/common_qr_dialog"
app:roundLayoutRadius="@dimen/dp_50">
<!-- android:text="线路问题打点"-->
<TextView
android:id="@+id/tv_report_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_33"
android:text="线路问题打点"
android:text="@string/module_och_report_title"
android:textColor="@color/white"
android:textSize="@dimen/sp_45"
android:textStyle="bold"
@@ -23,12 +24,13 @@
android:layout_marginTop="@dimen/dp_51"
/>
<!-- android:text="时间"-->
<TextView
android:id="@+id/tv_work_order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_67"
android:text="时间"
android:text="@string/module_core_time1"
android:textColor="@color/white"
android:textSize="@dimen/sp_30"
app:layout_constraintTop_toTopOf="@+id/tv_report_title"
@@ -47,13 +49,14 @@
app:layout_constraintBottom_toTopOf="@+id/tv_report_error_point_reason"
app:layout_constraintTop_toBottomOf="@+id/tv_report_title" />
<!-- android:text="打点"-->
<TextView
android:id="@+id/tv_report_error_point_reason"
android:layout_width="@dimen/dp_356"
android:layout_height="@dimen/dp_120"
android:background="@drawable/common_button_cancle"
android:gravity="center"
android:text="打点"
android:text="@string/module_och_report_error_point_reason"
android:textColor="@color/biz_routing_2eacff"
android:textSize="@dimen/sp_40"
android:textStyle="bold"

9
OCH/common/biz/src/main/res/routing/layout/biz_taxi_running.xml
View File

@@ -8,11 +8,12 @@
tools:background="@drawable/biz_shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
<!-- android:text="当前行程"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_routing_page_title"
android:textSize="@dimen/dp_44"
android:textColor="@color/white"
android:text="当前行程"
android:text="@string/module_och_routing_page_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="@dimen/dp_38"
@@ -120,13 +121,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!-- android:text="问题打点"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_submit_task"
android:layout_width="@dimen/dp_356"
android:layout_height="@dimen/dp_120"
app:pressed_enabled="false"
android:gravity="center"
android:text="问题打点"
android:text="@string/module_och_submit_task"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_54"
@@ -135,13 +137,14 @@
android:textColor="@color/biz_taxi_submit_text_color_selector"
android:textSize="@dimen/dp_40" />
<!-- android:text="结束服务"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_end_routing"
android:layout_width="@dimen/dp_356"
android:layout_height="@dimen/dp_120"
app:pressed_enabled="false"
android:gravity="center"
android:text="结束服务"
android:text="@string/module_och_end_routing"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_54"

6
OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml
View File

@@ -8,11 +8,12 @@
tools:background="@drawable/biz_shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
<!-- android:text="算路验证路线"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_routing_title"
android:textSize="@dimen/dp_45"
android:textColor="@color/white"
android:text="算路验证路线"
android:text="@string/module_och_routing_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_54"
@@ -59,6 +60,7 @@
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- android:hint="输入ID快速检索"-->
<androidx.appcompat.widget.AppCompatCheckedTextView
android:id="@+id/acctv_search_byid"
android:layout_marginStart="@dimen/dp_54"
@@ -66,7 +68,7 @@
android:gravity="center_vertical"
android:text=""
android:textColor="@color/common_ffffffff"
android:hint="输入ID快速检索"
android:hint="@string/module_och_search_byid"
android:textColorHint="@color/biz_routing_999999"
android:textSize="@dimen/dp_36"
android:paddingStart="@dimen/dp_35"

7
OCH/common/biz/src/main/res/routing/layout/biz_taxi_select_item.xml
View File

@@ -60,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!-- android:text="累计:"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_history_verify_num_title"
app:layout_constraintTop_toBottomOf="@+id/actv_routing_end_name"
@@ -69,7 +70,7 @@
android:layout_marginTop="@dimen/dp_20"
android:textColor="@color/white"
android:textSize="@dimen/dp_30"
android:text="累计:"
android:text="@string/module_och_history_verify_num_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -97,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!-- android:text="开始"-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_routing_start"
app:layout_constraintEnd_toEndOf="parent"
@@ -106,7 +107,7 @@
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginBottom="@dimen/dp_32"
android:textSize="@dimen/dp_30"
android:text="开始"
android:text="@string/module_och_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

24
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaskUtils.kt
View File

@@ -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 =
("<font color=\"#CAD6FF\">里程 </font>"
// ("<font color=\"#CAD6FF\">里程 </font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_mileage)} </font>"
+ "<b><font color=\"#FFFFFF\">"
+ dis + "</font></b>"
+ "<font color=\"#CAD6FF\"> "
+ disUnit + "</font>"
+ "<font color=\"#CAD6FF\">，剩余 </font>"
// + "<font color=\"#CAD6FF\">，剩余 </font>"
+ "<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_remaining)} </font>"
+ "<b><font color=\"#FFFFFF\">"
+ min + "</font></b>"
+ "<font color=\"#CAD6FF\"> 分钟</font>")
// + "<font color=\"#CAD6FF\"> 分钟</font>")
+ "<font color=\"#CAD6FF\"> ${StringUtils.getString(R.string.module_och_minute)}</font>")
return HtmlCompat.fromHtml(strHtml, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
@@ -78,13 +82,15 @@ object TaskUtils {
DateTimeUtil.yyyy_MM_dd
)
) {
("<font color=\"#CAD6FF\">免费等待至 </font>"
// ("<font color=\"#CAD6FF\">免费等待至 </font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_free_wait_until)} </font>"
+ "<b><font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(
currentCale,
DateTimeUtil.HH_mm
) + "</big></b></font>")
} else {
("<font color=\"#CAD6FF\">免费等待至</font>"
// ("<font color=\"#CAD6FF\">免费等待至</font>"
("<font color=\"#CAD6FF\">${StringUtils.getString(R.string.module_och_free_wait_until)}</font>"
+ "<font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(
currentCale,
DateTimeUtil.MM_dd_HH_mm
@@ -104,7 +110,8 @@ object TaskUtils {
return HtmlCompat.fromHtml(
"<font color=\"#FFFFFF\"> " + phoneNum + "</font>" +
"<font color=\"#6473B2\"> | </font>" +
"<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
// "<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
"<font color=\"#FFFFFF\">" + passengerSize + StringUtils.getString(R.string.module_core_people) + "</font>",
HtmlCompat.FROM_HTML_MODE_LEGACY
)
}
@@ -113,7 +120,8 @@ object TaskUtils {
return HtmlCompat.fromHtml(
"<font color=\"#FFFFFF\"> " + phoneNum + "</font>" +
"<font color=\"#6473B2\"> | </font>" +
"<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
// "<font color=\"#FFFFFF\">" + passengerSize + "人" + "</font>",
"<font color=\"#FFFFFF\">" + passengerSize + StringUtils.getString(R.string.module_core_people) + "</font>",
HtmlCompat.FROM_HTML_MODE_LEGACY
)
}

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

@@ -394,6 +394,65 @@
<string name="module_och_voice">声 音</string>
<string name="module_och_volume">音量</string>
<string name="module_och_format_hour">HH:mm MM月dd日 EEEE</string>
<string name="module_och_network_mistake">网络错误</string>
<string name="module_och_connected_driver_sn">连接成功 司机SN：%s</string>
<string name="module_och_connecting_driver">连接司机屏中</string>
<string name="module_och_current_state">当前状态：%s</string>
<string name="module_och_driver_sn">司机SN：</string>
<string name="module_och_single_ticket">单站票</string>
<string name="module_och_more_ticket">多站票</string>
<string name="module_och_all_ticket">全站票</string>
<string name="module_och_commuting_ticket">通勤票</string>
<string name="module_och_invalid_char">无效的92进制字符: </string>
<string name="module_och_address">地址：</string>
<string name="module_och_device_type">设备类型：</string>
<string name="module_och_is_open">是否打开：</string>
<string name="module_och_msg">消息：</string>
<string name="module_och_device_verification_open_fail">扫码枪打开错误：</string>
<string name="module_och_device_verification_open_success">扫码枪打开成功</string>
<string name="module_och_device_verification_data_null">扫码数据为空</string>
<string name="module_och_device_verification_data_error">解包失败：</string>
<string name="module_och_device_verification_param_error">扫码参数数据为空：</string>
<string name="module_och_device_verification_open_state">扫码枪打开状态</string>
<string name="module_och_device_verification_bind_succeed_open_fail">绑定成功、打开失败</string>
<string name="module_och_device_verification_bind_failure_uninstalled">硬件服务绑定失败：未安装“硬件服务”APP</string>
<string name="module_och_device_verification_bind_failure_no_permission_not_found">硬件服务绑定失败：没有绑定权限或找不到服务</string>
<string name="module_och_device_verification_bind_failure_exception">硬件服务绑定失败：服务被异常销毁</string>
<string name="module_och_retry">请重试</string>
<string name="module_och_report_point_success">打点成功</string>
<string name="module_och_network_error1">网络错误、请稍后再试</string>
<string name="module_och_not_find_gray_id">未找到规划Id</string>
<string name="module_och_today_check">今日验证：</string>
<string name="module_och_times">次</string>
<string name="module_och_station1">站</string>
<string name="module_och_usable">可用</string>
<string name="module_och_unusable">不可用</string>
<string name="module_och_network_error2">网络出现异常,请稍后重试</string>
<string name="module_och_gray_task_find_track_error">开始任务并查询轨迹详情异常, 请稍后重试</string>
<string name="module_och_gray_task_find_line_error">查询灰度线路列表异常, 请稍后重试</string>
<string name="module_och_gray_task_upload_finish_error">上报结束任务异常, 请稍后重试</string>
<string name="module_och_route_verification_completed">路线验证结束</string>
<string name="module_och_please_click_button_to_feedback_verification_result">请点击按钮反馈验证结果</string>
<string name="module_och_route_unavailable">线路不可用</string>
<string name="module_och_route_available">线路可用</string>
<string name="module_och_mileage">里程</string>
<string name="module_och_remaining">，剩余</string>
<string name="module_och_free_wait_until">免费等待至</string>
<string name="module_och_add_video">添加视频</string>
<string name="module_och_submit_task">问题打点</string>
<string name="module_och_not_task">暂无任务</string>
<string name="module_och_report_title">线路问题打点</string>
<string name="module_och_report_error_point_reason">打点</string>
<string name="module_och_routing_page_title">当前行程</string>
<string name="module_och_end_routing">结束服务</string>
<string name="module_och_routing_title">算路验证路线</string>
<string name="module_och_search_byid">输入ID快速检索</string>
<string name="module_och_history_verify_num_title">累计：</string>
<string name="module_och_start">开始</string>
@@ -482,6 +541,7 @@
<!-- <string name="module_core_trace_route_calc">寻迹算路</string>-->
<!-- <string name="module_core_cloud_socket">云Socket连接</string>-->
<string name="module_core_time">时间：</string>
<string name="module_core_time1">时间</string>
<!-- <string name="module_core_safety_officer">安全员</string>-->
<!-- <string name="module_core_qa_dev">QA、研发</string>-->
<!-- <string name="module_core_product">产品、运营、演示</string>-->