[Change]

替换主动获取自动驾驶状态的调用方式

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

modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java

@@ -28,7 +28,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.adas.model.AdasServiceModel;
 import com.mogo.module.common.drawer.IdentifyDataDrawer;
-import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
 import com.zhidao.support.adas.high.AdasManager;
 import com.zhidao.support.adas.high.OnAdasMsgConnectStatusListener;
 import com.zhidao.support.adas.high.bean.BasicInfo;
@@ -62,8 +61,6 @@ public class AdasEventManager implements
     private int mCurrentAutopilotStatus = -1;
     //自动驾驶车速度
     private float mCurrentAutopilotSpeed = 0;
-    //自动驾驶状态
-    private AutopilotStatusInfo mAutopilotValuesStatus = null;
 
 
     private AdasEventManager() {
@@ -154,23 +151,12 @@ public class AdasEventManager implements
         AdasServiceModel.getInstance().reportSite(lon, lat);
     }
 
-    public AdasAIDLAutopilotStateModel autopilotStateCall() {
-        AdasAIDLAutopilotStateModel adasAIDLAutopilotStateModel = new AdasAIDLAutopilotStateModel();
-        if (mAutopilotValuesStatus != null) {
-            adasAIDLAutopilotStateModel.setSpeed(mAutopilotValuesStatus.getSpeed());
-            adasAIDLAutopilotStateModel.setState(mAutopilotValuesStatus.getState());
-            adasAIDLAutopilotStateModel.setReason(mAutopilotValuesStatus.getReason());
-        }
-        return adasAIDLAutopilotStateModel;
-    }
-
     @Override
     public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
         int state = autoPilotStatusInfo.getState();
         float speed = autoPilotStatusInfo.getSpeed();
         mCurrentAutopilotStatus = state;
         mCurrentAutopilotSpeed = speed;
-        this.mAutopilotValuesStatus = autoPilotStatusInfo;
         for (IAdasDataListener listener : iAdasEventListeners) {
             if (listener != null) {
                 listener.notifyAutopilotState(autoPilotStatusInfo);
@@ -184,11 +170,6 @@ public class AdasEventManager implements
             double lon = autopilotWayArrive.getLon();
             double lat = autopilotWayArrive.getLat();
             reportSite(lon, lat);
-            for (IAdasDataListener listener : iAdasEventListeners) {
-                if (listener != null) {
-                    listener.autopilotArrive(autopilotWayArrive);
-                }
-            }
         }
     }
 

modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java

@@ -7,7 +7,6 @@ import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
-import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
 import com.zhidao.support.adas.high.AdasManager;
 import com.zhidao.support.adas.high.common.CupidLogUtils;
 
@@ -65,7 +64,4 @@ public class AdasProvider implements IProvider {
         AdasManager.getInstance().aiCloudToAdasData(msg);
     }
 
-    public AdasAIDLAutopilotStateModel autopilotStateCall() {
-        return adasEventManager.autopilotStateCall();
-    }
 }

modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java

@@ -1,18 +1,9 @@
 package com.mogo.module.adas;
 
-import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
 
 public interface IAdasDataListener {
 
-    /**
-     * 自动驾驶到达站点回调接口
-     *
-     * @param autopilotWayArrive
-     */
-    default void autopilotArrive(AutopilotStationInfo autopilotWayArrive) {
-    }
 
     /**
      * 自车定位信息