[6.5.0]红绿灯修改

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

@@ -117,11 +117,9 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
             "${SceneConstant.M_D_C}${TAG}",
             "onAutopilotPerceptionTrafficLight ---- hasObuLightStatus = $hasObuLightStatus ----hasAiLightStatus = $hasAiLightStatus , trafficLights : ${trafficLights?:"null"}"
         )
-        Log.i(TAG,"source="+trafficLights?.source)
         if(trafficLights?.source == 2){
             hasObuLightStatus = false
             hasAiLightStatus = false
-            hasFusionLightStatus = true
         }
         if (!hasObuLightStatus) {
             if (!hasAiLightStatus) {
@@ -172,6 +170,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                             if(convert(light.state) == TrafficLightEnum.BLACK){
                                 //隐藏当前红绿灯以及额外提示框
                                 CallerTrafficLightListenerManager.disableTrafficLight()
+                                hasFusionLightStatus = false
                                 isPrompted = false
                             }else{
                                 //倒计时，超时还未更新数据则隐藏红绿灯
@@ -185,6 +184,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                                                     hide("倒计时结束隐藏", DataSourceType.TELEMATIC_UNION_V2N)
                                                     lightCountDownTimer?.cancel()
                                                     lightCountDownTimer = null
+                                                    hasFusionLightStatus = false
+                                                    isPrompted = false
                                                 }
                                             }
 
@@ -299,6 +300,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
             Handler().postDelayed({
                 hasAiLightStatus = false
                 hasObuLightStatus = false
+                hasFusionLightStatus = false
             }, 5000)
             if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
                 CallerTelematicManager.sendMsgToAllClients(

core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml

@@ -300,7 +300,7 @@
         app:layout_constraintRight_toRightOf="@id/viewDangerLayout"
         app:layout_constraintLeft_toRightOf="@id/tvDangerNum"
         app:layout_constraintHorizontal_chainStyle="packed"
-        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginBottom="@dimen/dp_70"
         android:textColor="@color/summary_danger_num_p"
         android:textSize="@dimen/sp_52"
         android:text="@string/summary_service_unit"
@@ -350,7 +350,7 @@
         app:layout_constraintRight_toRightOf="@id/viewEfficiencyLayout"
         app:layout_constraintLeft_toRightOf="@id/tvEfficiencyNum"
         app:layout_constraintHorizontal_chainStyle="packed"
-        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginBottom="@dimen/dp_70"
         android:textSize="@dimen/sp_52"
         android:textColor="@color/summary_danger_num_p"
         android:text="@string/summary_efficiency_unit"