[Change]

整理ADAS相关代码

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasOCHCallback.java

@@ -1,45 +0,0 @@
-package com.mogo.service.adas;
-
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
-
-/**
- * @author congtaowang
- * @since 2021/1/18
- * <p>
- * 自动驾驶到站回调
- */
-public interface IMogoAdasOCHCallback {
-
-    /**
-     * 不可自动驾驶，目前场景是刚开机，adas还未和工控机连接
-     */
-    int STATUS_AUTOPILOT_DISABLE = 0;
-    /**
-     * 可自动驾驶，工控机连接正常，且处于人工干预状态
-     */
-    int STATUS_AUTOPILOT_ENABLE = 1;
-    /**
-     * 自动驾驶中，可能是停车，可能是行进，但是是机器在处理车的前进后退，不是人
-     */
-    int STATUS_AUTOPILOT_RUNNING = 2;
-
-
-    /**
-     * 到站
-     *
-     * @param data 所到车站的简单信息
-     * @see com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener#onAutopilotArriveAtStation
-     */
-    @Deprecated
-    void onArriveAt(AutopilotStationInfo data);
-
-    /**
-     * 自动驾驶状态发生改变
-     *
-     * @param state  {@link #STATUS_AUTOPILOT_DISABLE}
-     * @param reason 不能自动驾驶的原因
-     * @see com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener#onAutopilotStatusResponse
-     */
-    @Deprecated
-    void onStateChanged(int state, String reason);
-}

services/mogo-service/build.gradle

@@ -62,7 +62,6 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_function_check
     } else {
-        implementation project(':modules:mogo-module-adas')
         api project(":libraries:mogo-map")
         implementation project(":libraries:mogo-map-api")
         implementation project(':core:mogo-core-utils')

services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

@@ -15,7 +15,6 @@ import com.mogo.module.adas.AdasProvider;
 import com.mogo.module.adas.IAdasDataListener;
 import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.adas.IMogoAdasCarDataCallback;
-import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
 import java.util.List;
@@ -50,8 +49,6 @@ public class MogoADASController implements IMogoADASController {
         return satelliteTime;
     }
 
-    private final List<IMogoAdasOCHCallback> mAdasOCHCallback = new CopyOnWriteArrayList<>();
-
     @Override
     public void init(Context context) {
         adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
@@ -79,15 +76,6 @@ public class MogoADASController implements IMogoADASController {
                     }
                 }
 
-                @Override
-                public void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
-                    DebugConfig.setAutoPilotStatus(autopilotStatus.getState() + "");
-                    if (!mAdasOCHCallback.isEmpty()) {
-                        for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
-                            cb.onStateChanged(autopilotStatus.getState(), autopilotStatus.getReason());
-                        }
-                    }
-                }
             };
             adasProvider.addAdasEventListener(mAdasDataListener);
         }