Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java

@@ -30,6 +30,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
 import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
@@ -76,6 +77,7 @@ public class V2XServiceManager {
     private static IMogoADASController mIMogoADASController;
     private static IMogoIntentManager mMogoIntentManager;
     private static IMogoEntranceButtonController mMogoEntranceButtonController;
+    private static IMogoOnlineCarListPanelProvider mMogoOnlineCarListPanelProvider;
 
     private static V2XRefreshModel mV2XRefreshModel;
     private static V2XMarkerService mV2XMarkerService;
@@ -113,6 +115,7 @@ public class V2XServiceManager {
             mIMogoMarkerService = mMogoServiceApis.getMarkerService();
             mIMogoShareManager = mMogoServiceApis.getShareManager();
             mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
+            mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
 
             mMarkerManager = mMapService.getMarkerManager(context);
             mNavi = mMapService.getNavi(context);
@@ -265,4 +268,7 @@ public class V2XServiceManager {
     }
 
 
+    public static IMogoOnlineCarListPanelProvider getMogoOnlineCarListPanelProvider() {
+        return mMogoOnlineCarListPanelProvider;
+    }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java

@@ -5,8 +5,6 @@ import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XRoadEventEntity;
-import com.mogo.module.service.carinfo.CarStateInfo;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.IV2XScenarioManager;
@@ -62,6 +60,12 @@ public class V2XScenarioManager implements IV2XScenarioManager {
             V2XUtils.runOnUiThread(() -> {
                 // 提取之前存储的场景
                 if (v2XMessageEntity != null) {
+                    try {
+                        // 与其它面板互斥
+                        V2XServiceManager.getMogoOnlineCarListPanelProvider().hidePanel();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 
                     // 广播给应用内部其它模块
                     Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION);

modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml

@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_24"/>
     <gradient
-        android:startColor="#5E6079"
-        android:endColor="#3F4057"
+        android:startColor="#B35E6079"
+        android:endColor="#B33F4057"
         android:type="linear"
         android:angle="180"/>