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

Merge branch 'dev_minibus-d_230425_3.2.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
lixiaopeng
2023-05-18 11:33:39 +08:00
parent 99d674c6f6 57ae21e36c
commit f34cc4e88b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,13 +106,13 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
* AI云获取红绿灯状态
*/
override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.SHOW_TRAFFIC_LIGHT, GsonUtils.toJson(trafficLightResult).toByteArray())
}
if (!hasObuLightStatus) {
hasAiLightStatus = true
CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onTrafficLightStatus trafficLightResult = $trafficLightResult ")
updateTrafficLight(trafficLightResult)
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.SHOW_TRAFFIC_LIGHT, GsonUtils.toJson(trafficLightResult).toByteArray())
}
}
}
@@ -126,9 +126,12 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
Handler().postDelayed({
hasAiLightStatus = false
}, 5000)
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.HIDE_TRAFFIC_LIGHT, "0".toByteArray())
}
//如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理
CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
if(!hasObuLightStatus){
CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
hide()
}
}
@@ -170,9 +173,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
private fun hide(){
CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() ---------> ")
CallerTrafficLightListenerManager.disableTrafficLight()
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.HIDE_TRAFFIC_LIGHT, "0".toByteArray())
}
}
/**

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml
View File

@@ -61,7 +61,7 @@
app:layout_constraintBottom_toBottomOf="@id/ivPadVersion"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="405dp"
android:src="@drawable/icon_version_ad"
android:src="@drawable/icon_version_ad_normal"
/>
<com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView