[6.7.2]

[Update]
1、升级动态皮肤加载SDK
2、完善YiXin皮肤包中的文案/TTS，蘑菇--》易鑫

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 {

OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml

@@ -105,7 +105,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/actv_end_order_content"
-            android:text="要提前说再见了吗？蘑菇小助手很舍不得您呢！"
+            android:text="@string/end_order_content"
             android:textSize="@dimen/dp_26"
             android:textColor="@color/charter_p_112b57"
             app:layout_constraintStart_toStartOf="parent"

OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml

@@ -12,7 +12,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="@dimen/dp_186"
         android:layout_marginStart="@dimen/dp_280"
-        android:text="欢迎乘坐蘑菇车联自动驾驶!"
+        android:text="@string/start_guildance"
         android:visibility="gone"
         android:textSize="@dimen/dp_52"
         android:textStyle="bold"
@@ -39,7 +39,7 @@
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@+id/actv_complete_guidance_title"
         app:layout_constraintTop_toBottomOf="@+id/actv_complete_guidance_title"
-        android:text="您已完成乘车指南，更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快!"
+        android:text="@string/complete_guidance_value"
         android:textSize="@dimen/dp_43"
         android:textColor="@color/charter_p_101c35"
         android:textStyle="bold"

OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml

@@ -134,7 +134,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="稍等，亲\n蘑菇小助手正在为您确认信息…"
+                android:text="@string/loading_wait_driver_title"
                 android:textColor="@color/charter_p_4a5375"
                 android:textSize="@dimen/dp_30"
                 app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"

OCH/charter/passenger/src/main/res/values/strings.xml

@@ -50,6 +50,12 @@
     <string name="charter_p_start_auto_fail">自驾系统繁忙，稍后再试试吧～</string>
     <string name="charter_p_arrived_station_left_100">%1$s就要到啦！</string>
     <string name="charter_p_net_error">稍后再来看看吧</string>
+
+
+    <string name="start_guildance">欢迎乘坐蘑菇车联自动驾驶!</string>
+    <string name="loading_wait_driver_title">稍等，亲\n蘑菇小助手正在为您确认信息…</string>
+    <string name="end_order_content">要提前说再见了吗？蘑菇小助手很舍不得您呢！</string>
+    <string name="complete_guidance_value">您已完成乘车指南，更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快!</string>
 <!--    <string name="m1_novice_guidance_tts">正在为您靠边停车，扶稳坐好哟</string>-->
 <!--    <string name="m1_novice_guidance_tts">靠边停车成功</string>-->
 <!--    <string name="m1_novice_guidance_tts">车辆系统繁忙，请稍后再试</string>-->

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;
                 }

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"

OCH/taxi/pcommon/src/main/res/values/strings.xml

@@ -2,4 +2,6 @@
 <resources>
     <string name="taxi_cp_setting_light">亮度</string>
     <string name="taxi_cp_setting_sound">音量</string>
+
+    <string name="actv_video_title">蘑菇资讯</string>
 </resources>

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

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

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

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"
                             }

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"
                             }

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

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<RecyclerView.ViewHolder>() {
 
@@ -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(

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

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"

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"

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"

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"

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"

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"

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">
 
         <ImageView
-            android:layout_width="@dimen/dp_157"
+            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_255"
+            android:layout_height="wrap_content"
+            android:minWidth="@dimen/dp_157"
+            android:minHeight="@dimen/dp_255"
             android:background="@drawable/mogo_slogan"
             android:scaleType="centerCrop"
             android:visibility="visible"

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.map.overlay.core.Level
 import com.mogo.map.overlay.point.Point
+import com.mogo.skin.utils.SkinResources
 import com.zhidaoauto.map.data.road.RoadCross
 import com.zhidaoauto.map.data.road.StopLine
 import com.zhjt.service.chain.ChainLog
@@ -82,7 +83,8 @@ class RoadCrossCameraManager : IMoGoMapRoadListener {
             }
 
             if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-                AIAssist.getInstance(mContext).speakTTSVoice("蘑菇检测到前方${distance.toInt()}米您将通过路口，已为您切换展示路口全息影像")
+                AIAssist.getInstance(mContext).speakTTSVoice("${SkinResources.getInstance().getString(
+                        com.mogo.eagle.core.data.R.string.operation_platform_name)}检测到前方${distance.toInt()}米您将通过路口，已为您切换展示路口全息影像")
             }
             if (roadCrossEnd != null) {
                 ndeRoadCameraNetWorkModel.getRoadCrossInfo(roadCrossEnd,

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt

@@ -30,6 +30,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.skin.utils.SkinResources
 import com.zhidaoauto.map.data.road.StopLine
 import kotlinx.android.synthetic.main.view_road_cross_roam.view.ivCoverRoam
 import kotlinx.android.synthetic.main.view_road_cross_roam.view.ivRoadRoamClose
@@ -212,7 +213,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
         val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0
         if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
             AIAssist.getInstance(context)
-                .speakTTSVoice("前方${dis}米将通过路口，蘑菇为您提供路口全息影像，助力出行")
+                .speakTTSVoice("前方${dis}米将通过路口，${SkinResources.getInstance().getString(R.string.operation_platform_name)}为您提供路口全息影像，助力出行")
         }
         CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG)
         bringToFront()

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt

