diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt index 6d000c90f3..04ebcd6caa 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt @@ -2,7 +2,9 @@ package com.mogo.och.charter.passenger.bean.response import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.BaseData +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil +import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.utils.DateTimeUtil /** @@ -73,10 +75,14 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() { fun getProductTypeName(): String { return when (productType) { - M1_LOVE -> "爱情号" - M1_FAMILY -> "家庭号" - M1_FRIENDLY -> "朋友号" - else -> "未知" +// M1_LOVE -> "爱情号" + M1_LOVE -> StringUtils.getString(R.string.module_och_m1_love) +// M1_FAMILY -> "家庭号" + M1_FAMILY -> StringUtils.getString(R.string.module_och_m1_family) +// M1_FRIENDLY -> "朋友号" + M1_FRIENDLY -> StringUtils.getString(R.string.module_och_m1_friendly) +// else -> "未知" + else -> StringUtils.getString(R.string.module_core_unknown) } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index f39e042cca..fa49f0d7b6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -440,7 +440,8 @@ object CharterPassengerModel { GcjLon = null, seq = null, type = null, - introduction = "简介" +// introduction = "简介" + introduction = StringUtils.getString(R.string.module_och_synopsis) ) return Pair(lineInfo, targetSizt) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt index 92d0e7807f..b4ab6563a7 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt @@ -1,6 +1,8 @@ package com.mogo.och.charter.passenger.presenter import androidx.lifecycle.LifecycleOwner +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment @@ -33,13 +35,16 @@ class CharterPassengerNoviceGuidancePresenter(view: NoviceGuidanceFragment?) : } when (it.productType) { OrderInfoResponse.M1_LOVE -> { - mView?.setProductType("爱情号") +// mView?.setProductType("爱情号") + mView?.setProductType(StringUtils.getString(R.string.module_och_m1_love)) } OrderInfoResponse.M1_FAMILY -> { - mView?.setProductType("家庭号") +// mView?.setProductType("家庭号") + mView?.setProductType(StringUtils.getString(R.string.module_och_m1_family)) } OrderInfoResponse.M1_FRIENDLY -> { - mView?.setProductType("朋友号") +// mView?.setProductType("朋友号") + mView?.setProductType(StringUtils.getString(R.string.module_och_m1_friendly)) } else -> { mView?.setProductType("") diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt index ed2160557b..1a87fc76d6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt @@ -6,6 +6,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse @@ -52,7 +53,8 @@ object DriverMessage: IReceivedMsgListener { } if(msg.isPlay){ VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) - if(msg.msg.contains("核销成功")){ +// if(msg.msg.contains("核销成功")){ + if(msg.msg.contains(StringUtils.getString(R.string.module_och_verification_success))){ val string = SkinResources.getInstance().getString(R.string.charter_p_welcome_tts) VoiceNotice.showNotice(string, AIAssist.LEVEL1,4_000) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt index 7b2eae26b7..5c4fff2682 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt @@ -215,14 +215,16 @@ class NoviceGuidanceFragment : include_welcome.visibility = View.VISIBLE actv_start_guildance.visibility = View.VISIBLE group_complete_guidance.visibility = View.GONE - actv_click_go_explore.text = "点击开始探索" +// actv_click_go_explore.text = "点击开始探索" + actv_click_go_explore.text = StringUtils.getString(R.string.module_och_click_start) pageStatus = PageStatus.Startpage } if (complierGuidance) { include_welcome.visibility = View.VISIBLE actv_start_guildance.visibility = View.GONE group_complete_guidance.visibility = View.VISIBLE - actv_click_go_explore.text = "点我进入主页" +// actv_click_go_explore.text = "点我进入主页" + actv_click_go_explore.text = StringUtils.getString(R.string.module_och_click_home) pageStatus = PageStatus.EndPage mPresenter?.exitDialogFragment() } @@ -316,7 +318,10 @@ class NoviceGuidanceFragment : } fun setProductType(type: String) { - actv_start_guildance.text = "欢迎乘坐${SkinResources.getInstance().getString(R.string.operation_platform_name)}车联自动驾驶$type!" +// actv_start_guildance.text = "欢迎乘坐${SkinResources.getInstance().getString(R.string.operation_platform_name)}车联自动驾驶$type!" + actv_start_guildance.text = "${StringUtils.getString(R.string.module_och_welcome_ride)}${ + SkinResources.getInstance().getString(R.string.operation_platform_name) + }${StringUtils.getString(R.string.module_och_welcome_ride1)}$type!" } companion object { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt index e36d40e5a7..26d2f0ddba 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt @@ -10,6 +10,7 @@ import android.view.MotionEvent import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.charter_p_devices_unlock.view.aciv_only_unlock @@ -133,17 +134,20 @@ class UnlockView : ConstraintLayout, LockManager.LockStatusCallback { when (isLock) { LockManager.LockStatus.LOCKED -> { // 锁定 - actv_lock_status.text = "长按开锁键2秒,快速解锁" +// actv_lock_status.text = "长按开锁键2秒,快速解锁" + actv_lock_status.text = StringUtils.getString(R.string.module_och_long_click_unlock) aciv_only_unlock.setImageResource(R.drawable.charter_p_only_lock) } LockManager.LockStatus.UNLOCKING -> { // 开锁中 - actv_lock_status.text = "开锁中.." +// actv_lock_status.text = "开锁中.." + actv_lock_status.text = StringUtils.getString(R.string.module_och_long_click_unlocking) aciv_only_unlock.setImageResource(R.drawable.charter_p_only_unlocking) } LockManager.LockStatus.UNLOCK -> { // 解锁成功 - actv_lock_status.text = "已解锁" +// actv_lock_status.text = "已解锁" + actv_lock_status.text = StringUtils.getString(R.string.module_och_long_click_unlocked) aciv_only_unlock.setImageResource(R.drawable.charter_p_only_unlock) } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt index 650b081eeb..7ce3da5340 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt @@ -8,6 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.callback.IClearViewCallback import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_contain_order @@ -86,7 +87,8 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } override fun setLeftTime(leftTime:String){ - actv_left_time.text = "剩余时间 $leftTime" +// actv_left_time.text = "剩余时间 $leftTime" + actv_left_time.text = "${StringUtils.getString(R.string.module_och_time_remaining)} $leftTime" } override fun setStartTimeAndEndTime(startTime:String,endTime:String){ diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt index 4a1bb3f6c9..78e8137584 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.callback.ITimeCallback @@ -51,7 +52,8 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback { }else{ viewCallback?.setPhone("----") viewCallback?.setStartTimeAndEndTime("--:---", "--:--") - viewCallback?.setLeftTime("剩余时间 --:--") +// viewCallback?.setLeftTime("剩余时间 --:--") + viewCallback?.setLeftTime("${StringUtils.getString(R.string.module_och_time_remaining)} --:--") } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index cb45d7b852..b1fd4cb990 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.Temperature @@ -547,7 +548,8 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba } SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) if (isChecked) {//打开 - tv_aircondition_switch.setText("关闭空调") +// tv_aircondition_switch.setText("关闭空调") + tv_aircondition_switch.setText(StringUtils.getString(R.string.module_och_off_air_conditioner)) if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) { openHeater()// 打开暖风机 } else { @@ -555,7 +557,8 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba } showAni() } else {// 关闭 - tv_aircondition_switch.setText("打开空调") +// tv_aircondition_switch.setText("打开空调") + tv_aircondition_switch.setText(StringUtils.getString(R.string.module_och_on_air_conditioner)) closeHeater()// 关闭暖风机 closeAircondition()//关闭空调 } @@ -725,11 +728,13 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba ) { tv_aircondition_switch?.let { if (!airIsOpen && !heaterIsOpen) { - tv_aircondition_switch.text = "打开空调" +// tv_aircondition_switch.text = "打开空调" + tv_aircondition_switch.text = StringUtils.getString(R.string.module_och_on_air_conditioner) tv_aircondition_switch.isChecked = false dbv_wind.visibility = View.GONE } else { - tv_aircondition_switch.text = "关闭空调" +// tv_aircondition_switch.text = "关闭空调" + tv_aircondition_switch.text = StringUtils.getString(R.string.module_och_off_air_conditioner) tv_aircondition_switch.isChecked = true dbv_wind.visibility = View.VISIBLE } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt index 112a4777e9..df37fa0dc9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt @@ -19,6 +19,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.charter.passenger.R import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse @@ -122,7 +123,8 @@ class StatusBarView @JvmOverloads constructor( private fun setAutoPilotStatusInfo(state: Int) { if (FunctionBuildConfig.isDemoMode) {// 美化模式 - actv_auto_status.text = "自动驾驶中" +// actv_auto_status.text = "自动驾驶中" + actv_auto_status.text = StringUtils.getString(R.string.module_och_autonomous_driving) when (CharterPassengerModel.getCurrentOrderStatus()) { OrderStatusEnum.Nothing -> {// 初始状态 //是否强制绘制引导线 @@ -160,16 +162,20 @@ class StatusBarView @JvmOverloads constructor( }else{ when (state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> { - actv_auto_status.text = "安全接管中" +// actv_auto_status.text = "安全接管中" + actv_auto_status.text = StringUtils.getString(R.string.module_och_during_safe_handover_process) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> { - actv_auto_status.text = "安全接管中" +// actv_auto_status.text = "安全接管中" + actv_auto_status.text = StringUtils.getString(R.string.module_och_during_safe_handover_process) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - actv_auto_status.text = "自动驾驶中" +// actv_auto_status.text = "自动驾驶中" + actv_auto_status.text = StringUtils.getString(R.string.module_och_autonomous_driving) } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - actv_auto_status.text = "远程代驾中" +// actv_auto_status.text = "远程代驾中" + actv_auto_status.text = StringUtils.getString(R.string.module_och_parallel_driving) } else -> {} } diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml index e6e33a09fc..fd722a2099 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml @@ -26,13 +26,13 @@ android:layout_width="@dimen/dp_193" android:layout_height="@dimen/dp_107"/> - + + + + + + + diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml index e08027d567..8765ad2aae 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml @@ -7,11 +7,12 @@ tools:ignore="MissingDefaultResource" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + + + + + + diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml index 51b4ad4b2c..93358abc03 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml @@ -39,18 +39,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + + + + + + @@ -29,6 +30,7 @@ android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_16"/> + diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml index cce3ce5101..e4c8abe367 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml @@ -21,6 +21,7 @@ android:layout_height="wrap_content" app:isUseSkin="true"/> + + + + + + - + + + + + + + + + + @@ -93,6 +96,7 @@ app:layout_constraintHeight_percent="0.5" app:layout_constraintStart_toStartOf="@+id/iv_aircondition" /> + + + + + + + + + + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml index f1b42f37cb..9eb17339b7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_list_item.xml @@ -6,6 +6,7 @@ android:layout_height="@dimen/dp_91" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + @@ -30,6 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + diff --git a/core/mogo-core-res/src/main/res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml index 5d1ca8cdf8..b1073024b5 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -335,13 +335,66 @@ 暂无线路 暂无班次 请尽快操作车辆至适当位置掉头! - 核销成功 + 核销成功 即将前往路线%s、站点%s;如需掉头请尽快操作车辆至适当位置! 靠边停车无响应,注意随时接管 靠边停车失败,注意随时接管 开始靠边停车 向右滑动 上传全路径 + 爱情号 + 家庭号 + 朋友号 + 简介 + 点击开始探索 + 点我进入主页 + 欢迎乘坐 + 车联自动驾驶 + 长按开锁键2秒,快速解锁 + 开锁中.. + 已解锁 + 剩余时间 + 剩余时间 --:-- + 空 调 + 关闭空调 + 打开空调 + 自动驾驶中 + 安全接管中 + 远程代驾中 + 关车门 + 开车门 + 音乐 + 音乐列表 + 音乐名称 + 轻柔 + 设置 + 线路 + 出发 + 订单空空~ + 剩余包车时长 + 到站 + 展示引导页面 + 切换模型 + 显示结束页面 + 用车时间 + 用车时间: + 结束用车 + 继续用车 + 太棒了! + 用户信息: + 点击开始探索 + 确认 + 确认完毕! + 小助手已记录您的选择。 + 啊哦,加载失败了\n联系车内领航员,或尝试再次提交。 + 加载中 请稍等 + 网络不佳 + 当前暂无订单 + 灯 光 + 声 音 + 音量 + HH:mm MM月dd日 EEEE + PadTTS 模块初始化异常