Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

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

@@ -1,6 +1,7 @@
 package com.mogo.service.adas;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
+import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.service.adas.entity.ADASRecognizedResult;
 

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

@@ -1,6 +1,6 @@
 package com.mogo.service.adas;
 
-import com.mogo.service.adas.entity.AdasOCHData;
+import com.mogo.eagle.core.data.autopilot.AdasOCHData;
 
 public
 /**

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

@@ -1,55 +0,0 @@
-package com.mogo.service.adas;
-
-import java.util.List;
-
-public
-/**
- * @author congtaowang
- * @since 2020/10/16
- *
- * 自动驾驶参数
- */
-class RemoteControlAutoPilotParameters {
-
-    public AutoPilotLonLat startLatLon;
-    public List< AutoPilotLonLat > wayLatLons;
-    public AutoPilotLonLat endLatLon;
-    public float speedLimit;
-    public int vehicleType;// 运营类型
-    /**
-     * 是否播放adas的 开始自动驾驶 语音
-     */
-    public boolean isSpeakVoice = true;
-
-    public static class AutoPilotLonLat {
-        public double lat;
-        public double lon;
-
-        public AutoPilotLonLat() {
-        }
-
-        public AutoPilotLonLat( double lat, double lon ) {
-            this.lat = lat;
-            this.lon = lon;
-        }
-
-        @Override
-        public String toString() {
-            return "AutoPilotLonLat{" +
-                    "lat=" + lat +
-                    ", lon=" + lon +
-                    '}';
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "RemoteControlAutoPilotParameters{" +
-                "startLatLon=" + startLatLon +
-                ", wayLatLons=" + wayLatLons +
-                ", endLatLon=" + endLatLon +
-                ", speedLimit=" + speedLimit +
-                ", vehicleType=" + vehicleType +
-                '}';
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.mogo.service.adas.entity;
-
-public
-/**
- * @author congtaowang
- * @since 2021/1/18
- *
- * 自动驾驶网约车回调数据
- */
-class AdasOCHData {
-
-    public int type;
-    public double lon;
-    public double lat;
-
-    public AdasOCHData( int type, double lon, double lat ) {
-        this.type = type;
-        this.lon = lon;
-        this.lat = lat;
-    }
-}

services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceAutopilotStatusClickListener.java

@@ -1,6 +0,0 @@
-package com.mogo.service.entrance;
-
-public interface IMogoEntranceAutopilotStatusClickListener {
-
-    void click();
-}

services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java

@@ -151,18 +151,4 @@ public interface IMogoEntranceButtonController extends IProvider {
      * @param listener 回调监听
      */
     void removeEntranceViewListener(IMogoEntranceViewListener listener);
-
-    /**
-     * 添加entrance 自动驾驶状态监听
-     *
-     * @param listener {@link IMogoEntranceAutopilotStatusClickListener}
-     */
-    void addEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener);
-
-    /**
-     * 移除entrance 自动驾驶状态监听
-     *
-     * @param listener {@link IMogoEntranceAutopilotStatusClickListener}
-     */
-    void removeEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener);
 }