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 efed469940..0249e9acc6 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
@@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick
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.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.biz.R
import com.mogo.och.biz.routing.RoutingServiceManager
@@ -86,18 +87,21 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
if (TaskRunningModel.currentIndex == mAdapter.mData.size-2) {
LineManager.getStations { start, end ->
if (viewModel?.arrivedStation == true && start.isLeaving) {
- aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+// aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion))
aciv_task_leave_station_slide_bg.reset()
viewModel?.data?.taskId?.let {
showFeedbackDialog(it)
}
}else{
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
viewModel?.leaveStation()
}
}
} else {
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
viewModel?.leaveStation()
}
@@ -196,7 +200,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
bus_task_running_line_name.setText(data.grayLineBean.lineName)
actv_running_task_last_station.text = "往${data.stationList.last().name ?: ""}"
mAdapter.setDataList(data.stationList)
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
showLeaveStationView()
}
@@ -211,14 +216,17 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
if (TaskRunningModel.currentIndex == mAdapter.mData.size-2) {
LineManager.getStations { start, end ->
if(start.isLeaving){
- aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+// aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion))
}else{
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
}
}
} else {
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
}
}
@@ -245,7 +253,8 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
}
override fun showCompleteTask() {
- aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+// aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion))
}
override fun notifyItemChange(currentIndex: Int) {
@@ -254,9 +263,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
override fun clearData() {
bus_task_running_line_name.setText("--")
- actv_running_task_last_station.text = "往--"
+// actv_running_task_last_station.text = "往--"
+ actv_running_task_last_station.text = StringUtils.getString(R.string.module_och_go1)
mAdapter.setDataList(mutableListOf())
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_slide_moving))
showLeaveStationView()
}
}
diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml b/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml
index a91872fcb4..1c1a26697b 100644
--- a/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml
+++ b/OCH/common/biz/src/main/res/routing/layout/biz_other_running_item.xml
@@ -67,13 +67,13 @@
android:layout_marginStart="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_36"
app:layout_constraintEnd_toEndOf="parent"
- android:text="天安门天安门天安门…"
android:singleLine="true"
android:textColor="@color/white"
android:ellipsize="end"
android:textSize="@dimen/dp_45"
android:layout_width="0dp"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content"
+ tools:text="天安门天安门天安门…"/>
\ No newline at end of file
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
index 11c88bf774..3c60549e2a 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/TaskSiteDb.kt
@@ -2,10 +2,12 @@ package com.mogo.och.offline.repository.db.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.offline.repository.db.bean.LineDataBean
import com.mogo.och.data.db.exception.DbException
+import com.mogo.och.offline.R
import com.mogo.och.offline.repository.db.IDbRepository
import com.mogo.och.offline.repository.db.MyDataBase
import com.mogo.och.offline.repository.db.bean.TaskSiteDataBean
@@ -39,7 +41,8 @@ object TaskSiteDb : IDbRepository {
var startTime = System.currentTimeMillis()
val querySites = SiteDb.querySiteByLineId(linId)?.distinctBy { it.siteId }
if (querySites.isNullOrEmpty()) {
- throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+// throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+ throw DbException(DbException.NEEDSYNDATA, StringUtils.getString(R.string.module_och_no_station_data))
}
CallerLogger.d(TAG, "查询站点用时:${System.currentTimeMillis() - startTime}")
startTime = System.currentTimeMillis()
@@ -50,7 +53,8 @@ object TaskSiteDb : IDbRepository {
)
CallerLogger.d(TAG, "数据转换用时:${System.currentTimeMillis() - startTime}")
if (toTaskSiteDatas.size < 2) {
- throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试")
+// throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_incomplete))
}
// 把线路所有的站点搬迁到运行中表格中
startTime = System.currentTimeMillis()
@@ -123,7 +127,8 @@ object TaskSiteDb : IDbRepository {
// 获取线路的站点
val querySites = SiteDb.querySiteByLineId(lineInfo.lineId!!)?.distinctBy { it.siteId }
if (querySites.isNullOrEmpty()) {
- throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+// throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data))
}
// val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas(
// querySites,
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt
index 1f6f5783f1..5219592c94 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/taskrunning/TaskRunningView.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OFFLINE
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -118,9 +119,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
LineManager.getLineInfo { lineInfo ->
bus_task_running_line_name.text = lineInfo.lineName
}
- actv_running_task_time.text = "班次:${LineModel.getTaskTime()}"
+// actv_running_task_time.text = "班次:${LineModel.getTaskTime()}"
+ actv_running_task_time.text = "${StringUtils.getString(R.string.module_och_classes)}${LineModel.getTaskTime()}"
LineModel.stationList?.takeIf { it.size >= 2 }?.let {
- actv_running_task_last_station.text = "往${it.last().name ?: ""}"
+// actv_running_task_last_station.text = "往${it.last().name ?: ""}"
+ actv_running_task_last_station.text = "${StringUtils.getString(R.string.module_och_go)}${it.last().name ?: ""}"
mAdapter.setDataList(it)
CallerLogger.d(
TAG,
@@ -133,9 +136,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
showLeaveStationView()
}
if (LineModel.startStationIndex == it.size - 1) {
- aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+// aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion))
} else {
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// 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/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
index 30d2e4645f..e231537c68 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
@@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -132,10 +133,12 @@ object ShuttleVoiceManager {
fun writeOffCount(successNum:Int){
if(successNum<=1){
- VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3)
+// VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3)
+ VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful), AIAssist.LEVEL3)
//sendWriteOffNumToClient("核验通过")
}else{
- VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3)
+// VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3)
+ VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful1, successNum), AIAssist.LEVEL3)
//sendWriteOffNumToClient("$successNum 人核验通过")
}
}
diff --git a/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
index 5937445bff..343c5a8fb7 100644
--- a/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
@@ -50,12 +50,13 @@
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="@dimen/dp_22" />
+
+ android:layout_height="wrap_content"
+ tools:text="天安门天安门天安门…"/>
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
index bef73ee15a..86887ea2cf 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
@@ -50,7 +50,8 @@ object ThirdDeviceData {
end.isPlayTts = true
if (StringUtils.isEmpty(end.introduction)) {
if(!StringUtils.isEmpty(end.name)){
- val message = "前方到站:${end.name}，请下车的乘客做好准备"
+// val message = "前方到站:${end.name}，请下车的乘客做好准备"
+ val message = StringUtils.getString(R.string.module_och_next_station, end.name)
ShuttleVoiceManager.leave200Distance(message)
}
}else{
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
index fd4f60ebfd..ad458081ae 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
@@ -25,6 +26,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffResultMsg
import com.mogo.och.common.module.utils.OchPhoneUtil
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.WriteOffPassenger
import com.mogo.och.weaknet.repository.RepositoryManager
import com.mogo.och.weaknet.repository.exception.DataException
@@ -212,16 +214,26 @@ object TicketModel {
*/
private fun parseData(code:Int,msg:String,phone: String,orderNo: String){
when (code) {
- 1009 -> sendMessage2Driver("乘车日期非今日", phone,1009,orderNo)
- 1005 -> sendMessage2Driver("当前无路线任务", phone,1005,orderNo)
- 1006 -> sendMessage2Driver("车票非当前路线", phone,1006,orderNo)
- 1008 -> sendMessage2Driver("车票无剩余可用次数", phone,99,orderNo)
- 6001 -> sendMessage2Driver("二维码已过期", phone,6001,orderNo)
- 6002 -> sendMessage2Driver("同一订单核销间隔时间需大于2分钟", phone,6002,orderNo)
- 6003 -> sendMessage2Driver("车票非当前站点", phone,6003,orderNo)
- 6004 -> sendMessage2Driver("车辆未执行任务", phone,6004,orderNo)
- 6005 -> sendMessage2Driver("车票非当前班次", phone,6005,orderNo)
- 1012 -> sendMessage2Driver("车票与车辆所属租户不一致", phone,1012,orderNo)
+// 1009 -> sendMessage2Driver("乘车日期非今日", phone,1009,orderNo)
+ 1009 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_travel_date_not_today), phone,1009,orderNo)
+// 1005 -> sendMessage2Driver("当前无路线任务", phone,1005,orderNo)
+ 1005 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_there_are_no_route_tasks), phone,1005,orderNo)
+// 1006 -> sendMessage2Driver("车票非当前路线", phone,1006,orderNo)
+ 1006 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_current_route), phone,1006,orderNo)
+// 1008 -> sendMessage2Driver("车票无剩余可用次数", phone,99,orderNo)
+ 1008 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_has_no_remaining_valid_rides_available), phone,99,orderNo)
+// 6001 -> sendMessage2Driver("二维码已过期", phone,6001,orderNo)
+ 6001 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_qr_code_expired), phone,6001,orderNo)
+// 6002 -> sendMessage2Driver("同一订单核销间隔时间需大于2分钟", phone,6002,orderNo)
+ 6002 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_interval_canceling_same_order_too_short), phone,6002,orderNo)
+// 6003 -> sendMessage2Driver("车票非当前站点", phone,6003,orderNo)
+ 6003 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_valid_for_current_station), phone,6003,orderNo)
+// 6004 -> sendMessage2Driver("车辆未执行任务", phone,6004,orderNo)
+ 6004 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_vehicle_not_duty), phone,6004,orderNo)
+// 6005 -> sendMessage2Driver("车票非当前班次", phone,6005,orderNo)
+ 6005 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_not_for_current_train), phone,6005,orderNo)
+// 1012 -> sendMessage2Driver("车票与车辆所属租户不一致", phone,1012,orderNo)
+ 1012 -> sendMessage2Driver(StringUtils.getString(R.string.module_och_ticket_does_not_match_tenant_who_owns_vehicle), phone,1012,orderNo)
else -> {
try {
val tempcode=msg.toInt()
@@ -242,14 +254,16 @@ object TicketModel {
private fun sendMessage2Driver(message:String,phone:String,code:Int,orderNo: String){
// 发送乘客屏 通过蓝牙告知小程序
LanSocketManager.sendMsgToClient(WriteOffResultMsg(code, phone,orderNo, System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L))
- val failedReason = "核销失败，${message}"
+// val failedReason = "核销失败，${message}"
+ val failedReason = StringUtils.getString(R.string.module_och_recognition_failed, message)
// tts
ShuttleVoiceManager.writeOffFaile(failedReason)
val tempPhone = OchPhoneUtil.getPhoneWithoutMiddle(phone)
val reaseonAndPhone = if(tempPhone.isEmpty()) {
failedReason
}else{
- "${failedReason};乘客：${tempPhone}"
+// "${failedReason};乘客：${tempPhone}"
+ "${failedReason}${StringUtils.getString(R.string.module_och_passenger)}${tempPhone}"
}
saveMsgBox(
MsgBoxBean(
@@ -295,7 +309,8 @@ object TicketModel {
val phoneNumFix = tempPhone.substring(7)
tempPhone = "$phoneNumPre****$phoneNumFix"
}
- val content = "${ticketSize}张 $ticketName $tempPhone"
+// val content = "${ticketSize}张 $ticketName $tempPhone"
+ val content = "${ticketSize}${StringUtils.getString(R.string.module_och_piece)} $ticketName $tempPhone"
saveMsgBox(MsgBoxBean(
MsgBoxType.V2X,
V2XMsg(
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt
index 1d26006346..36396cfdbd 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt
@@ -2,6 +2,7 @@ package com.mogo.och.weaknet.repository.db.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.utils.DateTimeUtil
@@ -11,6 +12,7 @@ import com.mogo.och.weaknet.repository.db.MyDataBase
import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
import com.mogo.och.weaknet.repository.db.dao.TaskDataDao
import com.mogo.och.data.db.exception.DbException
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.repository.exception.DataException
import io.reactivex.Observable
@@ -136,7 +138,7 @@ object TaskDb : IDbRepository {
updateCount?.let {
if(it<=0){
// 插入失败
- return@flatMap Observable.error(DataException(DataException.startTaskErrorCode,"未插入数据"))
+ return@flatMap Observable.error(DataException(DataException.startTaskErrorCode,StringUtils.getString(R.string.module_och_no_data_inserted)))
}else{
// 开始任务成功
return@flatMap Observable.just(true)
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
index a9b44148db..b17d30720c 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
@@ -2,6 +2,7 @@ package com.mogo.och.weaknet.repository.db.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.weaknet.repository.db.IDbRepository
@@ -9,6 +10,7 @@ import com.mogo.och.weaknet.repository.db.MyDataBase
import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
import com.mogo.och.weaknet.repository.db.dao.TaskSiteDataDao
import com.mogo.och.data.db.exception.DbException
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.repository.db.bean.LineDataBean
object TaskSiteDb : IDbRepository {
@@ -38,11 +40,13 @@ object TaskSiteDb : IDbRepository {
// 获取线路的站点
val querySites = SiteDb.querySiteByLineId(linId)?.distinctBy { it.siteId }?.sortedBy { it.seq }
if (querySites.isNullOrEmpty()) {
- throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+// throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data))
}
querySites.forEachIndexed { index, siteDataBean ->
if(index+1!=siteDataBean.seq){
- throw DbException(DbException.NEEDSYNDATA,"站点数据排序不对")
+// throw DbException(DbException.NEEDSYNDATA,"站点数据排序不对")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_order_incorrect))
}
}
val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas(
@@ -52,7 +56,8 @@ object TaskSiteDb : IDbRepository {
lineName
)
if (toTaskSiteDatas.size < 2) {
- throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试")
+// throw DbException(DbException.NEEDSYNDATA,"站点数据不全请稍后再试")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_station_data_incomplete))
}
// 把线路所有的站点搬迁到运行中表格中
val result = taskSiteDataDao?.insert(*toTaskSiteDatas.toTypedArray())
@@ -124,7 +129,8 @@ object TaskSiteDb : IDbRepository {
// 获取线路的站点
val querySites = SiteDb.querySiteByLineId(lineInfo.lineId!!)?.distinctBy { it.siteId }
if (querySites.isNullOrEmpty()) {
- throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+// throw DbException(DbException.NEEDSYNDATA,"没有站点数据")
+ throw DbException(DbException.NEEDSYNDATA,StringUtils.getString(R.string.module_och_no_station_data))
}
val toTaskSiteDatas = TaskSiteDataBean.toTaskSiteDatas(
querySites,
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
index 5a5ca1bc50..5f31dee35c 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
@@ -8,12 +8,14 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.data.bean.LineInfo
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.request.ShuttleEventRequest
import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
import com.mogo.och.weaknet.bean.response.PointResponse
@@ -39,14 +41,17 @@ class NormalRepository: ILineRepository {
when (ProjectUtils.getProjectType()) {
Project.SAAS -> {
if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
- throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+ throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus))
}else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
- throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+ throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus))
}
}
Project.DALI -> {
if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
- throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+// throw NetException("非缓存weakNetInterface 初始化环境错误 isBus")
+ throw NetException(StringUtils.getString(R.string.module_och_init_env_error_bus))
}else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
field = DaliBusServiceManager
}
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
index e673fbb11c..b064df810a 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.biz.login.LoginStatusManager
@@ -65,14 +66,17 @@ class WeaknetRepository : ILineRepository {
if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
field = DaliShuttleServiceManager
}else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
- throw NetException("缓存weakNetInterface 初始化环境错误 isBus")
+// throw NetException("缓存weakNetInterface 初始化环境错误 isBus")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_bus))
}
}
Project.MOGO -> {
- throw NetException("缓存weakNetInterface 初始化环境错误 MOGO")
+// throw NetException("缓存weakNetInterface 初始化环境错误 MOGO")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_mogo))
}
else->{
- throw NetException("缓存weakNetInterface 初始化环境错误 未知")
+// throw NetException("缓存weakNetInterface 初始化环境错误 未知")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_unknown))
}
}
}
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt
index 747f021a16..f0aef762ef 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt
@@ -8,11 +8,13 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.Product
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.manager.cache.OchSPManager
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg
import com.mogo.och.common.module.utils.DateTimeUtil
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.WaitUploadLine
import com.mogo.och.weaknet.bean.WaitUploadTask
import com.mogo.och.weaknet.bean.WriteOffPassenger
@@ -46,13 +48,16 @@ class WriteOffCacheRepository : IWriteOffRepository {
}
}
Project.DALI -> {
- throw NetException("缓存weakNetInterface 初始化环境错误 Dali")
+// throw NetException("缓存weakNetInterface 初始化环境错误 Dali")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_dali))
}
Project.MOGO -> {
- throw NetException("缓存weakNetInterface 初始化环境错误 MOGO")
+// throw NetException("缓存weakNetInterface 初始化环境错误 MOGO")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_mogo))
}
else->{
- throw NetException("缓存weakNetInterface 初始化环境错误 未知")
+// throw NetException("缓存weakNetInterface 初始化环境错误 未知")
+ throw NetException(StringUtils.getString(R.string.module_och_cache_init_env_error_unknown))
}
}
}
@@ -110,51 +115,61 @@ class WriteOffCacheRepository : IWriteOffRepository {
if(LoginStatusManager.getOchCarInfo()?.tenantId==tenantId){
}else{
- throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+ throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company))
}
}
// 2、校验project
if(ProjectUtils.isSaas()){
if(it.pipe != WriteOffDataBean.saasXiaoChengXu){
- throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+ throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company))
}
}else if(ProjectUtils.isDali()){
if(it.pipe != WriteOffDataBean.daliXiaoChengXu){
- throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+// throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
+ throw DataException(1012, StringUtils.getString(R.string.module_och_current_user_order_not_current_company))
}
}
// 3、校验 bus和shuttle
if (LoginStatusManager.getProductType()!=Product.valueOf(it.typeBiz)) {
- throw DataException(1005,"车辆未登录、或没有任务")
+// throw DataException(1005,"车辆未登录、或没有任务")
+ throw DataException(1005, StringUtils.getString(R.string.module_och_not_login_car))
}
// 4 二维码1分钟失效
if(System.currentTimeMillis()-(it.expiryTime?:0L)>60_000){
- throw DataException(6001,"二维码已过期")
+// throw DataException(6001,"二维码已过期")
+ throw DataException(6001, StringUtils.getString(R.string.module_och_qr_code_expires))
}
// 5 校验乘车日期
if(!DateTimeUtil.isSameDay(System.currentTimeMillis(),it.bookingTime?:0)){
- throw DataException(1009,"车票所选乘车日期非今日")
+// throw DataException(1009,"车票所选乘车日期非今日")
+ throw DataException(1009, StringUtils.getString(R.string.module_och_ticket_not_today))
}
// 6、校验线路
if(LineManager.lineInfos==null||LineManager.lineInfos?.lineId==null){
- throw DataException(1005,"车辆未登录、或没有任务")
+// throw DataException(1005,"车辆未登录、或没有任务")
+ throw DataException(1005, StringUtils.getString(R.string.module_och_not_login_car))
}
if(it.lineId==LineManager.lineInfos?.lineId){
lineId = it.lineId
}else{
- throw DataException(1006,"车票路线信息与当前车辆执行任务的路线信息不符合")
+// throw DataException(1006,"车票路线信息与当前车辆执行任务的路线信息不符合")
+ throw DataException(1006, StringUtils.getString(R.string.module_och_ticket_line_current_car_line_inconformity))
}
if (!it.orderNo.isNullOrEmpty()) {
val lastWriteOff = WriteOffDb.queryWaitUpdateEventCount(it.orderNo!!)
// 7、校验次数
if ((it.availableTimes ?: 0) <= (lastWriteOff?.size ?: 0)) {
- throw DataException(1008, "车票剩余可用次数为0")
+// throw DataException(1008, "车票剩余可用次数为0")
+ throw DataException(1008, StringUtils.getString(R.string.module_och_ticket_not_used))
}
if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
// 8、同一个订单2分钟内只能核销一次
if (lastWriteOff != null && lastWriteOff.size > 0) {
if (System.currentTimeMillis() - lastWriteOff.last().eventSaveTime <= 120_000) {
- throw DataException(6002, "同一订单核销间隔时间需大于2分钟")
+// throw DataException(6002, "同一订单核销间隔时间需大于2分钟")
+ throw DataException(6002, StringUtils.getString(R.string.module_och_interval_canceling_same_order_too_short))
}
}
@@ -166,7 +181,8 @@ class WriteOffCacheRepository : IWriteOffRepository {
if (start?.siteId?.toLong() == it.startStationId) {
siteId = it.startStationId
} else {
- throw DataException(6003, "车票站点信息与当前车辆执行任务的站点信息不符合")
+// throw DataException(6003, "车票站点信息与当前车辆执行任务的站点信息不符合")
+ throw DataException(6003, StringUtils.getString(R.string.module_och_ticket_station_current_car_station_inconformity))
}
} else if(AppIdentityModeUtils.isScheduled(FunctionBuildConfig.appIdentityMode)){
val (start, _) = LineManager.getStations()
@@ -174,15 +190,18 @@ class WriteOffCacheRepository : IWriteOffRepository {
// 8、校验起始站点
val task = LineModel.currentTask
if(task==null){
- throw DataException(6004, "车辆未执行任务")
+// throw DataException(6004, "车辆未执行任务")
+ throw DataException(6004, StringUtils.getString(R.string.module_och_vehicle_not_duty))
}else{
if (task.taskId!=it.shiftsId) {
- throw DataException(6005, "车票站点信息与当前车辆执行任务信息不符合")
+// throw DataException(6005, "车票站点信息与当前车辆执行任务信息不符合")
+ throw DataException(6005, StringUtils.getString(R.string.module_och_ticket_station_current_car_task_inconformity))
}
}
}
} else {
- throw DataException(11000, "缺少orderNo")
+// throw DataException(11000, "缺少orderNo")
+ throw DataException(11000, StringUtils.getString(R.string.module_och_not_order_no))
}
val addWrite = WriteOffDataBean()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt
index 1ce1ebd7a0..ba58e6184e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffNormallRepository.kt
@@ -8,8 +8,10 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg
import com.mogo.och.common.module.network.OchCommonServiceCallback
+import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.WaitUploadLine
import com.mogo.och.weaknet.bean.WaitUploadTask
import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
@@ -34,7 +36,8 @@ class WriteOffNormallRepository: IWriteOffRepository {
if(field==null){
when (ProjectUtils.getProjectType()) {
Project.SAAS -> {
- throw NetException("writeoff 核销 初始化环境错误 SAAS")
+// throw NetException("writeoff 核销 初始化环境错误 SAAS")
+ throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_saas))
}
Project.DALI -> {
if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
@@ -44,10 +47,12 @@ class WriteOffNormallRepository: IWriteOffRepository {
}
}
Project.MOGO -> {
- throw NetException("writeoff 核销 初始化环境错误 MOGO")
+// throw NetException("writeoff 核销 初始化环境错误 MOGO")
+ throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_mogo))
}
else->{
- throw NetException("writeoff 核销 初始化环境错误 未知")
+// throw NetException("writeoff 核销 初始化环境错误 未知")
+ throw NetException(StringUtils.getString(R.string.module_och_verification_init_env_error_unknown))
}
}
}
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
index 2e952e14b6..ee8429b725 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchMana
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_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.bridge.ui.drawline.LineView
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.repository.RepositoryManager
@@ -51,7 +52,8 @@ class ShuttleFragment : MvpFragment() {
context?.let {
if(RepositoryManager.supportDb()){
- CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4)
+// CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4)
+ CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,StringUtils.getString(R.string.module_och_local_cache_task), R.drawable.bus_running_task_history,4)
CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
IToolKitItemClickListener{
override fun onItemClick(toolTag: String, ctx: Context?) {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt
index 28fb386729..ded5f351d3 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt
@@ -9,6 +9,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.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -117,7 +118,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba
d(TAG, "queryTaskByLineInfo 查询线路的任务线路id:${lineInfo}")
viewModel?.queryBusLineTasksById(lineInfo)
busLineName.text = lineInfo.lineName
- actvLineEndStationName.text = "往${lineInfo.endStationName}方向"
+// actvLineEndStationName.text = "往${lineInfo.endStationName}方向"
+ actvLineEndStationName.text = StringUtils.getString(R.string.module_och_leave_for, lineInfo.endStationName)
}
override fun showTaskByLineIdResult(taskList: MutableList?) {
@@ -157,7 +159,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba
}
override fun showErrorInfo() {
- tv_error_msg.text = "发生错误点击重试"
+// tv_error_msg.text = "发生错误点击重试"
+ tv_error_msg.text = StringUtils.getString(R.string.module_och_error_try_again)
actv_submit_task.setTextColor(ResourcesUtils.getColor(R.color.bus_color_66666))
actv_submit_task.isEnabled = false
include_error.visibility = VISIBLE
@@ -173,7 +176,8 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba
override fun setCurrentTaskUsed(taskId: Long,plateNumber: String) {
BizLoopManager.runInMainThread{
mAdapter.setCurrentTaskUsed(taskId)
- tempData[taskId] = "该任务已被${plateNumber}使用"
+// tempData[taskId] = "该任务已被${plateNumber}使用"
+ tempData[taskId] = StringUtils.getString(R.string.module_och_task_has_been_completed)
}
}
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt
index 55f8ac57cc..d9f349bece 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskAdapter.kt
@@ -8,6 +8,7 @@ import android.widget.TextView
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.eagle.core.utilcode.util.TimeUtils
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.WaitUploadLine
@@ -42,7 +43,8 @@ class RunningTaskAdapter(
override fun onBindViewHolder(holder: RunningTaskViewHolder, position: Int) {
val currentPosition = holder.bindingAdapterPosition
val lineTasks = dataList!![currentPosition]
- val sb = StringBuilder().append("班次：")
+// val sb = StringBuilder().append("班次：")
+ val sb = StringBuilder().append(StringUtils.getString(R.string.module_och_classes))
lineTasks.task.forEach {
sb.append(TimeUtils.millis2String(it.taskStartTime, "HH:mm"))
if(it.waitUploadWriteOff>0){
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt
index be9de0da6e..b029135e8e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunned/RunningTaskManagerView.kt
@@ -133,7 +133,8 @@ class RunningTaskManagerView : WindowRelativeLayout, RunningTastViewModel.Runnin
override fun showUpdating(isupload: Boolean) {
if (isupload) {
upload_btn_commit_progress.visibility = VISIBLE
- upload_btn_commit_title.text = "上传中"
+// upload_btn_commit_title.text = "上传中"
+ upload_btn_commit_title.text = ResourcesUtils.getString(R.string.bus_running_task_uploading)
} else {
upload_btn_commit_progress.visibility = GONE
upload_btn_commit_title.text =
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
index 74e291bfd4..7652a19937 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.bridge.autopilot.line.LineManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -120,9 +121,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
LineManager.getLineInfo { lineInfo ->
bus_task_running_line_name.text = lineInfo.lineName
}
- actv_running_task_time.text = "班次:${LineModel.getTaskTime()}"
+// actv_running_task_time.text = "班次:${LineModel.getTaskTime()}"
+ actv_running_task_time.text = "${StringUtils.getString(R.string.module_och_classes)}${LineModel.getTaskTime()}"
LineModel.stationList?.takeIf { it.size >= 2 }?.let {
- actv_running_task_last_station.text = "往${it.last().name ?: ""}"
+// actv_running_task_last_station.text = "往${it.last().name ?: ""}"
+ actv_running_task_last_station.text = "${StringUtils.getString(R.string.module_och_go)}${it.last().name ?: ""}"
mAdapter.setDataList(it)
CallerLogger.d(
TAG,
@@ -135,9 +138,11 @@ class TaskRunningView : ConstraintLayout, TaskRunningModel.SwtichLineViewCallbac
showLeaveStationView()
}
if (LineModel.startStationIndex == it.size - 1) {
- aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+// aciv_task_leave_station_slide_bg.setTextValue("单程结束")
+ aciv_task_leave_station_slide_bg.setTextValue(StringUtils.getString(R.string.module_och_one_way_completion))
} else {
- aciv_task_leave_station_slide_bg.setTextValue("滑动出发")
+// 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/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
index bfac519aa7..bdedf58b66 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
@@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -105,9 +106,11 @@ object ShuttleVoiceManager {
fun writeOffCount(successNum:Int){
if(successNum<=1){
- VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3)
+// VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3)
+ VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful), AIAssist.LEVEL3)
}else{
- VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3)
+// VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3)
+ VoiceNotice.showNotice(StringUtils.getString(R.string.module_och_verification_successful1, successNum), AIAssist.LEVEL3)
}
}
@@ -137,7 +140,8 @@ object ShuttleVoiceManager {
VoiceNotice.showNotice(message, AIAssist.LEVEL0)
} else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
sendPassengerPlay(message)
- arrivedStationOut("车辆遇到紧急情况，正在安全处理")
+// arrivedStationOut("车辆遇到紧急情况，正在安全处理")
+ arrivedStationOut(ResourcesUtils.getString(R.string.m2_vehicle_emergency))
}
}
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
index c08221881d..b4be3d6848 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_wadk_task_running.xml
@@ -46,11 +46,12 @@
android:layout_width="@dimen/dp_97"
android:layout_height="@dimen/dp_39"/>
+
-
+
+ android:layout_height="wrap_content"
+ tools:text="天安门天安门天安门…"/>
-
+
+
蘑菇小巴正在进站
蘑菇小巴出发咯
尊敬的乘客，车辆遇到紧急情况，正在安全处理，请坐稳扶好，听从指引，感谢配合
+ 车辆遇到紧急情况，正在安全处理
@@ -62,6 +63,7 @@
暂无待上传任务
一键上传
+ 上传中
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 53c08765de..7fd6cba2ca 100644
--- a/core/mogo-core-res/src/main/res/values/string.xml
+++ b/core/mogo-core-res/src/main/res/values/string.xml
@@ -283,6 +283,57 @@
为您提供路口全息影像，助力出行
出示错误二维码
yyyy年MM月dd日
+ 前方到站：%s，请下车的乘客做好准备
+ 乘车日期非今日
+ 当前无路线任务
+ 车票非当前路线
+ 车票无剩余可用次数
+ 二维码已过期
+ 同一订单核销间隔时间需大于2分钟
+ 车票非当前站点
+ 车辆未执行任务
+ 车票非当前班次
+ 车票与车辆所属租户不一致
+ 核销失败，%s
+ 张
+ ；乘客：
+ 未插入数据
+ 没有站点数据
+ 站点数据排序不对
+ 站点数据不全请稍后再试
+ 非缓存weakNetInterface 初始化环境错误 isBus
+ 缓存weakNetInterface 初始化环境错误 isBus
+ 缓存weakNetInterface 初始化环境错误 MOGO
+ 缓存weakNetInterface 初始化环境错误 未知
+ 缓存weakNetInterface 初始化环境错误 Dali
+ 当前用户下单路线非当前的车辆所属公司
+ 车辆未登录、或没有任务
+ 二维码已过期
+ 车票所选乘车日期非今日
+ 车票路线信息与当前车辆执行任务的路线信息不符合
+ 车票剩余可用次数为0
+ 车票站点信息与当前车辆执行任务的站点信息不符合
+ 车票站点信息与当前车辆执行任务信息不符合
+ 缺少orderNo
+ writeoff 核销 初始化环境错误 SAAS
+ writeoff 核销 初始化环境错误 MOGO
+ writeoff 核销 初始化环境错误 未知
+ 本地缓存任务
+ 往%s方向
+ 发生错误点击重试
+ 该任务已被%s使用
+ 班次：
+ 往
+ 往--
+ 单程结束
+ 滑动出发
+ 核验通过
+ %d 人核验通过
+ 本地任务执行信息
+ 时间
+ 暂无线路
+ 暂无班次
+
PadTTS 模块初始化异常