yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.2]

Browse Source 
1、修改遺漏的 string 资源换肤
This commit is contained in:
donghongyu-pc
2024-10-28 10:38:05 +08:00
parent a92f1c07f0
commit edc52a2399
13 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
View File

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

2
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
View File

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

3
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt
View File

@@ -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<LangTtsEntity> = 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)

5
OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
View File

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

3
OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
View File

@@ -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<LangTtsEntity> = 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)

5
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
View File

@@ -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<LangTtsEntity> = 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)
}

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml
View File

@@ -386,6 +386,7 @@
android:textSize="@dimen/sp_22"
android:textColor="@color/summary_tip"
android:layout_marginBottom="@dimen/dp_137"
app:isUseSkin="true"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml
View File

@@ -416,6 +416,7 @@
android:textSize="@dimen/sp_24"
android:textColor="@color/summary_tip_p"
android:layout_marginTop="@dimen/dp_15"
app:isUseSkin="true"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml
View File

@@ -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" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
View File

@@ -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" />
<ImageView
android:id="@+id/roadCrossLiveClose"

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

@@ -242,7 +242,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
//播放语音
val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
var disStr = "前方即将通过路口，蘑菇为您提供路口全息影像，助力出行"
var disStr = "前方即将通过路口，${SkinResources.getInstance().getString(R.string.operation_platform_name)}为您提供路口全息影像，助力出行"
if (dis >= 80) {
disStr = "前方${dis}米将通过路口，${SkinResources.getInstance().getString(R.string.operation_platform_name)}为您提供路口全息影像，助力出行"
}

15
skin/DeQing-skin/src/main/res/values/strings.xml
View File

@@ -8,4 +8,19 @@
<string name="loading_wait_driver_title">稍等，亲\n下渚湖小助手正在为您确认信息…</string>
<string name="end_order_content">要提前说再见了吗？下渚湖小助手很舍不得您呢！</string>
<string name="complete_guidance_value">您已完成乘车指南，更多功能欢迎探索~\n下渚湖小助手预祝您旅途愉快!</string>
<string name="charter_end_order_zh">感谢您体验\'下渚湖\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见</string>
<string name="bus_end_task_tip">感谢您体验\'下渚湖\'自动驾驶小巴车，我们下次再见。</string>
<string name="charter_p_welcome_tts">欢迎乘坐\'下渚湖\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！</string>
<string name="taxi_p_arrive_end_tts">已达到目的地，请从右侧下车，感谢乘坐\'下渚湖\'自动驾驶车</string>
<string name="taxi_p_arrived_end_tips">感谢您使用\'下渚湖\'自动驾驶出行服务，期待下次与您相遇</string>
<string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验\'下渚湖\'自\n动驾驶车！</string>
<string name="charter_p_novice_guidance_complier_tts">太棒了！您已完成乘车指南，更多功能欢迎探索，\'易鑫\'小助手预祝您旅途愉快</string>
<string name="status_bar_tag">下渚湖星云</string>
<string name="summary_powered">Powered by 下渚湖交通大模型™</string>
<string name="road_cross_live_tip">下渚湖为您实时护航中，请放心驾驶！</string>
</resources>

14
skin/YiXin-skin/src/main/res/values/strings.xml
View File

@@ -8,4 +8,18 @@
<string name="loading_wait_driver_title">稍等，亲\n易鑫小助手正在为您确认信息…</string>
<string name="end_order_content">要提前说再见了吗？易鑫小助手很舍不得您呢！</string>
<string name="complete_guidance_value">您已完成乘车指南，更多功能欢迎探索~\n易鑫小助手预祝您旅途愉快!</string>
<string name="charter_end_order_zh">感谢您体验\'易鑫\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见</string>
<string name="bus_end_task_tip">感谢您体验\'易鑫\'自动驾驶小巴车，我们下次再见。</string>
<string name="charter_p_welcome_tts">欢迎乘坐\'易鑫\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！</string>
<string name="taxi_p_arrive_end_tts">已达到目的地，请从右侧下车，感谢乘坐\'下渚湖\'自动驾驶车</string>
<string name="taxi_p_arrived_end_tips">感谢您使用\'下渚湖\'自动驾驶出行服务，期待下次与您相遇</string>
<string name="module_och_taxi_order_complete">请携带好随身物品，注意侧后\n方来车，感谢体验\'下渚湖\'自\n动驾驶车！</string>
<string name="charter_p_novice_guidance_complier_tts">太棒了！您已完成乘车指南，更多功能欢迎探索，\'易鑫\'小助手预祝您旅途愉快</string>
<string name="status_bar_tag">易鑫星云</string>
<string name="summary_powered">Powered by 易鑫交通大模型™</string>
<string name="road_cross_live_tip">易鑫为您实时护航中，请放心驾驶！</string>
</resources>