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

[6.6.0]

Browse Source 
[b1 b2 tts 策略变更]
This commit is contained in:
yangyakun
2024-08-27 20:18:27 +08:00
parent 7a9ee35674
commit 7aaab3ab7d
10 changed files with 197 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/MyDataBase.kt
View File

@@ -50,7 +50,7 @@ abstract class MyDataBase : RoomDatabase() {
companion object {
private const val DATABASE_NAME = "shuttle_db"
val ROOT_PATH =
Environment.getExternalStorageDirectory().absolutePath + File.separator + "MLog" + File.separator + "APP_cache" + File.separator //程序外部存储跟目录
Environment.getExternalStorageDirectory().absolutePath + File.separator + "Mogo" + File.separator + "APP_cache" + File.separator //程序外部存储跟目录
val instance: MyDataBase
//结合单例模式完成数据库实例创建

6
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/database/repository/TaskRepository.kt
View File

@@ -4,6 +4,7 @@ package com.mogo.och.weaknet.database.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.util.TAG
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.weaknet.database.MyDataBase
import com.mogo.och.weaknet.database.bean.TaskDataBean
import com.mogo.och.weaknet.database.dao.TaskDataDao
@@ -65,7 +66,7 @@ object TaskRepository {
}
fun startTask(taskId: Long, lineId: Long,lineName:String,callback: TaskStatusCallback){
DbThreadUtils.runInIoThread {
BizLoopManager.postDelayed({
var updateCount:Int? = 0
var startTime = System.currentTimeMillis()
try {
@@ -105,8 +106,7 @@ object TaskRepository {
}
}
}
},0)
}
fun queryRunningTaskByLineId(lineId: Long): List<TaskDataBean>? {

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

@@ -2,6 +2,8 @@ package com.mogo.och.weaknet.util
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -31,12 +33,16 @@ object ShuttleVoiceManager {
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
sendArrivedStationToClient(it)
}
VoiceNotice.showNotice(list, AIAssist.LEVEL1,null)
if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
VoiceNotice.showNotice(list, AIAssist.LEVEL1,null)
} else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
siteNameCN?.let {
sendArrivedStationToClient(it)
}
}
}
private fun sendArrivedStationToClient(arriveStation: String) {
@@ -67,10 +73,17 @@ object ShuttleVoiceManager {
context.getString(R.string.bus_leave_station_korean_tip, siteNameKR ?: it),
LanguageType.KOREAN
)
sendStartStationToClient(it)
list.add(koreanTTS)
}
VoiceNotice.showNotice(list, AIAssist.LEVEL1,null)
if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
VoiceNotice.showNotice(list, AIAssist.LEVEL1,null)
} else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
siteNameCN?.let {
sendStartStationToClient(it)
}
}
}
private fun sendStartStationToClient(nextStation: String) {
@@ -91,8 +104,13 @@ object ShuttleVoiceManager {
list.add(chineseTTS)
list.add(engTTS)
list.add(koreanTTS)
sendEndTaskToClient()
VoiceNotice.showNotice(list, AIAssist.LEVEL0,null)
if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
VoiceNotice.showNotice(list, AIAssist.LEVEL0,null)
} else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
sendEndTaskToClient()
}
}
private fun sendEndTaskToClient() {
@@ -108,10 +126,10 @@ object ShuttleVoiceManager {
fun writeOffCount(successNum:Int){
if(successNum<=1){
VoiceNotice.showNotice("核验通过", AIAssist.LEVEL3)
sendWriteOffNumToClient("核验通过")
//sendWriteOffNumToClient("核验通过")
}else{
VoiceNotice.showNotice("$successNum 人核验通过", AIAssist.LEVEL3)
sendWriteOffNumToClient("$successNum 人核验通过")
//sendWriteOffNumToClient("$successNum 人核验通过")
}
}