diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 688db097c8..ad5e57f222 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -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()) - } } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_normal.png new file mode 100644 index 0000000000..a2f4d1d1a9 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_version_ad_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index 8bffe78a38..68330ae43c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml @@ -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" />