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

[m1]

Browse Source 
[韩文兼容]
This commit is contained in:
yangyakun
2023-03-29 20:10:54 +08:00
parent 46870bb805
commit 60baec6a95
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
View File

@@ -14,8 +14,10 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() {
val lineName: String?,//线路名称
var startSiteId: Int?,
var startSiteName: String?,
var startSiteNameKr: String?,
val siteId: Long?,//站点id
val siteName: String?,//站点名称
val siteNameKr: String?,//站点名称
val wgs84Lat: Double?,
val wgs84Lon: Double?,
var gcj02Lat: Double?,

13
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -854,7 +854,11 @@ object CharterPassengerModel {
mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
override fun onSuccess(data: BaseData?) {
if (null != data && 0 == data.code) {
VoiceManager.arrivedStation(orderInfo!!.siteName!!, VoiceFocusManager.getVoiceCmdCallBack())
VoiceManager.arrivedStation(
orderInfo!!.siteName!!,
orderInfo!!.siteNameKr!!,
VoiceFocusManager.getVoiceCmdCallBack()
)
broadcastList["${it}$endKey"] = true
// 到站结束自驾
CallerAutoPilotControlManager.cancelAutoPilot()
@@ -875,8 +879,11 @@ object CharterPassengerModel {
}
fun leaveStation() {
orderInfo?.siteName?.let {
VoiceManager.leaveStation(it, VoiceFocusManager.getVoiceCmdCallBack())
orderInfo?.siteName?.let {cn->
orderInfo?.siteNameKr?.let {kr->
VoiceManager.leaveStation(cn,kr, VoiceFocusManager.getVoiceCmdCallBack())
}
}
}

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

@@ -10,22 +10,26 @@ 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),
contenxt.getString(R.string.arrived_station_zh, siteNameCN),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_en, siteName),
contenxt.getString(R.string.arrived_station_en, siteNameCN),
LanguageType.CHINESE
)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.arrived_station_ko, siteName),
contenxt.getString(R.string.arrived_station_ko, siteNameKR.ifEmpty { siteNameCN }),
LanguageType.KOREAN
)
list.add(chineseTTS)
@@ -33,22 +37,28 @@ object VoiceManager {
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) {
fun leaveStation(siteNameCN: String,siteNameKR: String){
leaveStation(siteNameCN,siteNameKR,null)
}
fun leaveStation(siteNameCN: String, siteNameKR: String,callBack: IMogoTTSCallback?=null) {
val contenxt = AbsMogoApplication.getApp()
val list: MutableList<LangTtsEntity> = ArrayList()
val chineseTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_zh, siteName),
contenxt.getString(R.string.leave_station_zh, siteNameCN),
LanguageType.CHINESE
)
val engTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_en, siteName),
contenxt.getString(R.string.leave_station_en, siteNameCN),
LanguageType.CHINESE
)
val koreanTTS = LangTtsEntity(
contenxt.getString(R.string.leave_station_ko, siteName),
contenxt.getString(R.string.leave_station_ko, siteNameKR.ifEmpty { siteNameCN }),
LanguageType.KOREAN
)
list.add(chineseTTS)