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 4e35ecc62b..ee65188494 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 @@ -21,6 +21,7 @@ import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.skin.utils.SkinResources import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_01 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_02 @@ -315,7 +316,7 @@ class NoviceGuidanceFragment : } fun setProductType(type: String) { - actv_start_guildance.text = "欢迎乘坐蘑菇车联自动驾驶$type!" + actv_start_guildance.text = "欢迎乘坐${SkinResources.getInstance().getString(R.string.operation_platform_name)}车联自动驾驶$type!" } companion object { 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 b4ea1a4e3b..8df2130628 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 @@ -105,7 +105,7 @@ 自驾系统繁忙,稍后再试试吧~ %1$s就要到啦! 稍后再来看看吧 + + + 欢迎乘坐蘑菇车联自动驾驶! + 稍等,亲\n蘑菇小助手正在为您确认信息… + 要提前说再见了吗?蘑菇小助手很舍不得您呢! + 您已完成乘车指南,更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快! diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 1a2dd6d88b..8eafd72d76 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -45,6 +45,7 @@ import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.data.taxi.OrderQueryRouteInfoRespBean; import com.mogo.och.taxi.model.TaxiModel; +import com.mogo.skin.utils.SkinResources; import java.util.Calendar; import java.util.List; @@ -586,7 +587,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment mTtsLessThan200Tip = 0; isFirstStartAutopilotDone = true; mOrderCancel.setVisibility(View.GONE); - VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~"); + VoiceNotice.showNotice("感谢您使用"+ SkinResources.getInstance().getString(R.string.operation_platform_name)+"智行,再见~"); showOrHideNavi(false); break; } diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml index f9238f26a6..9c490d554a 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml @@ -115,7 +115,7 @@ app:backageViewId="@+id/actv_video_press" app:selectedDrawable="@drawable/taxt_p_bottom_video_press" app:normalDrawable="@drawable/taxt_p_bottom_video_normal" - app:bottomTitle="蘑菇资讯" + app:bottomTitle="@string/actv_video_title" android:layout_marginStart="@dimen/dp_107" app:bottomTitleCheckedColor="@color/white" app:bottomTitleNormalColor="@color/taxi_cp_41444D" diff --git a/OCH/taxi/pcommon/src/main/res/values/strings.xml b/OCH/taxi/pcommon/src/main/res/values/strings.xml index aa556a2245..534691eb56 100644 --- a/OCH/taxi/pcommon/src/main/res/values/strings.xml +++ b/OCH/taxi/pcommon/src/main/res/values/strings.xml @@ -2,4 +2,6 @@ 亮度 音量 + + 蘑菇资讯 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index e6271b1d69..e60820ae89 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoV2nNioEventListener import com.mogo.eagle.core.function.api.hmi.xiaozhi.event.V2N import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State.START import com.mogo.eagle.core.function.api.hmi.xiaozhi.state.State.STOP +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager @@ -45,6 +46,7 @@ import com.mogo.eagle.function.biz.v2x.v2n.utils.EventDismissBean import com.mogo.eagle.function.biz.v2x.v2n.utils.EventDismissManager import com.mogo.eagle.function.biz.v2x.v2n.utils.IEventDismissListener import com.mogo.eagle.function.biz.v2x.v2n.utils.V2XEventAnalyticsManager +import com.mogo.skin.utils.SkinResources import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.delay @@ -152,7 +154,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } } val content = "发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }" - val tts = "$content, 蘑菇提醒您小心行人及来车" + val tts = "$content, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您小心行人及来车" V2XBizTrace.onAck(TAG, "绘制poi事件:$poiType") saveMsgBox( MsgBoxBean( @@ -278,11 +280,11 @@ internal object V2NIdentifyDrawer: IEventDismissListener { val speakText = StringBuilder("保持当前车速即可通过路口,好丝滑!") if (current < min) { speakText.setLength(0) - speakText.append("蘑菇推荐您提升车速至${min}千米每小时, 当前车速${current}千米每小时") + speakText.append("${SkinResources.getInstance().getString(R.string.operation_platform_name)}推荐您提升车速至${min}千米每小时, 当前车速${current}千米每小时") } if (current > max) { speakText.setLength(0) - speakText.append("蘑菇推荐您降低车速至${max}千米每小时, 当前车速${current}千米每小时") + speakText.append("${SkinResources.getInstance().getString(R.string.operation_platform_name)}推荐您降低车速至${max}千米每小时, 当前车速${current}千米每小时") } val tts = speakText.toString() alertTts = tts diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt index fc64c1e0fb..46655df06b 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt @@ -5,6 +5,7 @@ import com.google.gson.JsonObject import com.mogo.commons.constants.HostConst import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseResponse +import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.chat.UserInfo import com.mogo.eagle.core.function.api.chat.biz.ChatConsts import com.mogo.eagle.core.function.api.chat.biz.IMCallType.CALL_TYPE_VOICE @@ -12,6 +13,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.chat.facade.net.bean.* import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.skin.utils.SkinResources import retrofit2.http.* @@ -51,7 +53,8 @@ internal class ChatServiceModel { return@let Pair(null, null) } result.sn = userInfo.get("sn")?.takeIf { !it.isJsonNull }?.asString ?: sn - result.name = userInfo.get("userNickName")?.takeIf { !it.isJsonNull }?.asString ?: "小蘑菇" + result.name = userInfo.get("userNickName")?.takeIf { !it.isJsonNull }?.asString ?: "${SkinResources.getInstance().getString( + R.string.operation_platform_name)}" result.icon = userInfo.get("headImgUrl")?.takeIf { !it.isJsonNull }?.asString result.sex = userInfo.get("cardIdSex")?.takeIf { !it.isJsonNull }?.asString ?: "未设置" result.age = userInfo.get("cardIdAge")?.takeIf { !it.isJsonNull }?.asString diff --git a/core/function-impl/mogo-core-function-datacenter/build.gradle b/core/function-impl/mogo-core-function-datacenter/build.gradle index 1e1721f3b6..1039f768ea 100644 --- a/core/function-impl/mogo-core-function-datacenter/build.gradle +++ b/core/function-impl/mogo-core-function-datacenter/build.gradle @@ -64,6 +64,7 @@ dependencies { implementation rootProject.ext.dependencies.mogoaicloudtelematic compileOnly project(':core:function-impl:mogo-core-function-map') implementation project(':core:mogo-core-function-call') + implementation project(':core:mogo-core-res') implementation project(":foudations:mogo-commons") } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index b874c07fee..1824a5bb98 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context +import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.CommunicationType @@ -26,6 +27,7 @@ import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.util.ConvertUtils +import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuScene import com.zhidao.support.obu.constants.MogoObuShowConstants import kotlin.math.roundToInt @@ -629,9 +631,9 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "蘑菇路侧提醒您,推荐保持当前车速通过路口" + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持当前车速通过路口" } else { - "蘑菇路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 9307fc3ecd..daed0329ee 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context +import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig @@ -25,6 +26,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ConvertUtils import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuBase import com.mogo.support.obu.ObuScene import com.mogo.support.obu.constants.* @@ -1111,9 +1113,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { if (currentSpeed > 0) { ttsContentNew = if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) { - "蘑菇路侧提醒您,推荐保持当前车速通过路口" + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持当前车速通过路口" } else { - "蘑菇路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口" } alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H" } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 48fff17aeb..5607717009 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -28,11 +28,13 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.mogo.eagle.core.function.datacenter.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.skin.utils.SkinResources import com.zhjt.service.chain.ChainLog import perception.FusionTrafficLightOuterClass import kotlin.math.abs @@ -242,7 +244,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerMapRoadListenerManager.getStopLineDistance()?.let { dis-> if(currentSpeed*light.duration < dis){ //语音播放:蘑菇提醒您及时减速,避免路口急刹 - AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速,避免路口急刹") + AIAssist.getInstance(mContext).speakTTSVoice( + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速,避免路口急刹") isPrompted = true } } @@ -252,7 +255,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerMapRoadListenerManager.getStopLineDistance()?.let{distance-> if(currentSpeed*light.duration*1.1 < distance){ //语音播放:蘑菇提醒您及时减速,避免路口急刹 - AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速,避免路口急刹") + AIAssist.getInstance(mContext).speakTTSVoice( + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速,避免路口急刹") isPrompted = true } } @@ -262,7 +266,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerMapRoadListenerManager.getStopLineDistance()?.let{distance-> if(currentSpeed*0.4*light.duration > distance){ //语音播放:蘑菇提醒您及时减速,避免路口急刹 - AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速,避免路口急刹") + AIAssist.getInstance(mContext).speakTTSVoice( + "${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速,避免路口急刹") isPrompted = true } } 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 a5676075e5..35440e2897 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 @@ -35,6 +35,7 @@ import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout +import com.mogo.skin.utils.SkinResources class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter() { @@ -210,7 +211,7 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter< }else if(it[position].msgBoxBean.type == MsgBoxType.V2X && it[position].msgBoxBean.sourceType == DataSourceType.SUMMARY){ //汇总消息 val summaryMsg = it[position].msgBoxBean.bean as V2XMsg - holder.tvV2XTitle.text = "蘑菇小助手" + holder.tvV2XTitle.text = SkinResources.getInstance().getString(R.string.summary_title) holder.tvV2XContent.text = summaryMsg.content holder.ivV2XImage.setImageDrawable( ContextCompat.getDrawable( 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 74b91d1a30..f87aa2b37e 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 @@ -27,6 +27,7 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.skin.utils.SkinResources /** @@ -161,7 +162,8 @@ open class AutomaticExplorationView @JvmOverloads constructor( rotationAnim?.cancel() //语音播放,只在司机端播放 if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常蘑菇型车助手将持续守候您的出行") + AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常${SkinResources.getInstance().getString( + R.string.operation_platform_name)}型车助手将持续守候您的出行") } //5秒后关闭弹窗 val hideViewTimer =object: CountDownTimer(EXPLORATION_HIDE_TIME,EXPLORATION_HIDE_TIME){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml index c77dabafe0..70c16ece7d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml @@ -23,7 +23,7 @@ android:id="@+id/tvMSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FF203555" android:textSize="25dp" android:layout_marginStart="10dp" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_summary.xml index 319543cb67..9aece8bf45 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_summary.xml @@ -19,7 +19,7 @@ android:id="@+id/tvMSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FF203555" android:textSize="25dp" android:layout_marginStart="20dp" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_summary.xml index 9f2439221a..64cf2b811d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_summary.xml @@ -27,7 +27,7 @@ android:id="@+id/tvSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FFFFFFFF" android:textSize="32dp" app:layout_constraintLeft_toRightOf="@id/ivSummaryImage" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_summary.xml index 25f2eedcd9..c6a4cf9a80 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_summary.xml @@ -25,7 +25,7 @@ android:id="@+id/tvSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FFFFFFFF" android:textSize="32dp" app:layout_constraintLeft_toRightOf="@id/ivSummaryImage" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml index 971b7cddd1..371f41c5c9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml @@ -23,7 +23,7 @@ android:id="@+id/tvPassengerSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FF243959" android:textSize="36dp" android:layout_marginStart="20dp" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_summary.xml index 964715f577..481d084494 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_summary.xml @@ -18,7 +18,7 @@ android:id="@+id/tvPassengerSummaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="蘑菇小助手" + android:text="@string/summary_title" android:textColor="#FFFFFFFF" android:textSize="36dp" android:layout_marginStart="20dp" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml index 102861b623..6029cd0ce3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml @@ -20,8 +20,10 @@ android:background="@drawable/main_splash_bg"> 6666.toString(), "超速", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, content = "当前路段限速 %s KM/H,已超速", - tts = "蘑菇路侧提醒您,当前路段限速 %s 千米每小时,已超速" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,当前路段限速 %s 千米每小时,已超速" ), //------------道路危险情况预警 obu end -----------> @@ -323,161 +324,161 @@ enum class EventTypeEnumNew( "急转弯", poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left_sharp, content = "前方%s米急转弯", - tts = "蘑菇路侧提醒您,前方%s米急转弯" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米急转弯" ), TYPE_ID_BRIDGE( 8.toString(), "桥梁", poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge, content = "前方%s米桥梁", - tts = "蘑菇路侧提醒您,前方%s米桥梁" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米桥梁" ), TYPE_ID_PEDESTRIAN( 10.toString(), "路人", poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, content = "前方%s米路人", - tts = "蘑菇路侧提醒您,前方%s米路人" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路人" ), TYPE_ID_SLIPPERY_ROAD( 17.toString(), "路滑", poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr, content = "前方%s米路滑", - tts = "蘑菇路侧提醒您,前方%s米路滑" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路滑" ), TYPE_ID_TUNNEL( 21.toString(), "隧道", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米隧道", - tts = "蘑菇路侧提醒您,前方%s米隧道" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米隧道" ), TYPE_ID_FERRY( 22.toString(), "渡轮", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米渡轮", - tts = "蘑菇路侧提醒您,前方%s米渡轮" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米渡轮" ), TYPE_ID_UNEVEN_ROAD( 24.toString(), "路面不平", poiTypeSrcVr = R.drawable.icon_warning_road_hollow, content = "前方%s米路面不平", - tts = "蘑菇路侧提醒您,前方%s米路面不平" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米路面不平" ), TYPE_ID_NON_MOTOR_VEHICLE( 32.toString(), "非机动车", poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, content = "前方%s米有非机动车", - tts = "蘑菇路侧提醒您,前方%s米有非机动车" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米有非机动车" ), TYPE_ID_OBSTACLE( 36.toString(), "障碍", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米障碍", - tts = "蘑菇路侧提醒您,前方%s米障碍" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米障碍" ), TYPE_FOURS_ROAD_WORK( 38.toString(), "施工", poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, content = "前方%s米施工", - tts = "蘑菇路侧提醒您,前方%s米施工" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米施工" ), TYPE_VEHICLE_QUEUE( 47.toString(), "车队", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米车队", - tts = "蘑菇路侧提醒您,前方%s米车队" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米车队" ), TYPE_NO_PASSING( 51.toString(), "道路不通", poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, content = "前方%s米不通", - tts = "蘑菇路侧提醒您,前方%s米不通" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米不通" ), TYPE_NO_TURNING_AROUND( 75.toString(), "禁止掉头", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米禁止掉头", - tts = "蘑菇路侧提醒您,前方%s米禁止掉头" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米禁止掉头" ), TYPE_USECASE_ID_ROAD_NO_PARKING( 78.toString(), "禁止停车", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, content = "前方%s米有禁停路段", - tts = "蘑菇路侧提醒您,前方%s米有禁停路段" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米有禁停路段" ), TYPE_USECASE_ID_ROAD_NO_TOOTING( 80.toString(), "禁止鸣笛", poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting, content = "前方%s米禁止鸣笛", - tts = "蘑菇路侧提醒您,前方%s米禁止鸣笛" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米禁止鸣笛" ), TYPE_USECASE_ID_BUS_WARNING( 123.toString(), "公交提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, content = "前方%s米公交提醒", - tts = "蘑菇路侧提醒您,前方%s米公交提醒" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米公交提醒" ), TYPE_USECASE_ID_NARROW_RIGHT( 163.toString(), "右侧变窄/车道数减少", poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米右侧变窄/车道数减少", - tts = "蘑菇路侧提醒您,前方%s米右侧变窄/车道数减少" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米右侧变窄/车道数减少" ), TYPE_USECASE_ID_GAS_STATION( 201.toString(), "加油站", poiTypeSrcVr = R.drawable.icon_warning_gas_station, content = "前方%s米加油站", - tts = "蘑菇路侧提醒您,前方%s米加油站" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米加油站" ), TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL( 242.toString(), "学校", poiTypeSrcVr = R.drawable.icon_warning_v2x_school, content = "前方%s米学校", - tts = "蘑菇路侧提醒您,前方%s米学校" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米学校" ), TYPE_USECASE_ID_ACCIDENT( 244.toString(), "交通事故", poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr, content = "前方%s米交通事故", - tts = "蘑菇路侧提醒您,前方%s米交通事故" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米交通事故" ), TYPE_USECASE_ROAD_BUS_STATION( 245.toString(), "通过公交站", poiTypeSrcVr = R.drawable.icon_v2x_bus_station_driver, content = "前方%s米有公交站", - tts = "前方%s米有公交站,蘑菇提醒您小心右侧行人及来车" + tts = "前方%s米有公交站,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您小心右侧行人及来车" ), TYPE_ATTENTION_CONFLUENCE( 44.toString(), "前方车辆汇流", poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence, content = "前方%s米注意车辆汇流", - tts = "蘑菇路侧提醒您,前方%s米注意车辆汇流" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米注意车辆汇流" ), TYPE_PEDESTRIAN_CROSSING( 114.toString(), "人行横道", poiTypeSrcVr = R.drawable.icon_warning_v2x_person, content = "前方%s米人行横道", - tts = "蘑菇路侧提醒您,前方%s米人行横道" + tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您,前方%s米人行横道" ), //------------车内标牌 obu end --------------> @@ -486,7 +487,7 @@ enum class EventTypeEnumNew( "交通拥堵", poiTypeSrcVr = R.drawable.v2x_icon_yongdu_vr, content = "前方%s米交通拥堵", - tts = "前方%s米交通拥堵, 蘑菇提醒您注意观察小心通过" + tts = "前方%s米交通拥堵, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_JINGZHI( @@ -494,7 +495,7 @@ enum class EventTypeEnumNew( "静止障碍物占道", poiTypeSrcVr = R.drawable.v2x_icon_jingzhi_zhangai, content = "前方%s米静止障碍物占道", - tts = "前方%s米静止障碍物占道, 蘑菇提醒您注意观察小心通过" + tts = "前方%s米静止障碍物占道, ${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_SHIGU( @@ -502,7 +503,7 @@ enum class EventTypeEnumNew( "道路事故", poiTypeSrcVr = R.drawable.v2x_icon_shigu_sanjiaopai, content = "前方%s米道路事故", - tts = "前方%s米道路事故,蘑菇提醒您注意观察小心通过" + tts = "前方%s米道路事故,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_SHIGONG( @@ -510,14 +511,14 @@ enum class EventTypeEnumNew( "道路施工", poiTypeSrcVr = R.drawable.v2x_icon_shigong_zhandao, content = "前方%s米道路施工", - tts = "前方%s米道路施工,蘑菇提醒您注意观察小心通过" + tts = "前方%s米道路施工,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE( "100062", "他车倒车/逆行", poiTypeSrcVr = R.drawable.icon_v2x_other_retrograde_vehicle_driver, content = "前方%s米有车辆异常倒车或逆行", - tts = "前方%s米有车辆异常倒车或逆行,蘑菇提醒您注意观察小心通过" + tts = "前方%s米有车辆异常倒车或逆行,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您注意观察小心通过" ), TYPE_SOCKET_ROAD_GREE_WAVE( "100063", @@ -531,7 +532,7 @@ enum class EventTypeEnumNew( "行人横穿", poiTypeSrcVr = View.NO_ID, content = "前方%s米有行人/非机动车横穿", - tts = "前方%s米有行人/非机动车横穿,蘑菇提醒您提前减速,注意观察,小心通过" + tts = "前方%s米有行人/非机动车横穿,${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您提前减速,注意观察,小心通过" ), TYPE_ERROR( 0.toString(), 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 4f2e4eb850..54b5d5ba23 100644 --- a/core/mogo-core-res/src/main/res/values/string.xml +++ b/core/mogo-core-res/src/main/res/values/string.xml @@ -1,5 +1,6 @@ + 蘑菇 "不支持该视频。" 此文件不支持播放 diff --git a/gradle.properties b/gradle.properties index 63a8b288b4..aefb0029f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 # 远程通讯模块 MOGO_TELEMATIC_VERSION=1.4.7.42 # 动态换肤SDK -MOGO_SKIN_VERSION=1.4.7.46.3-debug +MOGO_SKIN_VERSION=1.4.7.48 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.1.2 diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index 1569e6c489..7b57b96c6b 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -57,6 +57,8 @@ dependencies { // 高德地图 api rootProject.ext.dependencies.amapnavi3dmap + // 换肤SDK + api rootProject.ext.dependencies.mogo_aicloud_skin if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_data diff --git a/skin/YiXin-skin/src/main/res/drawable-xhdpi/mogo_slogan.png b/skin/YiXin-skin/src/main/res/drawable-xhdpi/mogo_slogan.png index 184176f972..57b4f4c446 100644 Binary files a/skin/YiXin-skin/src/main/res/drawable-xhdpi/mogo_slogan.png and b/skin/YiXin-skin/src/main/res/drawable-xhdpi/mogo_slogan.png differ diff --git a/skin/YiXin-skin/src/main/res/values/strings.xml b/skin/YiXin-skin/src/main/res/values/strings.xml index 8746b270c1..69366d85fd 100644 --- a/skin/YiXin-skin/src/main/res/values/strings.xml +++ b/skin/YiXin-skin/src/main/res/values/strings.xml @@ -1,4 +1,11 @@ - 易鑫 + 易鑫 + + 易鑫资讯 + + 欢迎乘坐易鑫自动驾驶! + 稍等,亲\n易鑫小助手正在为您确认信息… + 要提前说再见了吗?易鑫小助手很舍不得您呢! + 您已完成乘车指南,更多功能欢迎探索~\n易鑫小助手预祝您旅途愉快! \ No newline at end of file