Merge remote-tracking branch 'origin/dev/dev_eagle_wuhan_sikua_obu' into dev/dev_eagle_wuhan_sikua_obu

modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt

@@ -574,13 +574,15 @@ class MogoPrivateObuManager private constructor() {
                         )
 
                     var maxSpeed = currentLight.glosa_suggested_speed_max.toInt()
-                    mIMoGoWaringProvider!!.showWarningV2X(
-                        EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType.toInt(),
-                        alertContent,
-                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                        appId.toString(),
-                        null
-                    )
+                    if (maxSpeed > 0) {
+                        mIMoGoWaringProvider!!.showWarningV2X(
+                                EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType.toInt(),
+                                alertContent,
+                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                                appId.toString(),
+                                null
+                        )
+                    }
                 }
                 // 黄灯
                 0x3 -> {

modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java

@@ -45,11 +45,12 @@ class ADASStatusIntentHandler implements IntentHandler {
 
     @Override
     public void handle( Context context, Intent intent ) {
+        if ( intent == null ) {
+            return;
+        }
 
         if ( MogoReceiver.ACTIION_ADAS.equals( intent.getAction() ) ) {
-            if ( intent == null ) {
-                return;
-            }
+
             int status = intent.getIntExtra( MogoReceiver.PARAM_ADAS_STATUS, 0 );
             MarkerServiceHandler.getMogoStatusManager().setADASUIShow( ServiceConst.TYPE, status == 1 );
         }