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

[6.7.2]

Browse Source 
[Update]
1、升级动态皮肤加载SDK
2、完善YiXin皮肤包中的文案/TTS，蘑菇--》易鑫
This commit is contained in:
donghongyu-pc
2024-10-15 19:42:35 +08:00
parent 52f78d7b31
commit 8ad9bab54e
31 changed files with 113 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/function-impl/mogo-core-function-datacenter/build.gradle
View File

@@ -64,6 +64,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogoaicloudtelematic
compileOnly project(':core:function-impl:mogo-core-function-map')
implementation project(':core:mogo-core-function-call')
implementation project(':core:mogo-core-res')
implementation project(":foudations:mogo-commons")
}

6
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.datacenter.obu
import android.content.Context
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.config.HmiBuildConfig
import com.mogo.eagle.core.data.enums.CommunicationType
@@ -26,6 +27,7 @@ import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
import com.mogo.eagle.core.utilcode.util.ConvertUtils
import com.mogo.skin.utils.SkinResources
import com.mogo.support.obu.ObuScene
import com.zhidao.support.obu.constants.MogoObuShowConstants
import kotlin.math.roundToInt
@@ -629,9 +631,9 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
if (currentSpeed > 0) {
ttsContentNew =
if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) {
"蘑菇路侧提醒您，推荐保持当前车速通过路口"
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持当前车速通过路口"
} else {
"蘑菇路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口"
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口"
}
alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
}

6
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.eagle.core.function.datacenter.obu
import android.content.Context
import com.mogo.eagle.core.data.R
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.config.HmiBuildConfig
@@ -25,6 +26,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.util.ConvertUtils
import com.mogo.eagle.core.utilcode.util.FileUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.skin.utils.SkinResources
import com.mogo.support.obu.ObuBase
import com.mogo.support.obu.ObuScene
import com.mogo.support.obu.constants.*
@@ -1111,9 +1113,9 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
if (currentSpeed > 0) {
ttsContentNew =
if ((currentSpeed * 3.6).roundToInt() in (minSpeedTemp + 1) until maxSpeedTemp) {
"蘑菇路侧提醒您，推荐保持当前车速通过路口"
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持当前车速通过路口"
} else {
"蘑菇路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口"
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}路侧提醒您，推荐保持车速$minSpeedTemp - $maxSpeedTemp KM/H通过路口"
}
alertContentNew = "推荐车速$minSpeedTemp - $maxSpeedTemp KM/H"
}

11
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
View File

@@ -28,11 +28,13 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
import com.mogo.eagle.core.function.datacenter.R
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import com.mogo.skin.utils.SkinResources
import com.zhjt.service.chain.ChainLog
import perception.FusionTrafficLightOuterClass
import kotlin.math.abs
@@ -242,7 +244,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
CallerMapRoadListenerManager.getStopLineDistance()?.let { dis->
if(currentSpeed*light.duration < dis){
//语音播放：蘑菇提醒您及时减速，避免路口急刹
AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速，避免路口急刹")
AIAssist.getInstance(mContext).speakTTSVoice(
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速，避免路口急刹")
isPrompted = true
}
}
@@ -252,7 +255,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
CallerMapRoadListenerManager.getStopLineDistance()?.let{distance->
if(currentSpeed*light.duration*1.1 < distance){
//语音播放：蘑菇提醒您及时减速，避免路口急刹
AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速，避免路口急刹")
AIAssist.getInstance(mContext).speakTTSVoice(
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速，避免路口急刹")
isPrompted = true
}
}
@@ -262,7 +266,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
CallerMapRoadListenerManager.getStopLineDistance()?.let{distance->
if(currentSpeed*0.4*light.duration > distance){
//语音播放：蘑菇提醒您及时减速，避免路口急刹
AIAssist.getInstance(mContext).speakTTSVoice("蘑菇提醒您及时减速，避免路口急刹")
AIAssist.getInstance(mContext).speakTTSVoice(
"${SkinResources.getInstance().getString(R.string.operation_platform_name)}提醒您及时减速，避免路口急刹")
isPrompted = true
}
}