diff --git a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml index d9064ebce3..b146055dff 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_autopilot_status.xml @@ -16,6 +16,7 @@ android:layout_centerVertical="true" android:src="@drawable/charter_ic_autopilot" /> + diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml index bfae94a3a4..2b78967d7e 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_music.xml @@ -16,6 +16,7 @@ android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_90"/> + diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml index 14a4d229a1..ca0294a60c 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml @@ -16,6 +16,7 @@ android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_90"/> + diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt index b2a1863053..45bd02d8dd 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt @@ -9,7 +9,9 @@ import android.os.Message import android.widget.ImageView import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.R import java.lang.ref.SoftReference import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.Future @@ -115,7 +117,8 @@ class BigFrameAnimatorContainer (resId: Int, heightImage = bmp.height config = bmp.config }catch (e:Exception){ - throw RuntimeException("请设置图片或传递大小") +// throw RuntimeException("请设置图片或传递大小") + throw RuntimeException(StringUtils.getString(R.string.module_core_set_image)) } } // 当图片大小类型相同时进行复用，避免频繁GC diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt index 69aa07f182..e60e9742a5 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt @@ -8,7 +8,9 @@ import android.os.Looper import android.widget.ImageView import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.R import java.lang.ref.SoftReference class FrameAnimatorContainer (resId: Int, @@ -88,7 +90,8 @@ class FrameAnimatorContainer (resId: Int, heightImage = bmp.height config = bmp.config }catch (e:Exception){ - throw RuntimeException("请设置图片或传递大小") +// throw RuntimeException("请设置图片或传递大小") + throw RuntimeException(StringUtils.getString(R.string.module_core_set_image)) } } // 当图片大小类型相同时进行复用，避免频繁GC diff --git a/OCH/common/common/src/main/res/layout/m1_debugview_pass.xml b/OCH/common/common/src/main/res/layout/m1_debugview_pass.xml index d6c0a9bbc7..b4a76096e0 100644 --- a/OCH/common/common/src/main/res/layout/m1_debugview_pass.xml +++ b/OCH/common/common/src/main/res/layout/m1_debugview_pass.xml @@ -43,9 +43,10 @@ android:layout_width="@dimen/dp_424" android:layout_height="@dimen/dp_84"/> + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/view_check_autopilot.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/view_check_autopilot.xml index 2f9b4e1eb8..13a2aa9df6 100644 --- a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/view_check_autopilot.xml +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/view_check_autopilot.xml @@ -87,13 +87,14 @@ app:layout_constraintLeft_toRightOf="@id/ivSpeedAdd" android:layout_marginStart="@dimen/dp_20" /> + ) { - tvTitle?.text = "FSM异常" +// tvTitle?.text = "FSM异常" + tvTitle?.text = StringUtils.getString(R.string.module_core_fsm_error) runCatching { val c = Color.parseColor("#FF4E41") tvTitle?.setTextColor(c) @@ -60,16 +62,19 @@ class FSMStatusDetailDialog(context: Context) : BaseFloatDialog(context, TAG), } private fun setFsmNormalStatus() { - tvTitle?.text = "FSM正常" +// tvTitle?.text = "FSM正常" + tvTitle?.text = StringUtils.getString(R.string.module_core_fsm_normal) runCatching { val c = Color.parseColor("#26C14F") tvTitle?.setTextColor(c) } - addFsmMsgItemView(ArrayList().also { it += "FSM异常状态已恢复" }, false) +// addFsmMsgItemView(ArrayList().also { it += "FSM异常状态已恢复" }, false) + addFsmMsgItemView(ArrayList().also { it += StringUtils.getString(R.string.module_core_fsm_error_recover) }, false) } private fun setFsmUnknownStatus() { - tvTitle?.text = "FSM状态未知" +// tvTitle?.text = "FSM状态未知" + tvTitle?.text = StringUtils.getString(R.string.module_core_fsm_error_unknown) runCatching { val c = Color.parseColor("#FFCD3D") tvTitle?.setTextColor(c) @@ -78,7 +83,8 @@ class FSMStatusDetailDialog(context: Context) : BaseFloatDialog(context, TAG), } private fun setFsmNotExistStatus() { - tvTitle?.text = "FSM不存在" +// tvTitle?.text = "FSM不存在" + tvTitle?.text = StringUtils.getString(R.string.module_core_fsm_not_exist) runCatching { val c = Color.parseColor("#FFFFFF") tvTitle?.setTextColor(c) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt index 40c645d8ac..36fab10ca1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt @@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -182,7 +183,8 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvBagReceiveTime.text = TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) holder.tvBagRecordTime.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" val msgBoxBean = it[position] val recordBagMsg = msgBoxBean.bean as RecordBagMsg holder.tvRecordCheck.setOnClickListener { @@ -203,13 +205,16 @@ class MsgBoxTabAdapter(private val activity: Activity) : val fmInfoMsg = it[position].bean as FMInfoMsg //时间显示 holder.tvFmTime.text = - "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" +// "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" + "${StringUtils.getString(R.string.module_core_time)}${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" //建议操作 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ //建议操作暂无 - holder.tvFmAction.text = "建议操作：暂无" +// holder.tvFmAction.text = "建议操作：暂无" + holder.tvFmAction.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) //Title - holder.tvFmTitle.text = "暂无建议操作" +// holder.tvFmTitle.text = "暂无建议操作" + holder.tvFmTitle.text = StringUtils.getString(R.string.module_core_not_available_suggested_procedure) }else{ val receiveFaultLevel = ArrayList() fmInfoMsg.fmInfoList!!.forEach { info -> @@ -225,7 +230,8 @@ class MsgBoxTabAdapter(private val activity: Activity) : //对faultLevel集合进行排序，按照顺序输出建议操作 if(receiveFaultLevel.size > 0){ val faultActionStr: StringBuilder = StringBuilder() - faultActionStr.append("建议操作：") +// faultActionStr.append("建议操作：") + faultActionStr.append(StringUtils.getString(R.string.module_core_suggested_procedure)) receiveFaultLevel.sort() // receiveFaultLevel.reverse() //Title @@ -264,22 +270,27 @@ class MsgBoxTabAdapter(private val activity: Activity) : } holder.tvFmAction.text = faultActionStr.toString() }else{ - holder.tvFmAction.text = "建议操作：暂无" +// holder.tvFmAction.text = "建议操作：暂无" + holder.tvFmAction.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) } }else{ - holder.tvFmAction.text = "建议操作：暂无" +// holder.tvFmAction.text = "建议操作：暂无" + holder.tvFmAction.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) //轻度预警样式 holder.ivFmImage.setImageDrawable(getDrawable(R.drawable.icon_fm_mild_warning)) } } //故障策略 - holder.tvFmFault.text = "故障策略：${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" +// holder.tvFmFault.text = "故障策略：${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" + holder.tvFmFault.text = "${StringUtils.getString(R.string.module_core_fault_handling_strategy)}${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" //故障原因 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ - holder.tvFmReason.text = "故障原因：暂无" +// holder.tvFmReason.text = "故障原因：暂无" + holder.tvFmReason.text = StringUtils.getString(R.string.module_core_failure_cause_not_available) }else{ val fmFaultReason = StringBuilder() - fmFaultReason.append("故障原因：") +// fmFaultReason.append("故障原因：") + fmFaultReason.append(StringUtils.getString(R.string.module_core_failure_cause)) for((index,info) in fmInfoMsg.fmInfoList!!.withIndex()){ fmFaultReason.append(info.faultName) if(info.faultId.isNotBlank()){ @@ -295,10 +306,12 @@ class MsgBoxTabAdapter(private val activity: Activity) : } //故障后果 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ - holder.tvFmResult.text = "故障后果：暂无" +// holder.tvFmResult.text = "故障后果：暂无" + holder.tvFmResult.text = StringUtils.getString(R.string.module_core_consequences_failure_not_available) }else{ val fmFaultResult = StringBuilder() - fmFaultResult.append("故障后果：") +// fmFaultResult.append("故障后果：") + fmFaultResult.append(StringUtils.getString(R.string.module_core_consequences_failure)) fmInfoMsg.fmInfoList!!.forEach { info-> if(info.faultResultCount != 0){ info.faultResultList.forEach { result-> @@ -319,17 +332,20 @@ class MsgBoxTabAdapter(private val activity: Activity) : if(fmFaultResult.endsWith("/")){ holder.tvFmResult.text = fmFaultResult.deleteCharAt(fmFaultResult.lastIndex).toString() }else{ - holder.tvFmResult.text = "故障后果：暂无" +// holder.tvFmResult.text = "故障后果：暂无" + holder.tvFmResult.text = StringUtils.getString(R.string.module_core_consequences_failure_not_available) } } //对布局进行展开折叠操作 if(fmInfoMsg.isShow){ - holder.tvFmShowStatus.text = "收起" +// holder.tvFmShowStatus.text = "收起" + holder.tvFmShowStatus.text = StringUtils.getString(R.string.module_core_pack_up) holder.tvFmFault.visibility = View.VISIBLE holder.tvFmReason.visibility = View.VISIBLE holder.tvFmResult.visibility = View.VISIBLE }else{ - holder.tvFmShowStatus.text = "展开" +// holder.tvFmShowStatus.text = "展开" + holder.tvFmShowStatus.text = StringUtils.getString(R.string.module_core_unfold) holder.tvFmFault.visibility = View.GONE holder.tvFmReason.visibility = View.GONE holder.tvFmResult.visibility = View.GONE @@ -337,13 +353,15 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvFmShowStatus.setOnClickListener{ if(!fmInfoMsg.isShow){ fmInfoMsg.isShow = true - holder.tvFmShowStatus.text = "收起" +// holder.tvFmShowStatus.text = "收起" + holder.tvFmShowStatus.text = StringUtils.getString(R.string.module_core_pack_up) holder.tvFmFault.visibility = View.VISIBLE holder.tvFmReason.visibility = View.VISIBLE holder.tvFmResult.visibility = View.VISIBLE }else{ fmInfoMsg.isShow = false - holder.tvFmShowStatus.text = "展开" +// holder.tvFmShowStatus.text = "展开" + holder.tvFmShowStatus.text = StringUtils.getString(R.string.module_core_unfold) holder.tvFmFault.visibility = View.GONE holder.tvFmReason.visibility = View.GONE holder.tvFmResult.visibility = View.GONE @@ -356,7 +374,8 @@ class MsgBoxTabAdapter(private val activity: Activity) : data?.let { it -> val reportMsgBox = it[position] holder.tvReportTime.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" val reportEntity = (it[position].bean as ReportEntity) if (reportEntity.resultList.contains(RESULT_AUTOPILOT_DISABLE) || reportEntity.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) @@ -379,29 +398,36 @@ class MsgBoxTabAdapter(private val activity: Activity) : } holder.tvReportTime.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" - var resultStr = "类型：" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" +// var resultStr = "类型：" + var resultStr = StringUtils.getString(R.string.module_core_type) for (result in reportEntity.resultList) { resultStr = "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}" } holder.tvReportType.text = resultStr - holder.tvReportReason.text = "原因：${reportEntity.msg}" - holder.tvReportSrc.text = "消息来源：${reportEntity.src}" +// holder.tvReportReason.text = "原因：${reportEntity.msg}" + holder.tvReportReason.text = "${StringUtils.getString(R.string.module_core_cause1)}${reportEntity.msg}" +// holder.tvReportSrc.text = "消息来源：${reportEntity.src}" + holder.tvReportSrc.text = "${StringUtils.getString(R.string.module_core_message_source)}${reportEntity.src}" var actionStr = "" for (action in reportEntity.actionsList) { actionStr = "${actionStr}${CallerAutoPilotControlManager.getReportActionDesc(action)}" } - holder.tvReportAction.text = "建议操作：$actionStr" +// holder.tvReportAction.text = "建议操作：$actionStr" + holder.tvReportAction.text = "${StringUtils.getString(R.string.module_core_suggested_procedure)}$actionStr" holder.tvReportShowStatus.tag = reportEntity if(reportEntity.isShow){ - holder.tvReportShowStatus.text = "收起" +// holder.tvReportShowStatus.text = "收起" + holder.tvReportShowStatus.text = StringUtils.getString(R.string.module_core_pack_up) holder.tvReportReason.visibility = View.VISIBLE holder.tvReportSrc.visibility = View.VISIBLE holder.tvReportAction.visibility = View.VISIBLE }else{ - holder.tvReportShowStatus.text = "展开" +// holder.tvReportShowStatus.text = "展开" + holder.tvReportShowStatus.text = StringUtils.getString(R.string.module_core_unfold) holder.tvReportReason.visibility = View.GONE holder.tvReportSrc.visibility = View.GONE holder.tvReportAction.visibility = View.GONE @@ -409,13 +435,15 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvReportShowStatus.setOnClickListener { if (!reportEntity.isShow) { reportEntity.isShow = true - holder.tvReportShowStatus.text = "收起" +// holder.tvReportShowStatus.text = "收起" + holder.tvReportShowStatus.text = StringUtils.getString(R.string.module_core_pack_up) holder.tvReportReason.visibility = View.VISIBLE holder.tvReportSrc.visibility = View.VISIBLE holder.tvReportAction.visibility = View.VISIBLE } else { reportEntity.isShow = false - holder.tvReportShowStatus.text = "展开" +// holder.tvReportShowStatus.text = "展开" + holder.tvReportShowStatus.text = StringUtils.getString(R.string.module_core_unfold) holder.tvReportReason.visibility = View.GONE holder.tvReportSrc.visibility = View.GONE holder.tvReportAction.visibility = View.GONE @@ -580,7 +608,8 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvOTATitle.text = otaMsg.title holder.tvOTAContent.text = otaMsg.des holder.tvOTATime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) - if(otaMsg.type == "成功"){ +// if(otaMsg.type == "成功"){ + if(otaMsg.type == StringUtils.getString(R.string.module_core_succeed)){ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success)) }else{ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt index cd847de91a..1146135433 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolStopServiceView.kt @@ -28,6 +28,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.util.ParseVersionUtils +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.zhjt.mogo.adas.common.MessageType @@ -384,7 +385,8 @@ class ToolStopServiceView @JvmOverloads constructor( if (receivedAck.status == ReceivedAck.Status.NORMAL) { //一键停服命令回执成功，则正常进入停服阶段中，1分钟倒计时，并且TTS和消息盒子提示 CallerDevaToolsManager.setPowerOffStatus(2) - AIAssist.getInstance(context).speakTTSVoice("请等待1分钟再执行车辆下电") +// AIAssist.getInstance(context).speakTTSVoice("请等待1分钟再执行车辆下电") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_one_minute_later_power_off)) saveMsgBox( MsgBoxBean( MsgBoxType.V2X, V2XMsg( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowManager.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowManager.kt index 856bcd8934..749bf710f6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowManager.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowManager.kt @@ -2,6 +2,8 @@ package com.mogo.eagle.core.function.hmi.notification import android.content.Context import android.util.Log +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.StringUtils import java.util.concurrent.ConcurrentHashMap /** @@ -26,7 +28,8 @@ internal object WarningFloatWindowManager { } else { Log.w(TAG, "存在相同的tag，延长弹窗时间") // 存在相同的tag，直接创建失败 - config.callbacks?.createdResult(false, "存在相同的tag，延长弹窗时间", null) +// config.callbacks?.createdResult(false, "存在相同的tag，延长弹窗时间", null) + config.callbacks?.createdResult(false, StringUtils.getString(R.string.module_core_have_tag_lengthen_popup_window_time), null) windowMap[config.floatTag!!]?.resetDownTime() return false } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 8a938d2358..f32fe08e11 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder @@ -51,11 +52,13 @@ class CameraListView : FrameLayout { GSYVideoOptionBuilder() } private val spannableStringBuilder by lazy { - SpannableStringBuilder("当前设备暂无信号，切换其他摄像头 3S") +// SpannableStringBuilder("当前设备暂无信号，切换其他摄像头 3S") + SpannableStringBuilder(StringUtils.getString(R.string.module_core_no_signal_switch_camera)) } private val spannableStringBuilder2 by lazy { - SpannableStringBuilder("当前路口信号丢失，3S 后自动关闭") +// SpannableStringBuilder("当前路口信号丢失，3S 后自动关闭") + SpannableStringBuilder(StringUtils.getString(R.string.module_core_alert_intersection_signal_lost_auto_close)) } private var isCloseStatus = true diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt index aa8fa04e69..0a38dccbe9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/diskcopy/DiskCopyView.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.diskcopy.adapter.DiskCopyCalendarAdapter import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.ClickUtils +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 kotlinx.android.synthetic.main.view_disk_copy.view.groupDateSelect @@ -174,52 +175,71 @@ class DiskCopyView @JvmOverloads constructor( val formatIpc = SimpleDateFormat("yyyyMMdd", Locale.CHINA) val formatUi = SimpleDateFormat("yyyy.MM.dd",Locale.CHINA) //添加日历星期标题头 - calendarList.add(CopyCalendarInfo(true,"日")) - calendarList.add(CopyCalendarInfo(true,"一")) - calendarList.add(CopyCalendarInfo(true,"二")) - calendarList.add(CopyCalendarInfo(true,"三")) - calendarList.add(CopyCalendarInfo(true,"四")) - calendarList.add(CopyCalendarInfo(true,"五")) - calendarList.add(CopyCalendarInfo(true,"六")) +// calendarList.add(CopyCalendarInfo(true,"日")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_sunday))) +// calendarList.add(CopyCalendarInfo(true,"一")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_monday))) +// calendarList.add(CopyCalendarInfo(true,"二")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_tuesday))) +// calendarList.add(CopyCalendarInfo(true,"三")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_wednesday))) +// calendarList.add(CopyCalendarInfo(true,"四")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_thursday))) +// calendarList.add(CopyCalendarInfo(true,"五")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_friday))) +// calendarList.add(CopyCalendarInfo(true,"六")) + calendarList.add(CopyCalendarInfo(true,StringUtils.getString(R.string.module_core_saturday))) val calendar: Calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT+8")) val currentMonth = calendar.get(Calendar.MONTH) tvCurrentMonth.text = when(currentMonth){ Calendar.JANUARY->{ - "一月" +// "一月" + StringUtils.getString(R.string.module_core_january) } Calendar.FEBRUARY->{ - "二月" +// "二月" + StringUtils.getString(R.string.module_core_february) } Calendar.MARCH->{ - "三月" +// "三月" + StringUtils.getString(R.string.module_core_march) } Calendar.APRIL->{ - "四月" +// "四月" + StringUtils.getString(R.string.module_core_april) } Calendar.MAY->{ - "五月" +// "五月" + StringUtils.getString(R.string.module_core_may) } Calendar.JUNE->{ - "六月" +// "六月" + StringUtils.getString(R.string.module_core_june) } Calendar.JULY->{ - "七月" +// "七月" + StringUtils.getString(R.string.module_core_july) } Calendar.AUGUST->{ - "八月" +// "八月" + StringUtils.getString(R.string.module_core_august) } Calendar.SEPTEMBER->{ - "九月" +// "九月" + StringUtils.getString(R.string.module_core_september) } Calendar.OCTOBER->{ - "十月" +// "十月" + StringUtils.getString(R.string.module_core_october) } Calendar.NOVEMBER->{ - "十一月" +// "十一月" + StringUtils.getString(R.string.module_core_november) } Calendar.DECEMBER->{ - "十二月" +// "十二月" + StringUtils.getString(R.string.module_core_december) } else -> { "" @@ -391,31 +411,38 @@ class DiskCopyView @JvmOverloads constructor( return when(currentWeek){ //星期日 Calendar.SUNDAY->{ - "周日" +// "周日" + StringUtils.getString(R.string.module_core_sunday1) } //星期一 Calendar.MONDAY->{ - "周一" +// "周一" + StringUtils.getString(R.string.module_core_monday1) } //星期二 Calendar.TUESDAY->{ - "周二" +// "周二" + StringUtils.getString(R.string.module_core_tuesday1) } //星期三 Calendar.WEDNESDAY->{ - "周三" +// "周三" + StringUtils.getString(R.string.module_core_wednesday1) } //星期四 Calendar.THURSDAY->{ - "周四" +// "周四" + StringUtils.getString(R.string.module_core_thursday1) } //星期五 Calendar.FRIDAY->{ - "周五" +// "周五" + StringUtils.getString(R.string.module_core_friday1) } //星期六 Calendar.SATURDAY->{ - "周六" +// "周六" + StringUtils.getString(R.string.module_core_saturday1) } else->{ "" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index fa9d5a99c2..2158333f0d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -37,6 +37,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxBubbleAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig import com.mogo.eagle.core.utilcode.util.SoundPoolUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.mogo.adas.data.AdasConstants import com.zhjt.mogo.adas.data.AdasConstants.NodeState @@ -219,7 +220,8 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( CallerHmiManager.warningV2X( EventTypeEnumNew.TAKE_OVER_EVENT.poiType, EventTypeEnumNew.TAKE_OVER_EVENT.content, - "识别车辆故障，建议安全停车并查看操作建议", +// "识别车辆故障，建议安全停车并查看操作建议", + StringUtils.getString(R.string.module_core_warning_vehicle_fault_safe_park), object : IMoGoWarningStatusListener { override fun onShow() { CallerTakeOverManager.invokeTakeOverEvent(true) @@ -236,7 +238,8 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( //二级 MsgFmData.LEVEL_TWO->{ //语音提示 - AIAssist.getInstance(context).speakTTSVoice("识别车辆异常，建议尽快安全停车，查看操作建议") +// AIAssist.getInstance(context).speakTTSVoice("识别车辆异常，建议尽快安全停车，查看操作建议") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_warning_vehicle_abnormal_safe_park)) //展示消息盒子消息 showData(msgBoxBean) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt index 4b2fbf9e5a..f6443039d7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt @@ -35,6 +35,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.MsgBoxToastAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig import com.mogo.eagle.core.utilcode.util.SoundPoolUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_msg_box_bubble.view.llMsgBubbleLayout import kotlinx.android.synthetic.main.layout_msg_box_bubble.view.rvBubbleList @@ -210,7 +211,8 @@ class MsgBoxToastView @JvmOverloads constructor( CallerHmiManager.warningV2X( EventTypeEnumNew.TAKE_OVER_EVENT.poiType, EventTypeEnumNew.TAKE_OVER_EVENT.content, - "识别车辆故障，建议安全停车并查看操作建议", +// "识别车辆故障，建议安全停车并查看操作建议", + StringUtils.getString(R.string.module_core_warning_vehicle_fault_safe_park), object : IMoGoWarningStatusListener { override fun onShow() { CallerTakeOverManager.invokeTakeOverEvent(true) @@ -227,7 +229,8 @@ class MsgBoxToastView @JvmOverloads constructor( //二级 MsgFmData.LEVEL_TWO->{ //语音提示 - AIAssist.getInstance(context).speakTTSVoice("识别车辆异常，建议尽快安全停车，查看操作建议") +// AIAssist.getInstance(context).speakTTSVoice("识别车辆异常，建议尽快安全停车，查看操作建议") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_warning_vehicle_abnormal_safe_park)) //展示消息盒子消息 showData(msgBoxBean) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index 429e586f26..a23e2ce07c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -22,6 +22,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout @@ -176,9 +177,11 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A data?.let { val msgBoxBean = it[position].msgBoxBean val reportEntity = msgBoxBean.bean as ReportEntity - holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" +// holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" + holder.tvBubbleReportTime.text = "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" holder.tvBubbleReceiveTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) - var resultStr = "类型：" +// var resultStr = "类型：" + var resultStr = StringUtils.getString(R.string.module_core_type) for (result in reportEntity.resultList){ resultStr = "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}" } @@ -274,7 +277,8 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A holder.tvBubbleFmTime.text = TimeUtils.millis2String(fmMsg.policyTime!!,getHourMinFormat()) } if(fmMsg.fmInfoList?.size == 0){ - holder.tvBubbleFmFaultAction.text = "建议操作：暂无" +// holder.tvBubbleFmFaultAction.text = "建议操作：暂无" + holder.tvBubbleFmFaultAction.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) holder.tvBubbleFmFault.text = MsgFmData.getFmPolicyName(fmMsg.policyCode) }else{ var curFaultLevel = 5 //默认级别，遍历数组找出级别最高的（level数越小，级别越高） @@ -293,7 +297,8 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A //当出现多个建议操作时，按照整车下电重启、请求人工驾驶接管、请求平行驾驶接管、系统重启、联系硬件工程师、 // 联系运维工程师、联系软件工程师优先级递减的顺序，只展示最高优先级的内容 if(curFaultLevel == 5){ - holder.tvBubbleFmFaultAction.text = "建议操作：暂无" +// holder.tvBubbleFmFaultAction.text = "建议操作：暂无" + holder.tvBubbleFmFaultAction.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) }else{ holder.tvBubbleFmFaultAction.text = "${faultAction}(${MsgFmData.FaultAction.getFaultActionCode(curFaultLevel)})" } @@ -359,7 +364,8 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A holder.tvOTATitle.text = otaMsg.title holder.tvOTAContent.text = otaMsg.des holder.tvOTATime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) - if(otaMsg.type == "成功"){ +// if(otaMsg.type == "成功"){ + if(otaMsg.type == StringUtils.getString(R.string.module_core_succeed)){ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success)) }else{ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index f1d1c3d815..412dfe2ef1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -172,7 +173,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvBagReceiveTime.text = TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) holder.tvBagRecordTime.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" val msgBoxBean = it[position] val recordBagMsg = msgBoxBean.bean as RecordBagMsg holder.tvRecordCheck.setOnClickListener { @@ -193,19 +195,25 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : val fmInfoMsg = it[position].bean as FMInfoMsg //时间显示 holder.tvFmTimeOpen.text = - "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" +// "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" + "${StringUtils.getString(R.string.module_core_time)}${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" holder.tvFmTimeNormal.text = - "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" +// "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" + "${StringUtils.getString(R.string.module_core_time)}${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" holder.tvFmTime.text = fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1,getHourMinFormat()) } //建议操作 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ //建议操作暂无 - holder.tvFmActionOpen.text = "建议操作：暂无" - holder.tvFmActionNormal.text = "建议操作：暂无" +// holder.tvFmActionOpen.text = "建议操作：暂无" + holder.tvFmActionOpen.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) +// holder.tvFmActionNormal.text = "建议操作：暂无" + holder.tvFmActionNormal.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) //Title - holder.tvFmTitleNormal.text = "暂无建议操作" - holder.tvFmTitleOpen.text = "暂无建议操作" +// holder.tvFmTitleNormal.text = "暂无建议操作" + holder.tvFmTitleNormal.text = StringUtils.getString(R.string.module_core_not_available_suggested_procedure) +// holder.tvFmTitleOpen.text = "暂无建议操作" + holder.tvFmTitleOpen.text = StringUtils.getString(R.string.module_core_not_available_suggested_procedure) }else{ val receiveFaultLevel = ArrayList() fmInfoMsg.fmInfoList!!.forEach { info -> @@ -221,7 +229,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : //对faultLevel集合进行排序，按照顺序输出建议操作 if(receiveFaultLevel.size > 0){ val faultActionStr: StringBuilder = StringBuilder() - faultActionStr.append("建议操作：") +// faultActionStr.append("建议操作：") + faultActionStr.append(StringUtils.getString(R.string.module_core_suggested_procedure)) receiveFaultLevel.sort() // receiveFaultLevel.reverse() //Title @@ -265,25 +274,32 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvFmActionOpen.text = faultActionStr.toString() holder.tvFmActionNormal.text = faultActionStr.toString() }else{ - holder.tvFmActionOpen.text = "建议操作：暂无" - holder.tvFmActionNormal.text = "建议操作：暂无" +// holder.tvFmActionOpen.text = "建议操作：暂无" + holder.tvFmActionOpen.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) +// holder.tvFmActionNormal.text = "建议操作：暂无" + holder.tvFmActionNormal.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) } }else{ - holder.tvFmActionOpen.text = "建议操作：暂无" - holder.tvFmActionNormal.text = "建议操作：暂无" +// holder.tvFmActionOpen.text = "建议操作：暂无" + holder.tvFmActionOpen.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) +// holder.tvFmActionNormal.text = "建议操作：暂无" + holder.tvFmActionNormal.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) //轻度预警样式 holder.ivFmImageNormal.setImageDrawable(getDrawable(R.drawable.icon_fm_warning_normal)) holder.ivFmImageOpen.setImageDrawable(getDrawable(R.drawable.icon_fm_warning_open)) } } //故障策略 - holder.tvFmFaultOpen.text = "故障策略：${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" +// holder.tvFmFaultOpen.text = "故障策略：${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" + holder.tvFmFaultOpen.text = "${StringUtils.getString(R.string.module_core_fault_handling_strategy)}${MsgFmData.getFmPolicyName(fmInfoMsg.policyCode)}(${fmInfoMsg.policyCode})" //故障原因 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ - holder.tvFmReasonOpen.text = "故障原因：暂无" +// holder.tvFmReasonOpen.text = "故障原因：暂无" + holder.tvFmReasonOpen.text = StringUtils.getString(R.string.module_core_failure_cause_not_available) }else{ val fmFaultReason = StringBuilder() - fmFaultReason.append("故障原因：") +// fmFaultReason.append("故障原因：") + fmFaultReason.append(StringUtils.getString(R.string.module_core_failure_cause)) for((index,info) in fmInfoMsg.fmInfoList!!.withIndex()){ fmFaultReason.append(info.faultName) if(info.faultId.isNotBlank()){ @@ -299,10 +315,12 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : } //故障后果 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ - holder.tvFmResultOpen.text = "故障后果：暂无" +// holder.tvFmResultOpen.text = "故障后果：暂无" + holder.tvFmResultOpen.text = StringUtils.getString(R.string.module_core_consequences_failure_not_available) }else{ val fmFaultResult = StringBuilder() - fmFaultResult.append("故障后果：") +// fmFaultResult.append("故障后果：") + fmFaultResult.append(StringUtils.getString(R.string.module_core_consequences_failure)) fmInfoMsg.fmInfoList!!.forEach { info-> if(info.faultResultCount != 0){ info.faultResultList.forEach { result-> @@ -323,7 +341,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : if(fmFaultResult.endsWith("/")){ holder.tvFmResultOpen.text = fmFaultResult.deleteCharAt(fmFaultResult.lastIndex).toString() }else{ - holder.tvFmResultOpen.text = "故障后果：暂无" +// holder.tvFmResultOpen.text = "故障后果：暂无" + holder.tvFmResultOpen.text = StringUtils.getString(R.string.module_core_consequences_failure_not_available) } } //对布局进行展开折叠操作 @@ -334,7 +353,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvFmStatusSelect.text = "折叠" +// holder.tvFmStatusSelect.text = "折叠" + holder.tvFmStatusSelect.text = StringUtils.getString(R.string.module_core_fold) holder.ivFmImageNormal.visibility = View.GONE holder.tvFmTitleNormal.visibility = View.GONE holder.tvFmTimeNormal.visibility = View.GONE @@ -353,7 +373,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvFmStatusSelect.text = "展开" +// holder.tvFmStatusSelect.text = "展开" + holder.tvFmStatusSelect.text = StringUtils.getString(R.string.module_core_unfold) holder.ivFmImageNormal.visibility = View.VISIBLE holder.tvFmTitleNormal.visibility = View.VISIBLE holder.tvFmTimeNormal.visibility = View.VISIBLE @@ -375,7 +396,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvFmStatusSelect.text = "折叠" +// holder.tvFmStatusSelect.text = "折叠" + holder.tvFmStatusSelect.text = StringUtils.getString(R.string.module_core_fold) holder.ivFmImageNormal.visibility = View.GONE holder.tvFmTitleNormal.visibility = View.GONE holder.tvFmTimeNormal.visibility = View.GONE @@ -395,7 +417,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvFmStatusSelect.text = "展开" +// holder.tvFmStatusSelect.text = "展开" + holder.tvFmStatusSelect.text = StringUtils.getString(R.string.module_core_unfold) holder.ivFmImageNormal.visibility = View.VISIBLE holder.tvFmTitleNormal.visibility = View.VISIBLE holder.tvFmTimeNormal.visibility = View.VISIBLE @@ -416,9 +439,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : data?.let { it -> val reportMsgBox = it[position] holder.tvReportTimeNormal.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" holder.tvReportTimeOpen.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" val reportEntity = (it[position].bean as ReportEntity) if (reportEntity.resultList.contains(RESULT_AUTOPILOT_DISABLE) || reportEntity.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) @@ -447,26 +472,32 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : } holder.tvReportTimeNormal.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" holder.tvReportTimeOpen.text = - "时间：${TimeUtils.millis2String(it[position].timestamp)}" +// "时间：${TimeUtils.millis2String(it[position].timestamp)}" + "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].timestamp)}" holder.tvReportTime.text = TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) - var resultStr = "类型：" +// var resultStr = "类型：" + var resultStr = StringUtils.getString(R.string.module_core_type) for (result in reportEntity.resultList) { resultStr = "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}" } holder.tvReportTypeNormal.text = resultStr holder.tvReportTypeOpen.text = resultStr - holder.tvReportReasonOpen.text = "原因：${reportEntity.msg}" - holder.tvReportSrcOpen.text = "消息来源：${reportEntity.src}" +// holder.tvReportReasonOpen.text = "原因：${reportEntity.msg}" + holder.tvReportReasonOpen.text = "${StringUtils.getString(R.string.module_core_cause1)}${reportEntity.msg}" +// holder.tvReportSrcOpen.text = "消息来源：${reportEntity.src}" + holder.tvReportSrcOpen.text = "${StringUtils.getString(R.string.module_core_message_source)}${reportEntity.src}" var actionStr = "" for (action in reportEntity.actionsList) { actionStr = "${actionStr}${CallerAutoPilotControlManager.getReportActionDesc(action)}" } - holder.tvReportActionOpen.text = "建议操作：$actionStr" +// holder.tvReportActionOpen.text = "建议操作：$actionStr" + holder.tvReportActionOpen.text = "${StringUtils.getString(R.string.module_core_suggested_procedure)}$actionStr" holder.tvStatusSelect.tag = reportEntity if(reportEntity.isShow){ holder.tvStatusSelect.setCompoundDrawablesWithIntrinsicBounds( @@ -475,7 +506,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvStatusSelect.text = "折叠" +// holder.tvStatusSelect.text = "折叠" + holder.tvStatusSelect.text = StringUtils.getString(R.string.module_core_fold) holder.ivReportImageNormal.visibility = View.GONE holder.tvReportLevelNormal.visibility = View.GONE holder.tvReportTimeNormal.visibility = View.GONE @@ -495,7 +527,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvStatusSelect.text = "展开" +// holder.tvStatusSelect.text = "展开" + holder.tvStatusSelect.text = StringUtils.getString(R.string.module_core_unfold) holder.ivReportImageNormal.visibility = View.VISIBLE holder.tvReportLevelNormal.visibility = View.VISIBLE holder.tvReportTimeNormal.visibility = View.VISIBLE @@ -518,7 +551,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvStatusSelect.text = "折叠" +// holder.tvStatusSelect.text = "折叠" + holder.tvStatusSelect.text = StringUtils.getString(R.string.module_core_fold) holder.ivReportImageNormal.visibility = View.GONE holder.tvReportLevelNormal.visibility = View.GONE holder.tvReportTimeNormal.visibility = View.GONE @@ -539,7 +573,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvStatusSelect.text = "展开" +// holder.tvStatusSelect.text = "展开" + holder.tvStatusSelect.text = StringUtils.getString(R.string.module_core_unfold) holder.ivReportImageNormal.visibility = View.VISIBLE holder.tvReportLevelNormal.visibility = View.VISIBLE holder.tvReportTimeNormal.visibility = View.VISIBLE @@ -577,7 +612,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvOperationStatusSelect.text = "折叠" +// holder.tvOperationStatusSelect.text = "折叠" + holder.tvOperationStatusSelect.text = StringUtils.getString(R.string.module_core_fold) holder.ivOperationImageNormal.visibility = View.GONE holder.tvOperationTitleNormal.visibility = View.GONE holder.tvOperationContentNormal.visibility = View.GONE @@ -592,7 +628,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : null, null ) - holder.tvOperationStatusSelect.text = "展开" +// holder.tvOperationStatusSelect.text = "展开" + holder.tvOperationStatusSelect.text = StringUtils.getString(R.string.module_core_unfold) holder.ivOperationImageNormal.visibility = View.VISIBLE holder.tvOperationTitleNormal.visibility = View.VISIBLE holder.tvOperationContentNormal.visibility = View.VISIBLE @@ -746,7 +783,8 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvOTATitle.text = otaMsg.title holder.tvOTAContent.text = otaMsg.des holder.tvOTATime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) - if(otaMsg.type == "成功"){ +// if(otaMsg.type == "成功"){ + if(otaMsg.type == StringUtils.getString(R.string.module_core_succeed)){ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success)) }else{ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt index 8962580cfc..34a3533978 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt @@ -37,6 +37,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout @@ -101,9 +102,11 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< data?.let { val msgBoxBean = it[position].msgBoxBean val reportEntity = msgBoxBean.bean as ReportEntity - holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" +// holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" + holder.tvBubbleReportTime.text = "${StringUtils.getString(R.string.module_core_time)}${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}" holder.tvBubbleReceiveTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) - var resultStr = "类型：" +// var resultStr = "类型：" + var resultStr = StringUtils.getString(R.string.module_core_type) for (result in reportEntity.resultList){ resultStr = "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}" } @@ -176,7 +179,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< val otaMsg = it[position].msgBoxBean.bean as OTAMsg holder.tvOTATitle.text = otaMsg.title holder.tvOTAContent.text = otaMsg.des - if(otaMsg.type == "成功"){ +// if(otaMsg.type == "成功"){ + if(otaMsg.type == StringUtils.getString(R.string.module_core_succeed)){ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success)) }else{ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail)) @@ -230,7 +234,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< //FM信息 val fmMsg = it[position].msgBoxBean.bean as FMInfoMsg if(fmMsg.fmInfoList?.size == 0){ - holder.tvV2XContent.text = "建议操作：暂无" +// holder.tvV2XContent.text = "建议操作：暂无" + holder.tvV2XContent.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) holder.tvV2XTitle.text = MsgFmData.getFmPolicyName(fmMsg.policyCode) }else{ var curFaultLevel = 5 //默认级别，遍历数组找出级别最高的（level数越小，级别越高） @@ -249,7 +254,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< //当出现多个建议操作时，按照整车下电重启、请求人工驾驶接管、请求平行驾驶接管、系统重启、联系硬件工程师、 // 联系运维工程师、联系软件工程师优先级递减的顺序，只展示最高优先级的内容 if(curFaultLevel == 5){ - holder.tvV2XContent.text = "建议操作：暂无" +// holder.tvV2XContent.text = "建议操作：暂无" + holder.tvV2XContent.text = StringUtils.getString(R.string.module_core_suggested_procedure_not_available) }else{ holder.tvV2XContent.text = "${faultAction}(${MsgFmData.FaultAction.getFaultActionCode(curFaultLevel)})" } @@ -286,7 +292,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< when(operationMsg.type){ 0->{ //运营平台还车通知 - holder.tvV2XTitle.text = "还车通知" +// holder.tvV2XTitle.text = "还车通知" + holder.tvV2XTitle.text = StringUtils.getString(R.string.module_core_vehicle_return_notice) holder.ivV2XImage.setImageDrawable( ContextCompat.getDrawable( activity, @@ -295,7 +302,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< } 1->{ //运营平台靠边停车 - holder.tvV2XTitle.text = "运营平台" +// holder.tvV2XTitle.text = "运营平台" + holder.tvV2XTitle.text = StringUtils.getString(R.string.module_core_operation_platform) holder.ivV2XImage.setImageDrawable( ContextCompat.getDrawable( activity, @@ -304,7 +312,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< } 3->{ //车门开启关闭失败 - holder.tvV2XTitle.text = "运营平台" +// holder.tvV2XTitle.text = "运营平台" + holder.tvV2XTitle.text = StringUtils.getString(R.string.module_core_operation_platform) holder.ivV2XImage.setImageDrawable( ContextCompat.getDrawable( activity, @@ -313,7 +322,8 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< } else->{ //普通运营平台 - holder.tvV2XTitle.text = "运营平台" +// holder.tvV2XTitle.text = "运营平台" + holder.tvV2XTitle.text = StringUtils.getString(R.string.module_core_operation_platform) holder.ivV2XImage.setImageDrawable( ContextCompat.getDrawable( activity, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchCarsDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchCarsDialog.java index d2d4446df3..8774e712c6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchCarsDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchCarsDialog.java @@ -12,6 +12,7 @@ import androidx.annotation.NonNull; import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean; import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager; import com.mogo.eagle.core.function.hmi.R; +import com.mogo.eagle.core.utilcode.util.StringUtils; public class DispatchCarsDialog extends DispatchBaseDialog { @@ -99,8 +100,10 @@ public class DispatchCarsDialog extends DispatchBaseDialog { show(); if(dispatchContent.getType() == 2){ //取消调度 - tvAdasDispatchTitle.setText("调度取消确认"); - tvAdasDispatchRemindContent.setText("车辆将取消到以下位置的自动驾驶"); +// tvAdasDispatchTitle.setText("调度取消确认"); + tvAdasDispatchTitle.setText(StringUtils.getString(R.string.module_core_scheduling_cancellation_confirmation)); +// tvAdasDispatchRemindContent.setText("车辆将取消到以下位置的自动驾驶"); + tvAdasDispatchRemindContent.setText(StringUtils.getString(R.string.module_core_vehicle_cancel_autopilot_target_location)); } dispatchType = dispatchContent.getType(); handler.sendEmptyMessage(MSG_TYPE_TIMER); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchDialogManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchDialogManager.java index 28da7fc5d0..ee7dd90019 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchDialogManager.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchDialogManager.java @@ -10,6 +10,8 @@ import android.content.Context; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean; +import com.mogo.eagle.core.function.hmi.R; +import com.mogo.eagle.core.utilcode.util.StringUtils; public class DispatchDialogManager { @@ -108,7 +110,8 @@ public class DispatchDialogManager { } private void voice() { - AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("请立即停车!请立即停车!",AIAssist.LEVEL0); +// AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("请立即停车!请立即停车!",AIAssist.LEVEL0); + AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(StringUtils.getString(R.string.module_core_immediate_stop_vehicle),AIAssist.LEVEL0); } public void releaseDialog() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index 1b682a682e..3bc956d1e1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -168,7 +168,8 @@ open class AutomaticExplorationView @JvmOverloads constructor( rotationAnim?.cancel() //语音播放，只在司机端播放 if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - AIAssist.getInstance(context).speakTTSVoice("正为您探查道路情况") +// AIAssist.getInstance(context).speakTTSVoice("正为您探查道路情况") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_probing_road_condition_for_you)) } //5秒后关闭弹窗 val hideViewTimer =object: CountDownTimer(EXPLORATION_HIDE_TIME,EXPLORATION_HIDE_TIME){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt index cdbbc58f73..55b3f527d0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt @@ -32,6 +32,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder @@ -360,41 +361,50 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver { dataArrayList.clear() } val laiYuan = NoticeValue() - laiYuan.key = "事故来源：" +// laiYuan.key = "事故来源：" + laiYuan.key = StringUtils.getString(R.string.module_core_accident_source) laiYuan.value = info!!.uploadType dataArrayList.add(laiYuan) val cTime = NoticeValue() - cTime.key = "事故时间：" +// cTime.key = "事故时间：" + cTime.key = StringUtils.getString(R.string.module_core_accident_time) cTime.value = DateTimeUtils.getTimeText( info.dataCreateTime, DateTimeUtils.MM_Yue_dd_Ri_HH_mm ) dataArrayList.add(cTime) val hTime = NoticeValue() - hTime.key = "处理时间：" +// hTime.key = "处理时间：" + hTime.key = StringUtils.getString(R.string.module_core_processing_time) hTime.value = DateTimeUtils.getTimeText( info.dataHandleTime, DateTimeUtils.MM_Yue_dd_Ri_HH_mm ) dataArrayList.add(hTime) val reason = NoticeValue() - reason.key = "事故原因：" +// reason.key = "事故原因：" + reason.key = StringUtils.getString(R.string.module_core_accident_cause) reason.value = info.reason dataArrayList.add(reason) val status = NoticeValue() - status.key = "处理状态：" +// status.key = "处理状态：" + status.key = StringUtils.getString(R.string.module_core_treatment_state) if (info.operaStatus == "1") { - status.value = "待处理" +// status.value = "待处理" + status.value = StringUtils.getString(R.string.module_core_pending) } else { - status.value = "已处理" +// status.value = "已处理" + status.value = StringUtils.getString(R.string.module_core_processed) } dataArrayList.add(status) val location = NoticeValue() - location.key = "事故地点：" +// location.key = "事故地点：" + location.key = StringUtils.getString(R.string.module_core_accident_spot) location.value = info.uploadAddress dataArrayList.add(location) val style = NoticeValue() - style.key = "事故等级：" +// style.key = "事故等级：" + style.key = StringUtils.getString(R.string.module_core_accident_grade) style.value = info.troubleTypeName dataArrayList.add(style) adapter!!.setData(dataArrayList) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/TrafficLightPromptView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/TrafficLightPromptView.kt index 11c85a64d7..6cc5572452 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/TrafficLightPromptView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/TrafficLightPromptView.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils /** @@ -260,17 +261,22 @@ class TrafficLightPromptView @JvmOverloads constructor( when (user) { 0 -> { //司机端提示 - tvPromptTitle?.text = "即将绿灯" - tvPromptContent?.text = "请准备出发" +// tvPromptTitle?.text = "即将绿灯" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_green_light) +// tvPromptContent?.text = "请准备出发" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_prepare_to_depart) } 1 -> { //TAXI乘客端提示 - tvPromptContent?.text = "即将绿灯，请准备出发" +// tvPromptContent?.text = "即将绿灯，请准备出发" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_upcoming_green_light_prepare_to_depart) } else -> { //BUS乘客端提示 - tvPromptTitle?.text = "即将绿灯，" - tvPromptContent?.text = "请准备出发" +// tvPromptTitle?.text = "即将绿灯，" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_green_light1) +// tvPromptContent?.text = "请准备出发" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_prepare_to_depart) } } } @@ -278,17 +284,22 @@ class TrafficLightPromptView @JvmOverloads constructor( when (user) { 0 -> { //司机端提示 - tvPromptTitle?.text = "即将红灯" - tvPromptContent?.text = "请减速慢行" +// tvPromptTitle?.text = "即将红灯" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_red_light) +// tvPromptContent?.text = "请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_warning_slow_down) } 1 -> { //TAXI乘客端提示 - tvPromptContent?.text = "即将红灯，请减速慢行" +// tvPromptContent?.text = "即将红灯，请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_upcoming_red_light_warning_slow_down) } else -> { //BUS乘客端提示 - tvPromptTitle?.text = "即将红灯，" - tvPromptContent?.text = "请减速慢行" +// tvPromptTitle?.text = "即将红灯，" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_red_light1) +// tvPromptContent?.text = "请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_warning_slow_down) } } } @@ -296,17 +307,22 @@ class TrafficLightPromptView @JvmOverloads constructor( when (user) { 0 -> { //司机端提示 - tvPromptTitle?.text = "即将黄灯" - tvPromptContent?.text = "请减速慢行" +// tvPromptTitle?.text = "即将黄灯" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_yellow_light) +// tvPromptContent?.text = "请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_warning_slow_down) } 1 -> { //TAXI乘客端提示 - tvPromptContent?.text = "即将红灯，请减速慢行" +// tvPromptContent?.text = "即将红灯，请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_upcoming_yellow_light_warning_slow_down) } else -> { //BUS乘客端提示 - tvPromptTitle?.text = "即将黄灯，" - tvPromptContent?.text = "请减速慢行" +// tvPromptTitle?.text = "即将黄灯，" + tvPromptTitle?.text = StringUtils.getString(R.string.module_core_upcoming_yellow_light1) +// tvPromptContent?.text = "请减速慢行" + tvPromptContent?.text = StringUtils.getString(R.string.module_core_warning_slow_down) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 2029cfdae3..a1a3eb0c5d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -39,6 +39,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.vehicle.SweeperVehicleConfigUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +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.zhjt.mogo.adas.data.AdasConstants @@ -940,7 +941,8 @@ internal class SOPSettingView @JvmOverloads constructor( if (mf != null) { mfStatusLayout.setClickEnabled(true) mfStatusLayout.setClickedTextAndTag( - if (mf.isConnected()) "断开魔方连接" else "开始连接魔方", +// if (mf.isConnected()) "断开魔方连接" else "开始连接魔方", + if (mf.isConnected()) StringUtils.getString(R.string.module_core_disconnect_mofang) else StringUtils.getString(R.string.module_core_connect_mofang), if (mf.isConnected()) 0 else 1 ) mf.registerMoFangStatusListener(TAG, this) @@ -954,7 +956,8 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnClickCallback } mfStatusLayout.showLoadingView() - mfStatusLayout.setLoadingViewText("正在断开魔方连接, 请稍候...") +// mfStatusLayout.setLoadingViewText("正在断开魔方连接, 请稍候...") + mfStatusLayout.setLoadingViewText(StringUtils.getString(R.string.module_core_disconnecting_mofang)) mf.disconnect() } if (tag == 1) { @@ -966,7 +969,8 @@ internal class SOPSettingView @JvmOverloads constructor( } mf.connect() mfStatusLayout.showLoadingView() - mfStatusLayout.setLoadingViewText("正在连接魔方, 请稍候") +// mfStatusLayout.setLoadingViewText("正在连接魔方, 请稍候") + mfStatusLayout.setLoadingViewText(StringUtils.getString(R.string.module_core_connecting_mofang)) } } } @@ -1060,7 +1064,8 @@ internal class SOPSettingView @JvmOverloads constructor( override fun onMoFangConnected() { mfStatusLayout?.also { it.hideLoadingView() - it.setClickedTextAndTag("断开魔方连接", 0) +// it.setClickedTextAndTag("断开魔方连接", 0) + it.setClickedTextAndTag(StringUtils.getString(R.string.module_core_disconnect_mofang), 0) mfTest?.isEnabled = true mfTest?.isChecked = CallerDevaToolsManager.mofang()?.isEnableTest() ?: false } @@ -1069,7 +1074,8 @@ internal class SOPSettingView @JvmOverloads constructor( override fun onMoFangDisconnected() { mfStatusLayout?.also { it.hideLoadingView() - it.setClickedTextAndTag("开始连接魔方", 1) +// it.setClickedTextAndTag("开始连接魔方", 1) + it.setClickedTextAndTag(StringUtils.getString(R.string.module_core_connect_mofang), 1) mfTest?.isEnabled = false } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 0252565ead..52e00e2506 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -30,6 +30,7 @@ import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction import com.mogo.eagle.core.utilcode.kotlin.PX import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.mogo.adas.data.AdasConstants import me.jessyan.autosize.utils.AutoSizeUtils @@ -51,7 +52,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri it.add(StatusSummaryEntity(1)) it.add(StatusSummaryEntity(2)) it.add(StatusSummaryEntity(3)) - it.add(StatusSummaryEntity(4, "域控未连接", true)) +// it.add(StatusSummaryEntity(4, "域控未连接", true)) + it.add(StatusSummaryEntity(4, StringUtils.getString(R.string.module_core_ipc_disconnect), true)) it.add(StatusSummaryEntity(5, CallerAutopilotCarConfigListenerManager.getCertFileResult(), CallerCloudCertManager.getRootCrtF().isNullOrEmpty())) } } @@ -114,7 +116,9 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri super.onServerStatusChanged(isStarted) UiThreadHandler.post({ if (data.size < 1) return@post - data[0].desc = "司机屏Server启动${if (isStarted) "正常" else "异常"}" +// data[0].desc = "司机屏Server启动${if (isStarted) "正常" else "异常"}" + data[0].desc = "${StringUtils.getString(R.string.module_core_driver_server_start)}${ + if (isStarted) StringUtils.getString(R.string.module_core_normal) else StringUtils.getString(R.string.module_core_error)}" data[0].isException = !isStarted adapter?.notifyItemChanged(0) }, UiThreadHandler.MODE.QUEUE) @@ -124,7 +128,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri super.gpsStatus(status) UiThreadHandler.post({ if (data.size < 2) return@post - data[1].desc = "GPS${if (status) "正常" else "异常"}" +// data[1].desc = "GPS${if (status) "正常" else "异常"}" + data[1].desc = "GPS${if (status) StringUtils.getString(R.string.module_core_normal) else StringUtils.getString(R.string.module_core_error)}" data[1].isException = !status adapter?.notifyItemChanged(1) }, UiThreadHandler.MODE.QUEUE) @@ -137,7 +142,9 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri if (StatusDescriptor.CLOUD_SOCKET == descriptor) { UiThreadHandler.post({ if (data.size < 3) return@post - data[2].desc = "云Socket连接${if (isTrue) "正常" else "异常"}" +// data[2].desc = "云Socket连接${if (isTrue) "正常" else "异常"}" + data[2].desc = "${StringUtils.getString(R.string.module_core_cloud_socket_connect)}${ + if (isTrue) StringUtils.getString(R.string.module_core_normal) else StringUtils.getString(R.string.module_core_error)}" data[2].isException = !isTrue adapter?.notifyItemChanged(2) }, UiThreadHandler.MODE.QUEUE) @@ -148,7 +155,9 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri super.tracingStatus(status) // 发送事件前限制了频率 UiThreadHandler.post({ if (data.size < 4) return@post - data[3].desc = "寻迹算路${if (status) "正常" else "异常"}" +// data[3].desc = "寻迹算路${if (status) "正常" else "异常"}" + data[3].desc = "${StringUtils.getString(R.string.module_core_trail_tracking_route_calculation)}${ + if (status) StringUtils.getString(R.string.module_core_normal) else StringUtils.getString(R.string.module_core_error)}" data[3].isException = !status adapter?.notifyItemChanged(3) }, UiThreadHandler.MODE.QUEUE) @@ -159,43 +168,53 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri var pair: Pair? = null when (status) { AdasConstants.IpcConnectionStatus.DISCONNECTED -> { - pair = Pair("域控未连接", true) +// pair = Pair("域控未连接", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_disconnect), true) } AdasConstants.IpcConnectionStatus.CONNECTED -> { - pair = Pair("域控已连接", false) +// pair = Pair("域控已连接", false) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_connected), false) } AdasConstants.IpcConnectionStatus.CONNECTING -> { - pair = Pair("域控连接中", true) +// pair = Pair("域控连接中", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_connecting), true) } AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER, AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK -> { - pair = Pair("域控重连中", true) +// pair = Pair("域控重连中", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_reconnecting), true) } AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION -> { - pair = Pair("域控连接异常", true) +// pair = Pair("域控连接异常", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_connect_error), true) } AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS -> { - pair = Pair("非法域控地址", true) +// pair = Pair("非法域控地址", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_illegal_address), true) } AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS -> { - pair = Pair("正在搜索域控地址", true) +// pair = Pair("正在搜索域控地址", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_search_address), true) } AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS -> { - pair = Pair("找不到可用的域控地址", true) +// pair = Pair("找不到可用的域控地址", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_not_found_address), true) } AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT -> { - pair = Pair("域控心跳超时", true) +// pair = Pair("域控心跳超时", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_heartbeat_timeout), true) } AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED -> { - pair = Pair("域控主动断开连接", true) +// pair = Pair("域控主动断开连接", true) + pair = Pair(StringUtils.getString(R.string.module_core_ipc_server_disconnected), true) } else -> {} @@ -211,11 +230,13 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri override fun authCrtFile(device: String, root: String) { super.authCrtFile(device, root) UiThreadHandler.post({ - if (CallerAutopilotCarConfigListenerManager.getCertFileResult() != "未开启认证") { +// if (CallerAutopilotCarConfigListenerManager.getCertFileResult() != "未开启认证") { + if (CallerAutopilotCarConfigListenerManager.getCertFileResult() != StringUtils.getString(R.string.module_core_authentication_not_enabled)) { return@post } if (data.size < 6) return@post - data[5].desc = "本机证书已下载" +// data[5].desc = "本机证书已下载" + data[5].desc = StringUtils.getString(R.string.module_core_local_cert_downloaded) data[5].isException = false adapter?.notifyItemChanged(5) }, UiThreadHandler.MODE.QUEUE) @@ -225,7 +246,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri super.authCrtError(errorMsg) UiThreadHandler.post({ if (data.size < 6) return@post - data[5].desc = "本机证书下载异常:$errorMsg" +// data[5].desc = "本机证书下载异常:$errorMsg" + data[5].desc = "${StringUtils.getString(R.string.module_core_local_cert_download_failed)}$errorMsg" data[5].isException = true adapter?.notifyItemChanged(5) }, UiThreadHandler.MODE.QUEUE) @@ -240,7 +262,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri UiThreadHandler.post({ if (data.size < 6) return@post data[5].desc = msg - data[5].isException = !msg.contains("成功校验") +// data[5].isException = !msg.contains("成功校验") + data[5].isException = !msg.contains(StringUtils.getString(R.string.module_core_check_success)) adapter?.notifyItemChanged(5) }, UiThreadHandler.MODE.QUEUE) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index dfb7a73f46..6309ea4f06 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -28,6 +28,7 @@ import com.mogo.eagle.core.function.msgbox.MsgBoxConfig import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.service_biz.BizConfig @@ -180,7 +181,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( // tvAcceleration.text = "加速度 $maxAcceleration m/s²" // } clSpeedSet.visibility = View.VISIBLE - tvAcceleration.text = "每次调整车速±5km/h,点击确定生效" +// tvAcceleration.text = "每次调整车速±5km/h,点击确定生效" + tvAcceleration.text = StringUtils.getString(R.string.module_core_speed_adjust_step_5km) if (speedLimit > 0) { etInputSpeed.setText(speedLimit.toString()) }else{ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAPowerOffFinishDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAPowerOffFinishDialog.kt index b801533ec3..9c108171f0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAPowerOffFinishDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAPowerOffFinishDialog.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.LifecycleObserver import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.util.StringUtils import kotlinx.android.synthetic.main.dialog_ota_power_off_finish.tvPowerOffClose /** @@ -28,7 +29,8 @@ class OTAPowerOffFinishDialog(context: Context) : fun speakTTS(){ //语音提示下电重启 - AIAssist.getInstance(context).speakTTSVoice("优雅停服完成，请操作车辆下电重启") +// AIAssist.getInstance(context).speakTTSVoice("优雅停服完成，请操作车辆下电重启") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_notice_shut_down_power_off)) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt index 4b4574b4ea..3b67c27b59 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.util.ResourceUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinSecondFormat import kotlinx.android.synthetic.main.dialog_ota_upgrade_result.ivUpgradeResult @@ -53,10 +54,14 @@ class OTAUpgradeResultDialog(context: Context) : MsgBoxBean( MsgBoxType.OTA, OTAMsg( - "成功", "车辆部署任务执行结果", "任务下载完成，一分钟后操作车辆下电重启") +// "成功", "车辆部署任务执行结果", "任务下载完成，一分钟后操作车辆下电重启") + StringUtils.getString(R.string.module_core_succeed), + StringUtils.getString(R.string.module_core_vehicle_deployment_task_result), + StringUtils.getString(R.string.module_core_task_download_complete_power_restart)) ) ) - AIAssist.getInstance(context).speakTTSVoice("任务下载完成，一分钟后操作车辆下电重启") +// AIAssist.getInstance(context).speakTTSVoice("任务下载完成，一分钟后操作车辆下电重启") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_task_download_complete_power_restart)) }else{ //升级失败 ivUpgradeResult.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_ota_upgrade_fail)) @@ -71,10 +76,14 @@ class OTAUpgradeResultDialog(context: Context) : MsgBoxBean( MsgBoxType.OTA, OTAMsg( - "失败", "车辆部署任务执行结果", "车辆部署任务执行失败，建议上报问题") +// "失败", "车辆部署任务执行结果", "车辆部署任务执行失败，建议上报问题") + StringUtils.getString(R.string.module_core_fail), + StringUtils.getString(R.string.module_core_vehicle_deployment_task_result), + StringUtils.getString(R.string.module_core_vehicle_deployment_task_failed_report)) ) ) - AIAssist.getInstance(context).speakTTSVoice("车辆部署任务执行失败") +// AIAssist.getInstance(context).speakTTSVoice("车辆部署任务执行失败") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_vehicle_deployment_task_failed)) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/adapter/OTADownloadStatusAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/adapter/OTADownloadStatusAdapter.kt index e7eaa8b8ef..fa9f48c19e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/adapter/OTADownloadStatusAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/adapter/OTADownloadStatusAdapter.kt @@ -9,6 +9,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.deva.ota.OtaUpgradeInfo import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.StringUtils /** * OTA升级下载状态适配器 @@ -34,7 +35,8 @@ class OTADownloadStatusAdapter(private val context: Context): RecyclerView.Adapt holder.tvProductName.text = otaUpgradeInfo.product_name holder.tvDownloadProgress.text = "${(otaUpgradeInfo.cur_size*100/otaUpgradeInfo.total_size).toInt()}%" if(otaUpgradeInfo.cur_size == otaUpgradeInfo.total_size){ - holder.tvDownloadProgress.text = "部署中" +// holder.tvDownloadProgress.text = "部署中" + holder.tvDownloadProgress.text = StringUtils.getString(R.string.module_core_installing) } holder.pbDownloadProgress.progress = (otaUpgradeInfo.cur_size*100/otaUpgradeInfo.total_size).toInt() if(otaUpgradeInfo.left_time <= 0){ @@ -42,9 +44,11 @@ class OTADownloadStatusAdapter(private val context: Context): RecyclerView.Adapt }else{ holder.tvDownloadTime.visibility = View.VISIBLE val upgradeTime = if(otaUpgradeInfo.left_time > 60){ - "剩余${otaUpgradeInfo.left_time/60}分钟${otaUpgradeInfo.left_time%60}秒" +// "剩余${otaUpgradeInfo.left_time/60}分钟${otaUpgradeInfo.left_time%60}秒" + StringUtils.getString(R.string.module_core_installing_time_used, otaUpgradeInfo.left_time / 60, otaUpgradeInfo.left_time % 60) }else{ - "剩余${otaUpgradeInfo.left_time%60}秒" +// "剩余${otaUpgradeInfo.left_time%60}秒" + StringUtils.getString(R.string.module_core_installing_time_used1, otaUpgradeInfo.left_time%60) } holder.tvDownloadTime.text = upgradeTime } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt index d63d543831..97c75aa222 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt @@ -29,6 +29,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerEventContent import kotlinx.android.synthetic.main.hmi_view_road_v2n_event_window.view.containerIconHint @@ -481,7 +482,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( ) tvV2XHintContent.text = dataBean.hintStr tvV2XTimeStr.text = - "更新时间：${DateTimeUtils.getTimeText(dataBean.timestamp, DateTimeUtils.HH_mm_ss)}" +// "更新时间：${DateTimeUtils.getTimeText(dataBean.timestamp, DateTimeUtils.HH_mm_ss)}" + "${StringUtils.getString(R.string.module_core_update_time)}${DateTimeUtils.getTimeText(dataBean.timestamp, DateTimeUtils.HH_mm_ss)}" if (dataBean.isNeedTTS && !TextUtils.isEmpty(dataBean.ttsStr)) { AIAssist.getInstance(context) .speakTTSVoiceWithLevel(dataBean.ttsStr, AIAssist.NEW_LEVEL_2) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index e85b9093b5..7166844d7f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -26,6 +26,7 @@ import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.SoundPoolUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.core.utilcode.util.Utils import com.zhjt.service_biz.BizConfig @@ -116,7 +117,8 @@ class PncActionsView @JvmOverloads constructor( && mTrafficLightResult != null && hasRedLight() ) { - actions += ",预计${getWaitTrafficLightTime()}秒后通过" +// actions += ",预计${getWaitTrafficLightTime()}秒后通过" + actions += StringUtils.getString(R.string.module_core_estimated_pass_time, getWaitTrafficLightTime()) } else { mTrafficLightResult = null } @@ -135,7 +137,8 @@ class PncActionsView @JvmOverloads constructor( } if (isPlanningFromServer && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { AIAssist.getInstance(Utils.getApp()) - .speakTTSVoiceWithLevel("正在使用云端规划通过路口", AIAssist.NEW_LEVEL_2) +// .speakTTSVoiceWithLevel("正在使用云端规划通过路口", AIAssist.NEW_LEVEL_2) + .speakTTSVoiceWithLevel(StringUtils.getString(R.string.module_core_using_cloud_planning_pass_intersection), AIAssist.NEW_LEVEL_2) } // update view if (actions.isNullOrEmpty()) { @@ -147,7 +150,8 @@ class PncActionsView @JvmOverloads constructor( tvHmiPncActions.text = actions } //voice tip - if(actions == "已超出ODD"){ +// if(actions == "已超出ODD"){ + if(actions == StringUtils.getString(R.string.module_core_has_exceeded_odd)){ val countDownTimer = object : CountDownTimer(3000, 1000){ override fun onTick(p0: Long) { try { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt index ccd59b32ec..5ccf661b71 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt @@ -31,6 +31,7 @@ import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiActio import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.util.ParseVersionUtils +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.zhjt.mogo.adas.common.MessageType @@ -426,7 +427,8 @@ class CheckSystemView @JvmOverloads constructor( if ( receivedAck.status == ReceivedAck.Status.NORMAL) { //一键停服命令回执成功，则正常进入停服阶段中，1分钟倒计时，并且TTS和消息盒子提示 CallerDevaToolsManager.setPowerOffStatus(2) - AIAssist.getInstance(context).speakTTSVoice("请等待1分钟再执行车辆下电") +// AIAssist.getInstance(context).speakTTSVoice("请等待1分钟再执行车辆下电") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_one_minute_later_power_off)) saveMsgBox( MsgBoxBean( MsgBoxType.V2X, V2XMsg( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index 59fb2f8e9d..d9c06d75c0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerColdStartStateListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.ResourceUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.mogo.adas.data.AdasConstants @@ -185,7 +186,8 @@ class ColdStartView @JvmOverloads constructor( when(status){ //主动断开连接 AdasConstants.IpcConnectionStatus.DISCONNECTED ->{ - showIPCConnectFailView("域控未连接或主动断开连接，建议重启车辆并上报问题") +// showIPCConnectFailView("域控未连接或主动断开连接，建议重启车辆并上报问题") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_disconnected)) } //连接中 AdasConstants.IpcConnectionStatus.CONNECTING ->{ @@ -201,13 +203,15 @@ class ColdStartView @JvmOverloads constructor( } //连接异常（鹰眼与域控连接失败、无法连接、非正常断开等） AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION ->{ - showIPCConnectFailView("本设备与域控未连接，建议检查WIFI状态、域控开关") +// showIPCConnectFailView("本设备与域控未连接，建议检查WIFI状态、域控开关") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_connect_exception)) // showIPCConnectFailView("域控连接异常，建议检查WiFi连接情况及域控是否开机") } //非法地址（连接模式为指定地址时：表示当前鹰眼调用连接时传入的域控地址错误或不符合规则【不修改默认配置不会出现此问题】； // 连接模式为PING模式时：表示传入的PING地址列表存在问题） AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS ->{ - showIPCConnectFailView("非法域控地址，建议重启车辆并上报问题") +// showIPCConnectFailView("非法域控地址，建议重启车辆并上报问题") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_illegal_address)) } //正在搜索域控地址 AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS ->{ @@ -217,23 +221,28 @@ class ColdStartView @JvmOverloads constructor( // 【不修改默认配置的情况下需要排查PAD是否连接车载路由器、工控机是否连接车载路由器、 // 工控机是否开机等】） AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS ->{ - showIPCConnectFailView("找不到域控可用地址，建议检查车载路由器及域控是否开机") +// showIPCConnectFailView("找不到域控可用地址，建议检查车载路由器及域控是否开机") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_not_found_address)) } //域控证书认证异常 AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED ->{ - showIPCConnectFailView("域控证书认证异常") +// showIPCConnectFailView("域控证书认证异常") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_certification_failed)) } //心跳超时（连接域控成功后在一段时间内未收到域控任何数据），超时时间： AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT ->{ - showIPCConnectFailView("心跳超时（连接域控成功后在一段时间内未收到域控任何数据）") +// showIPCConnectFailView("心跳超时（连接域控成功后在一段时间内未收到域控任何数据）") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_heartbeat_timeout)) } //協議不匹配（被连接的域控端非WebSocket协议【可能性非常低】） AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH ->{ - showIPCConnectFailView("协议不匹配") +// showIPCConnectFailView("协议不匹配") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_protocol_mismatch)) } //域控主动断开连接（域控主动发起断开WebSocket连接 AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED ->{ - showIPCConnectFailView("域控主动断开连接，建议重启车辆并上报问题") +// showIPCConnectFailView("域控主动断开连接，建议重启车辆并上报问题") + showIPCConnectFailView(StringUtils.getString(R.string.module_core_cold_ipc_server_disconnected)) } else -> {} @@ -259,7 +268,8 @@ class ColdStartView @JvmOverloads constructor( coldStartStatus = true showColdStartSuccessView() //冷启动成功埋点统计 - reason = "冷启动成功" +// reason = "冷启动成功" + reason = StringUtils.getString(R.string.module_core_cold_started_success) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartSuccess,reason) //记录冷启动成功时间 ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis()) @@ -294,7 +304,8 @@ class ColdStartView @JvmOverloads constructor( coldStartStatus = true showColdStartSuccessView() //冷启动成功埋点统计 - reason = "冷启动成功" +// reason = "冷启动成功" + reason = StringUtils.getString(R.string.module_core_cold_started_success) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartSuccess,reason) //记录冷启动成功时间 ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis()) @@ -333,7 +344,8 @@ class ColdStartView @JvmOverloads constructor( showColdStartSuccessView() } //冷启动成功埋点统计 - reason = "冷启动成功" +// reason = "冷启动成功" + reason = StringUtils.getString(R.string.module_core_cold_started_success) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartSuccess,reason) //记录冷启动成功时间 ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis()) @@ -342,7 +354,8 @@ class ColdStartView @JvmOverloads constructor( //展示冷启动失败视图 showColdStartFailView() //冷启动失败埋点统计 - reason = "SSM返回冷启动失败" +// reason = "SSM返回冷启动失败" + reason = StringUtils.getString(R.string.module_core_cold_start_failed_ssm) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartFail,reason) } nodeList.clear() @@ -412,13 +425,15 @@ class ColdStartView @JvmOverloads constructor( // 网络连接可用 connectWifiSuccess() //网络连接可用埋点统计 - reason = "网络连接可用" +// reason = "网络连接可用" + reason = StringUtils.getString(R.string.module_core_cold_network_usable) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.wifiConnectSuccess,reason) } else { // 网络连接不可用 showWifiConnecting() //网络连接不可用埋点统计 - reason = "网络连接不可用" +// reason = "网络连接不可用" + reason = StringUtils.getString(R.string.module_core_cold_network_unusable) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.wifiConnectFail,reason) } } @@ -436,23 +451,28 @@ class ColdStartView @JvmOverloads constructor( return when(state){ // 未开始 SsmInfo.CSState.COLD_START_DEFAULT->{ - "启动中…" +// "启动中…" + StringUtils.getString(R.string.module_core_starting) } // 启动中 SsmInfo.CSState.COLD_START_STARTING->{ - "启动中…" +// "启动中…" + StringUtils.getString(R.string.module_core_starting) } // 就绪 SsmInfo.CSState.COLD_START_READY->{ - "系统启动成功，即将进入主页" +// "系统启动成功，即将进入主页" + StringUtils.getString(R.string.module_core_cold_ipc_started) } // 有异常未就绪 SsmInfo.CSState.COLD_START_UNREADY->{ - "系统启动异常，建议重启车辆并上报问题" +// "系统启动异常，建议重启车辆并上报问题" + StringUtils.getString(R.string.module_core_cold_ipc_start_error) } // 超时 SsmInfo.CSState.COLD_START_TIMEOUT->{ - "系统启动超时，建议重启车辆并上报问题" +// "系统启动超时，建议重启车辆并上报问题" + StringUtils.getString(R.string.module_core_cold_ipc_start_timeout) } } } @@ -464,19 +484,23 @@ class ColdStartView @JvmOverloads constructor( return when(nodeStatus){ // 启动中 SsmInfo.NodeStatus.NODE_STARTING->{ - "启动中…" +// "启动中…" + StringUtils.getString(R.string.module_core_starting) } // 启动成功 SsmInfo.NodeStatus.NODE_FINISH->{ - "启动成功" +// "启动成功" + StringUtils.getString(R.string.module_core_cold_started_success1) } // 启动失败 SsmInfo.NodeStatus.NODE_FAILED->{ - "启动失败" +// "启动失败" + StringUtils.getString(R.string.module_core_cold_start_failed) } // 启动超时 SsmInfo.NodeStatus.NODE_TIMEOUT->{ - "启动超时" +// "启动超时" + StringUtils.getString(R.string.module_core_cold_start_timeout1) } } @@ -525,7 +549,8 @@ class ColdStartView @JvmOverloads constructor( rvFaultList.visibility = View.GONE //域控连接成功埋点统计 - reason = "域控连接成功" +// reason = "域控连接成功" + reason = StringUtils.getString(R.string.module_core_cold_ipc_connected) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectSuccess,reason) ssmConnectStatus = false coldStartStatus = false @@ -571,7 +596,8 @@ class ColdStartView @JvmOverloads constructor( ivFaultIcon.visibility = View.GONE rvFaultList.visibility = View.GONE //域控连接失败埋点统计 - this.reason = "域控连接失败：$failReason" +// this.reason = "域控连接失败：$failReason" + this.reason = "${StringUtils.getString(R.string.module_core_cold_ipc_connected_fail)}$failReason" ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectFail,reason) ssmConnectStatus = false coldStartStatus = false @@ -685,7 +711,8 @@ class ColdStartView @JvmOverloads constructor( tvSystemStartupTitle.text = resources.getString(R.string.cold_start_title_tel_wait) tvSystemStartupTitle.setTextColor(ContextCompat.getColor(context, R.color.white)) ivIpcConnectStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process)) - tvIpcConnectContent.text = "正在重连域控..." +// tvIpcConnectContent.text = "正在重连域控..." + tvIpcConnectContent.text = StringUtils.getString(R.string.module_core_cold_ipc_connecting) if(ipcRotationAnim == null){ ipcRotationAnim = ObjectAnimator.ofFloat(ivIpcConnectStatus, "rotation", 0f, 360f) } @@ -728,7 +755,8 @@ class ColdStartView @JvmOverloads constructor( //开始启动冷启动等待倒计时 coldStartProcess() //SSM连接成功埋点统计 - reason = "SSM连接成功" +// reason = "SSM连接成功" + reason = StringUtils.getString(R.string.module_core_cold_ssm_connected) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ssmConnectSuccess,reason) } ssmConnectStatus = true @@ -751,7 +779,8 @@ class ColdStartView @JvmOverloads constructor( tvSsmConnectContent.setTextColor(ContextCompat.getColor(context, R.color.white)) //展示冷启动连接过程视图 rvNodeList.visibility = View.VISIBLE - tvColdStartContent.text = "启动中…" +// tvColdStartContent.text = "启动中…" + tvColdStartContent.text = StringUtils.getString(R.string.module_core_starting) tvColdStartContent.setTextColor(ContextCompat.getColor(context, R.color.white)) ivColdStartStatus.setImageDrawable(ResourceUtils.getDrawable(R.drawable.icon_cold_start_process)) //开启冷启动连接状态动画 @@ -800,7 +829,8 @@ class ColdStartView @JvmOverloads constructor( //展示连接SSM失败视图 showSSMConnectFailView() //SSM连接失败埋点统计 - reason = "等待SSM超时" +// reason = "等待SSM超时" + reason = StringUtils.getString(R.string.module_core_cold_ssm_timeout) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ssmConnectFail,reason) } } @@ -828,7 +858,8 @@ class ColdStartView @JvmOverloads constructor( //展示冷启动失败视图 showColdStartFailView() //冷启动失败埋点统计 - reason = "等待冷启动超时" +// reason = "等待冷启动超时" + reason = StringUtils.getString(R.string.module_core_cold_ssm_await_timeout) ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartFail,reason) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt index e80206edee..c8aca7eafb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt @@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.zhjt.mogo.adas.data.AdasConstants import kotlinx.android.synthetic.main.view_connection_process.view.clConnectionTip @@ -222,7 +223,8 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) pbConnectionProgress.progress = 25 tvConnectionStatus.setPadding(0,0,0,10) - tvConnectionStatus.text = "系统启动中..." +// tvConnectionStatus.text = "系统启动中..." + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_starting) clConnectionTip.visibility = View.GONE } } @@ -239,7 +241,8 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style) pbConnectionProgress.progress = 50 tvConnectionStatus.setPadding(0,0,0,10) - tvConnectionStatus.text = "系统启动中..." +// tvConnectionStatus.text = "系统启动中..." + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_starting) clConnectionTip.visibility = View.GONE } } @@ -256,7 +259,8 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style) pbConnectionProgress.progress = 100 tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动成功" +// tvConnectionStatus.text = "系统启动成功" + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_started) clConnectionTip.visibility = View.GONE } } @@ -273,10 +277,13 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) pbConnectionProgress.progress = 25 tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" +// tvConnectionStatus.text = "系统启动异常" + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_start_error) clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "Telematics连接异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" +// tvConnectionTipTitle.text = "Telematics连接异常" + tvConnectionTipTitle.text = StringUtils.getString(R.string.module_core_ipc_tel_node_connect_error) +// tvConnectionTipContent.text = "建议重启车辆并上报问题" + tvConnectionTipContent.text = StringUtils.getString(R.string.module_core_reboot_car) } } } @@ -292,10 +299,13 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) pbConnectionProgress.progress = 50 tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" +// tvConnectionStatus.text = "系统启动异常" + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_start_error) clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "SSM连接异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" +// tvConnectionTipTitle.text = "SSM连接异常" + tvConnectionTipTitle.text = StringUtils.getString(R.string.module_core_cold_ssm_connect_error) +// tvConnectionTipContent.text = "建议重启车辆并上报问题" + tvConnectionTipContent.text = StringUtils.getString(R.string.module_core_reboot_car) } } } @@ -311,10 +321,13 @@ class ConnectionProcessView @JvmOverloads constructor( pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style) pbConnectionProgress.progress = 100 tvConnectionStatus.setPadding(0,0,0,0) - tvConnectionStatus.text = "系统启动异常" +// tvConnectionStatus.text = "系统启动异常" + tvConnectionStatus.text = StringUtils.getString(R.string.module_core_ipc_start_error) clConnectionTip.visibility = View.VISIBLE - tvConnectionTipTitle.text = "系统冷启动异常" - tvConnectionTipContent.text = "建议重启车辆并上报问题" +// tvConnectionTipTitle.text = "系统冷启动异常" + tvConnectionTipTitle.text = StringUtils.getString(R.string.module_core_cold_start_error) +// tvConnectionTipContent.text = "建议重启车辆并上报问题" + tvConnectionTipContent.text = StringUtils.getString(R.string.module_core_reboot_car) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt index c7a9d7a643..1221ef218b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/GreenWaveView.kt @@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.kotlin.scope import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import kotlinx.coroutines.Runnable import kotlinx.coroutines.launch import me.jessyan.autosize.utils.AutoSizeUtils @@ -154,11 +155,15 @@ class GreenWaveView: LinearLayout, IMoGoChassisLocationGCJ02Listener, RecyclerVi rv?.adapter = WaveAdapter() startAutoScroll() if (isDriver) { - driver_recommend_speed?.text = "建议车速${minSpeed}-${maxSpeed}km/h" - driver_recommend_cross?.text = "可丝滑通过${cross}个路口" +// driver_recommend_speed?.text = "建议车速${minSpeed}-${maxSpeed}km/h" + driver_recommend_speed?.text = StringUtils.getString(R.string.module_core_suggested_speed_test_range, minSpeed, maxSpeed) +// driver_recommend_cross?.text = "可丝滑通过${cross}个路口" + driver_recommend_cross?.text = StringUtils.getString(R.string.module_core_pass_intersection_count, cross) } else { - passenger_recommend_speed?.text = "建议车速${minSpeed}-${maxSpeed}km/h" - passenger_recommend_cross?.text = "可丝滑通过${cross}个路口" +// passenger_recommend_speed?.text = "建议车速${minSpeed}-${maxSpeed}km/h" + passenger_recommend_speed?.text = StringUtils.getString(R.string.module_core_suggested_speed_test_range, minSpeed, maxSpeed) +// passenger_recommend_cross?.text = "可丝滑通过${cross}个路口" + passenger_recommend_cross?.text = StringUtils.getString(R.string.module_core_pass_intersection_count, cross) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt index 55a0d76a28..19cf9856cf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerServicesEventManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.view.TravelRealityView +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import me.jessyan.autosize.utils.AutoSizeUtils import java.util.Random @@ -124,9 +125,18 @@ open class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: In val formattedMileage: String = String.format("%.1f", mileage/1000) val formattedSmartRoadLen: String = String.format("%.1f", smartRoadLen/1000) if(isDriver){ - tvSummaryZhiContent?.text = "全程 ${formattedMileage}km，智慧道路护航 ${(formattedSmartRoadLen)}km，全息感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次" +// tvSummaryZhiContent?.text = "全程 ${formattedMileage}km，智慧道路护航 ${(formattedSmartRoadLen)}km，全息感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次" + tvSummaryZhiContent?.text = StringUtils.getString( + R.string.module_core_trip_core_data_summary, + formattedMileage, + formattedSmartRoadLen, + (smartRoadLen * 100 / mileage).toInt(), + vehicleServiceNum + ) }else{ - tvSummaryZhiContent?.text = "旅途全长 $formattedMileage km，全感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次" +// tvSummaryZhiContent?.text = "旅途全长 $formattedMileage km，全感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次" + tvSummaryZhiContent?.text = + StringUtils.getString(R.string.module_core_trip_key_data, formattedMileage, (smartRoadLen * 100 / mileage).toInt(), vehicleServiceNum) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt index 08ee19e391..e9306a0052 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt @@ -29,6 +29,7 @@ import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI +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 mogo.yycp.paralleldriving.protocol.ParallelDrivingRequest.ParallelRequest @@ -207,7 +208,8 @@ class ParallelDriveView @JvmOverloads constructor( "TASK_REJECTED" -> {// 任务已被拒绝 state = FAILURE updateUI(FAILURE) - AIAssist.getInstance(context).speakTTSVoice("请求已被拒绝") +// AIAssist.getInstance(context).speakTTSVoice("请求已被拒绝") + AIAssist.getInstance(context).speakTTSVoice(StringUtils.getString(R.string.module_core_request_rejected)) } "PARALLEL_EXCEPTION_MANUAL_DRIVING" -> {// 异常请人工驾驶 @@ -388,7 +390,8 @@ class ParallelDriveView @JvmOverloads constructor( .setType(2)// 2:鹰眼请求 .setTakeover(1)// 1:请求平行驾驶接管 .setCode("PAD_ACTIVE") - parallelRequest.reason = "鹰眼请求" +// parallelRequest.reason = "鹰眼请求" + parallelRequest.reason = StringUtils.getString(R.string.module_core_eagle_eye_request) CallerAutoPilotControlManager.sendParallelDrivingReq( System.currentTimeMillis().toString(), parallelRequest.build() ) @@ -401,7 +404,8 @@ class ParallelDriveView @JvmOverloads constructor( .setType(2)// 2:鹰眼请求 .setTakeover(2)// 2:取消平行驾驶接管 .setCode("PAD_ACTIVE") - parallelRequest.reason = "鹰眼请求" +// parallelRequest.reason = "鹰眼请求" + parallelRequest.reason = StringUtils.getString(R.string.module_core_eagle_eye_request) CallerAutoPilotControlManager.sendParallelDrivingReq( System.currentTimeMillis().toString(), parallelRequest.build() ) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaDistanceView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaDistanceView.kt index 25186ee364..782d477ca5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaDistanceView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaDistanceView.kt @@ -13,6 +13,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener import com.mogo.eagle.core.function.call.map.CallerMapRomaListener import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import kotlinx.android.synthetic.main.view_roma_distance.view.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -39,9 +40,11 @@ class RomaDistanceView @JvmOverloads constructor( } if (disChangeColor) { romaDistanceMeter.text = - Html.fromHtml("漫游距离${dis}米") +// Html.fromHtml("漫游距离${dis}米") + Html.fromHtml("${StringUtils.getString(R.string.module_core_roaming_distance)}${dis}${StringUtils.getString(R.string.module_och_m)}") } else { - romaDistanceMeter.text = "漫游距离${dis}米" +// romaDistanceMeter.text = "漫游距离${dis}米" + romaDistanceMeter.text = "${StringUtils.getString(R.string.module_core_roaming_distance)}${dis}${StringUtils.getString(R.string.module_och_m)}" } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 2227945b0f..5496d4b2c7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -110,12 +110,21 @@ class SystemVersionView @JvmOverloads constructor( // ToastUtils.showShort("下载已完成") ToastUtils.showShort(R.string.module_mogo_core_function_hmi_download_complete) } else { +// ToastUtils.showShort( +// "预计" + AdUpgradeStateHelper.getRemainingTime( +// progressDetail.total, +// previousProgress, +// currentProgress +// ) + "下载完成" +// ) ToastUtils.showShort( - "预计" + AdUpgradeStateHelper.getRemainingTime( - progressDetail.total, - previousProgress, - currentProgress - ) + "下载完成" + StringUtils.getString( + R.string.module_core_estimated_download_complete, AdUpgradeStateHelper.getRemainingTime( + progressDetail.total, + previousProgress, + currentProgress + ) + ) ) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/util/FrameAnimatorContainerUtils.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/util/FrameAnimatorContainerUtils.kt index 805f0043d7..68ec89c9f5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/util/FrameAnimatorContainerUtils.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/util/FrameAnimatorContainerUtils.kt @@ -8,7 +8,9 @@ import android.os.Looper import android.os.Message import android.widget.ImageView import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadPoolManagerUtils import java.lang.ref.SoftReference import java.util.concurrent.ArrayBlockingQueue @@ -115,7 +117,8 @@ class FrameAnimatorContainerUtils (resId: Int, heightImage = bmp.height config = bmp.config }catch (e:Exception){ - throw RuntimeException("请设置图片或传递大小") +// throw RuntimeException("请设置图片或传递大小") + throw RuntimeException(StringUtils.getString(R.string.module_core_set_image)) } } // 当图片大小类型相同时进行复用，避免频繁GC diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt index db94728454..7143b0f3fe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt @@ -46,6 +46,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ProcessUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.mogo.adas.data.AdasConstants import com.zhjt.service.chain.ChainLog @@ -90,7 +91,8 @@ open class MainActivity : MvpActivity(), MainView, return } //申请悬浮窗权限 - PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG) +// PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG) + PermissionsDialogUtils.openAppDetails(this, StringUtils.getString(R.string.module_core_show_pop_window), REQUEST_CODE_DIALOG) } // todo 优化 车聊聊 @@ -369,23 +371,28 @@ open class MainActivity : MvpActivity(), MainView, isAllGranted = false when (permissions[index]) { Manifest.permission.RECORD_AUDIO -> { - reasong.append("录音机、") +// reasong.append("录音机、") + reasong.append(StringUtils.getString(R.string.module_core_record_audio)).append(StringUtils.getString(R.string.module_core_comma)) } // Manifest.permission.BLUETOOTH -> { // reasong.append("蓝牙、") // } Manifest.permission.READ_EXTERNAL_STORAGE -> { - reasong.append("读取外部文件、") +// reasong.append("读取外部文件、") + reasong.append(StringUtils.getString(R.string.module_core_read_external_storage)).append(StringUtils.getString(R.string.module_core_comma)) } Manifest.permission.WRITE_EXTERNAL_STORAGE -> { - reasong.append("写入外部文件、") +// reasong.append("写入外部文件、") + reasong.append(StringUtils.getString(R.string.module_core_write_external_storage)).append(StringUtils.getString(R.string.module_core_comma)) } Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION -> { isLocationGranted = false - if(!reasong.contains("定位")){ - reasong.append("定位、") +// if(!reasong.contains("定位")){ + if(!reasong.contains(StringUtils.getString(R.string.module_core_location))){ +// reasong.append("定位、") + reasong.append(StringUtils.getString(R.string.module_core_location)).append(StringUtils.getString(R.string.module_core_comma)) } } else -> {} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_v2n_event_live_play.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_v2n_event_live_play.xml index e813cb46ce..6f7af0589d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_v2n_event_live_play.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_v2n_event_live_play.xml @@ -7,12 +7,13 @@ android:layout_height="match_parent" android:background="@drawable/bg_v2n_event_live_play_passenger"> + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml index 61a3f72a1d..95feaa0341 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml @@ -25,13 +25,14 @@ android:layout_marginStart="25dp" /> + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml index 00c63fb177..cbcf648510 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml @@ -20,11 +20,12 @@ app:isUseSkin="true" /> + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml index 81fe42c1e5..cb97a95ea8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml @@ -25,6 +25,7 @@ android:src="@drawable/icon_msg_box_operation" /> + - + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml index 758e1e4a6b..948517b688 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml @@ -22,11 +22,12 @@ app:isUseSkin="true" /> + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml index f488699d48..ac74a546f2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml @@ -22,6 +22,7 @@ android:src="@drawable/icon_msg_box_operation" /> + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml index af7303e9c6..ad43e82c5c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml @@ -10,11 +10,12 @@ android:layout_marginBottom="16dp" > + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_operate_panel_preference_widget_radio_group_custom.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_operate_panel_preference_widget_radio_group_custom.xml index e8feb813b6..2daaa4c313 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_operate_panel_preference_widget_radio_group_custom.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_operate_panel_preference_widget_radio_group_custom.xml @@ -57,12 +57,14 @@ android:button="@null" android:background="@drawable/bg_radio_button_operate_panel_unman_interval" tools:ignore="HardcodedText,SpUsage" /> + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notification_v2x_msg_vr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notification_v2x_msg_vr.xml index 124033cb5a..eaf8f0d624 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notification_v2x_msg_vr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notification_v2x_msg_vr.xml @@ -21,12 +21,13 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + @@ -240,13 +241,14 @@ + + + + + + + + + + + @@ -64,6 +66,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +