解决冲突-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();
 
     /**