From edc52a2399f9cdded54b31bc5973377b5a6c2cba Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Mon, 28 Oct 2024 10:38:05 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.2]=201=E3=80=81=E4=BF=AE=E6=94=B9=E9=81=BA?= =?UTF-8?q?=E6=BC=8F=E7=9A=84=20string=20=E8=B5=84=E6=BA=90=E6=8D=A2?= =?UTF-8?q?=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charter/passenger/receive/DriverMessage.kt | 3 ++- .../ui/dialogfragment/NoviceGuidanceFragment.kt | 2 +- .../passenger/utils/CharterVoiceManager.kt | 3 ++- .../com/mogo/och/offline/model/OrderModel.java | 5 +++-- .../mogo/och/offline/util/ShuttleVoiceManager.kt | 3 ++- .../mogo/och/weaknet/util/ShuttleVoiceManager.kt | 5 +++-- .../main/res/layout/dialog_itinerary_summary.xml | 1 + .../res/layout/dialog_itinerary_summary_p.xml | 1 + .../src/main/res/layout/view_road_cross_live.xml | 3 ++- .../res/layout/view_road_cross_live_light.xml | 3 ++- .../eagle/core/function/view/RoadCrossRoamView.kt | 2 +- skin/DeQing-skin/src/main/res/values/strings.xml | 15 +++++++++++++++ skin/YiXin-skin/src/main/res/values/strings.xml | 14 ++++++++++++++ 13 files changed, 49 insertions(+), 11 deletions(-) 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 0b638d807c..7220a585fe 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 @@ -22,6 +22,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.SoundPoolHelper import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.skin.utils.SkinResources object DriverMessage: IReceivedMsgListener { override fun onReceivedMsg(type: Int, byteArray: ByteArray) { @@ -53,7 +54,7 @@ object DriverMessage: IReceivedMsgListener { if(msg.isPlay){ VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) if(msg.msg.contains("核销成功")){ - val string = AbsMogoApplication.getApp().getString(R.string.charter_p_welcome_tts) + 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 ee65188494..95ef2ead38 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 @@ -145,7 +145,7 @@ class NoviceGuidanceFragment : saveOrderInfo() if (m1_novice_guidance_complier_tts) { val m1NoviceGuidanceStopSiteTts = - AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_complier_tts) + SkinResources.getInstance().getString(R.string.charter_p_novice_guidance_complier_tts) VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1) m1_novice_guidance_complier_tts = false } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt index e9109401a5..13f417f74c 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt @@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.skin.utils.SkinResources import com.mogo.tts.base.IMogoTTSCallback import com.mogo.tts.base.LangTtsEntity import com.mogo.tts.base.LanguageType @@ -76,7 +77,7 @@ object CharterVoiceManager { fun endOrder(callBack: IMogoTTSCallback?=null) { val contenxt = AbsMogoApplication.getApp() val list: MutableList = ArrayList() - val chineseTTS = LangTtsEntity(contenxt.getString(R.string.charter_end_order_zh), LanguageType.CHINESE) + val chineseTTS = LangTtsEntity(SkinResources.getInstance().getString(R.string.charter_end_order_zh), LanguageType.CHINESE) val engTTS = LangTtsEntity(contenxt.getString(R.string.charter_end_order_en), LanguageType.ENGLISH) val koreanTTS = LangTtsEntity(contenxt.getString(R.string.charter_end_order_ko), LanguageType.KOREAN) list.add(chineseTTS) diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index 271d65802e..7f04703625 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -66,6 +66,7 @@ import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey; import com.mogo.och.data.bean.BusTransferData; import com.mogo.och.data.manager.cache.CacheDataManager; +import com.mogo.skin.utils.SkinResources; import org.jetbrains.annotations.NotNull; @@ -653,8 +654,8 @@ public class OrderModel { } private void sendEndTaskToClient() { - AppConnectMsg endMsg = new AppConnectMsg(false, true, mContext - .getString(R.string.bus_end_task_tip), -1); + AppConnectMsg endMsg = new AppConnectMsg(false, true, + SkinResources.getInstance().getString(R.string.bus_end_task_tip), -1); LanSocketManager.sendMsgToClient(endMsg); } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt index d38c5a1898..45de516670 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt @@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.offline.R +import com.mogo.skin.utils.SkinResources import com.mogo.tts.base.LangTtsEntity import com.mogo.tts.base.LanguageType import java.util.ArrayList @@ -63,7 +64,7 @@ object ShuttleVoiceManager { fun endOrderBus() { val context = AbsMogoApplication.getApp() val list: MutableList = ArrayList() - val chineseTTS = LangTtsEntity(context.getString(R.string.bus_end_task_tip), LanguageType.CHINESE) + val chineseTTS = LangTtsEntity(SkinResources.getInstance().getString(R.string.bus_end_task_tip), LanguageType.CHINESE) val engTTS = LangTtsEntity(context.getString(R.string.bus_end_task_english_tip), LanguageType.ENGLISH) val koreanTTS = LangTtsEntity(context.getString(R.string.bus_end_task_korean_tip), LanguageType.KOREAN) list.add(chineseTTS) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt index 3ebf0377ed..29cd0a8ce0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt @@ -9,6 +9,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.shuttle.weaknet.R +import com.mogo.skin.utils.SkinResources import com.mogo.tts.base.LangTtsEntity import com.mogo.tts.base.LanguageType @@ -98,7 +99,7 @@ object ShuttleVoiceManager { fun endOrderBus() { val context = AbsMogoApplication.getApp() val list: MutableList = ArrayList() - val chineseTTS = LangTtsEntity(context.getString(R.string.bus_end_task_tip), LanguageType.CHINESE) + val chineseTTS = LangTtsEntity(SkinResources.getInstance().getString(R.string.bus_end_task_tip), LanguageType.CHINESE) val engTTS = LangTtsEntity(context.getString(R.string.bus_end_task_english_tip), LanguageType.ENGLISH) val koreanTTS = LangTtsEntity(context.getString(R.string.bus_end_task_korean_tip), LanguageType.KOREAN) list.add(chineseTTS) @@ -117,7 +118,7 @@ object ShuttleVoiceManager { val endMsg = AppConnectMsg( isViewShow = false, isPlay = true, - msg = ResourcesUtils.getString(R.string.bus_end_task_tip), + msg = SkinResources.getInstance().getString(R.string.bus_end_task_tip), ) LanSocketManager.sendMsgToClient(endMsg) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml index ebaa6ae1c2..3144dc85fa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml @@ -386,6 +386,7 @@ android:textSize="@dimen/sp_22" android:textColor="@color/summary_tip" android:layout_marginBottom="@dimen/dp_137" + app:isUseSkin="true" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml index 8c8a755128..2d2cce23b0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml @@ -416,6 +416,7 @@ android:textSize="@dimen/sp_24" android:textColor="@color/summary_tip_p" android:layout_marginTop="@dimen/dp_15" + app:isUseSkin="true" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml index af5958a3be..be21442dca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml @@ -78,5 +78,6 @@ android:textSize="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:isUseSkin="true" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml index 3ce9c47f90..2b78606007 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml @@ -15,7 +15,8 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_30" - app:layout_constraintLeft_toLeftOf="parent"/> + app:layout_constraintLeft_toLeftOf="parent" + app:isUseSkin="true" /> = 80) { disStr = "前方${dis}米将通过路口，${SkinResources.getInstance().getString(R.string.operation_platform_name)}为您提供路口全息影像，助力出行" } diff --git a/skin/DeQing-skin/src/main/res/values/strings.xml b/skin/DeQing-skin/src/main/res/values/strings.xml index 97e161216f..235ea44a02 100644 --- a/skin/DeQing-skin/src/main/res/values/strings.xml +++ b/skin/DeQing-skin/src/main/res/values/strings.xml @@ -8,4 +8,19 @@ 稍等，亲\n下渚湖小助手正在为您确认信息… 要提前说再见了吗？下渚湖小助手很舍不得您呢！ 您已完成乘车指南，更多功能欢迎探索~\n下渚湖小助手预祝您旅途愉快! + + + 感谢您体验\'下渚湖\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见 + 感谢您体验\'下渚湖\'自动驾驶小巴车，我们下次再见。 + 欢迎乘坐\'下渚湖\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！ + + 已达到目的地，请从右侧下车，感谢乘坐\'下渚湖\'自动驾驶车 + 感谢您使用\'下渚湖\'自动驾驶出行服务，期待下次与您相遇 + 请携带好随身物品，注意侧后\n方来车，感谢体验\'下渚湖\'自\n动驾驶车！ + 太棒了！您已完成乘车指南，更多功能欢迎探索，\'易鑫\'小助手预祝您旅途愉快 + + 下渚湖星云 + Powered by 下渚湖交通大模型™ + 下渚湖为您实时护航中，请放心驾驶！ + \ No newline at end of file diff --git a/skin/YiXin-skin/src/main/res/values/strings.xml b/skin/YiXin-skin/src/main/res/values/strings.xml index 69366d85fd..1abb2a8e22 100644 --- a/skin/YiXin-skin/src/main/res/values/strings.xml +++ b/skin/YiXin-skin/src/main/res/values/strings.xml @@ -8,4 +8,18 @@ 稍等，亲\n易鑫小助手正在为您确认信息… 要提前说再见了吗？易鑫小助手很舍不得您呢！ 您已完成乘车指南，更多功能欢迎探索~\n易鑫小助手预祝您旅途愉快! + + + 感谢您体验\'易鑫\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见 + 感谢您体验\'易鑫\'自动驾驶小巴车，我们下次再见。 + 欢迎乘坐\'易鑫\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！ + + 已达到目的地，请从右侧下车，感谢乘坐\'下渚湖\'自动驾驶车 + 感谢您使用\'下渚湖\'自动驾驶出行服务，期待下次与您相遇 + 请携带好随身物品，注意侧后\n方来车，感谢体验\'下渚湖\'自\n动驾驶车！ + 太棒了！您已完成乘车指南，更多功能欢迎探索，\'易鑫\'小助手预祝您旅途愉快 + + 易鑫星云 + Powered by 易鑫交通大模型™ + 易鑫为您实时护航中，请放心驾驶！ \ No newline at end of file