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

[3.0.0]

Browse Source 
[韩语null、去掉多余的站]

# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
This commit is contained in:
yangyakun
2023-03-30 14:37:00 +08:00
committed by wangmingjun
parent 01cd5e4848
commit 5a15eb21eb
2 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
View File

@@ -10,50 +10,66 @@ import java.util.ArrayList
object VoiceManager {
fun arrivedStation(siteName: String) {
arrivedStation(siteName,null)
fun arrivedStation(siteNameCN: String?) {
arrivedStation(siteNameCN,"")
}
fun arrivedStation(siteName: String,callBack: IMogoTTSCallback?=null) {
fun arrivedStation(siteNameCN: String?,siteNameKR: String?) {
arrivedStation(siteNameCN,siteNameKR,null)
}
fun arrivedStation(siteNameCN: String?, siteNameKR: String?,callBack: IMogoTTSCallback?=null) {
val contenxt = AbsMogoApplication.getApp()
val list: MutableList<LangTtsEntity> = ArrayList()
val chineseTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_zh, siteName),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_en, siteName),
LanguageType.CHINESE
)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_ko, siteName),
LanguageType.KOREAN
)
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
siteNameCN?.let {
val chineseTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_zh, it),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_en, it),
LanguageType.CHINESE
)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_ko, siteNameKR?:it),
LanguageType.KOREAN
)
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
}
VoiceNotice.showNotice(list, AIAssist.LEVEL1,callBack)
}
fun leaveStation(siteName: String){
leaveStation(siteName,null)
fun leaveStation(siteNameCN: String?){
leaveStation(siteNameCN,"")
}
fun leaveStation(siteName: String,callBack: IMogoTTSCallback?=null) {
val contenxt = AbsMogoApplication.getApp()
fun leaveStation(siteNameCN: String?,siteNameKR: String?){
leaveStation(siteNameCN,siteNameKR,null)
}
fun leaveStation(siteNameCN: String?, siteNameKR: String?,callBack: IMogoTTSCallback?=null) {
val list: MutableList<LangTtsEntity> = ArrayList()
val chineseTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_zh, siteName),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_en, siteName),
LanguageType.CHINESE
)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_ko, siteName),
LanguageType.KOREAN
)
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
val contenxt = AbsMogoApplication.getApp()
siteNameCN?.let {
val chineseTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_zh, it),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_en, it),
LanguageType.CHINESE
)
list.add(chineseTTS)
list.add(engTTS)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_ko, siteNameKR ?: it),
LanguageType.KOREAN
)
list.add(koreanTTS)
}
VoiceNotice.showNotice(list, AIAssist.LEVEL1,callBack)
}

2
OCH/mogo-och-common-module/src/main/res/values/strings.xml
View File

@@ -17,7 +17,7 @@
<string name="arrived_station_en">We are arriving at %1$s</string>
<string name="arrived_station_ko">%1$s 역에 도착했습니다</string>
<string name="arrived_station_zh">已到达%1$s站</string>
<string name="arrived_station_zh">已到达%1$s</string>
<string name="leave_station_zh">车辆起步，请扶稳坐好，前方到站 %1$s</string>
<string name="leave_station_en">The next station is %1$s</string>