@@ -4,6 +4,7 @@ import android.view.View
 import com.mogo.eagle.core.data.R
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.skin.utils.SkinResources
 
 
 /**
@@ -253,7 +254,7 @@ enum class EventTypeEnumNew(
         "闯红灯预警",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red,
         content = "前方路口有闯红灯风险",
-        tts = "蘑菇路侧提醒您，前方路口有闯红灯风险，建议降低车速"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方路口有闯红灯风险，建议降低车速"
     ),
 
     TYPE_USECASE_ID_IVP_GREEN(
@@ -271,49 +272,49 @@ enum class EventTypeEnumNew(
         "车辆故障",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_car_breakdown,
         content = "前方%s米有故障车辆，影响路段%s米",
-        tts = "蘑菇路侧提醒您，前方%s米有故障车辆，影响路段%s米"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米有故障车辆，影响路段%s米"
     ),
     TYPE_FOURS_PONDING( //积水
         407.toString(),
         "道路积水",
         poiTypeSrcVr = R.drawable.v2x_icon_jishui_vr,
         content = "前方%s米道路积水，影响路段%s米",
-        tts ="蘑菇路侧提醒您，前方%s米道路积水，影响路段%s米"
+        tts ="${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米道路积水，影响路段%s米"
     ),
     TYPE_USECASE_ID_ROAD_PARKING( //异常停车
         412.toString(),
         "异常停车",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
         content = "前方%s米异常停车，影响路段%s米",
-        tts = "蘑菇路侧提醒您，前方%s米异常停车，影响路段%s米"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米异常停车，影响路段%s米"
     ),
     TYPE_USECASE_ID_TJW( //%d
         707.toString(),
         "拥堵",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion,
         content = "前方%s米拥堵，影响路段%s米",
-        tts = "蘑菇路侧提醒您，前方%s米拥堵，影响路段%s米"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米拥堵，影响路段%s米"
     ),
     TYPE_USECASE_ID_SLW( //超速行驶
         901.toString(),
         "超速行驶",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed,
         content = "%s有车辆超速行驶",
-        tts = "蘑菇路侧提醒您，%s有车辆超速行驶"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，%s有车辆超速行驶"
     ),
     TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行
         904.toString(),
         "逆行车辆",
         poiTypeSrcVr = R.drawable.icon_default,
         content = "前方%s米逆行车辆，影响路段%s米",
-        tts = "蘑菇路侧提醒您，前方%s米逆行车辆，影响路段%s米"
+        tts = "${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，前方%s米逆行车辆，影响路段%s米"
     ),
     TYPE_USECASE_ID_ROAD_SPEED_LIMIT( //-->
         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(),

core/mogo-core-res/src/main/res/values/string.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="operation_platform_name">蘑菇</string>
 
     <string name="VideoView_info_text_video_not_supported">"不支持该视频。"</string>
     <string name="file_not_support">此文件不支持播放</string>

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

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

skin/YiXin-skin/src/main/res/values/strings.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">易鑫</string>
+    <string name="operation_platform_name">易鑫</string>
+
+    <string name="actv_video_title">易鑫资讯</string>
+
+    <string name="start_guildance">欢迎乘坐易鑫自动驾驶!</string>
+    <string name="loading_wait_driver_title">稍等，亲\n易鑫小助手正在为您确认信息…</string>
+    <string name="end_order_content">要提前说再见了吗？易鑫小助手很舍不得您呢！</string>
+    <string name="complete_guidance_value">您已完成乘车指南，更多功能欢迎探索~\n易鑫小助手预祝您旅途愉快!</string>
 </resources>