解决冲突-EntranceFragment再验证一遍

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -7,14 +7,9 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-<<<<<<< HEAD
 import com.mogo.service.check.ICheckProvider;
-import com.mogo.service.connection.IMogoSocketManager;
-import com.mogo.service.connection.IMogoWebSocketManager;
-=======
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
->>>>>>> dev/dev_eagle_architecture_upgrade
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -328,7 +323,6 @@ public interface IMogoServiceApis extends IProvider {
     IMogoSmallMapProvider getSmallMapProviderApi();
 
     /**
-<<<<<<< HEAD
      * 检测接口
      */
     ICheckProvider getCheckProvider();
@@ -336,10 +330,6 @@ public interface IMogoServiceApis extends IProvider {
     /*
      *V2X
      * */
-=======
-     * V2X
-     */
->>>>>>> dev/dev_eagle_architecture_upgrade
     IV2XProvider getV2XListenerManager();
 
     /**

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -370,18 +370,14 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_ADAS = "/adas/api";
 
-    /**
-     * 前方碰撞预警  未碰撞
-     */
-<<<<<<< HEAD
-    public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
-
     /**
      * 车辆检测 模块
      */
     public static final String PATH_CHECK = "/check/api";
 
-=======
+    /**
+     * 前方碰撞预警  未碰撞
+     */
     @Keep
     @Deprecated
     public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
@@ -399,5 +395,4 @@ public class MogoServicePaths {
     @Keep
     @Deprecated
     public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api";
->>>>>>> dev/dev_eagle_architecture_upgrade
 }